blob: 74099d4b7684c0d50b0720deb4cd911e766b4835 [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
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100135def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000136 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
137
138 Usage:
139 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100140 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000141
142 OR
143 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100144 CookiesAuthenticatorMockFactory(
145 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000146 """
147 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800148 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000149 # Intentionally not calling super() because it reads actual cookie files.
150 pass
151 @classmethod
152 def get_gitcookies_path(cls):
153 return '~/.gitcookies'
154 @classmethod
155 def get_netrc_path(cls):
156 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100157 def _get_auth_for_host(self, host):
158 if same_auth:
159 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000160 return (hosts_with_creds or {}).get(host)
161 return CookiesAuthenticatorMock
162
kmarshall9249e012016-08-23 12:02:16 -0700163class MockChangelistWithBranchAndIssue():
164 def __init__(self, branch, issue):
165 self.branch = branch
166 self.issue = issue
167 def GetBranch(self):
168 return self.branch
169 def GetIssue(self):
170 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000171
tandriic2405f52016-10-10 08:13:15 -0700172
173class SystemExitMock(Exception):
174 pass
175
176
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000177class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100178 def test_get_description(self):
179 cl = git_cl.Changelist(issue=1, codereview='rietveld',
180 codereview_host='host')
181 cl.description = 'x'
182 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800183 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100184 self.assertEquals(cl.GetDescription(), 'x')
185 self.assertEquals(cl.GetDescription(force=True), 'y')
186 self.assertEquals(cl.GetDescription(), 'y')
187
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000188 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
189 parsed = urlparse.urlparse(url)
190 result = func(parsed)
191 if fail:
192 self.assertIsNone(result)
193 return None
194 self.assertIsNotNone(result)
195 self.assertEqual(result.issue, issue)
196 self.assertEqual(result.patchset, patchset)
197 self.assertEqual(result.hostname, hostname)
198 return result
199
200 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700201 def test(url, issue=None, patchset=None, hostname=None, fail=None):
202 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000203 git_cl._RietveldChangelistImpl.ParseIssueURL,
204 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000205
206 test('http://codereview.chromium.org/123',
207 123, None, 'codereview.chromium.org')
208 test('https://codereview.chromium.org/123',
209 123, None, 'codereview.chromium.org')
210 test('https://codereview.chromium.org/123/',
211 123, None, 'codereview.chromium.org')
212 test('https://codereview.chromium.org/123/whatever',
213 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700214 test('https://codereview.chromium.org/123/#ps20001',
215 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000216 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700217 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000218 # This looks like bad Gerrit, but is actually valid Rietveld.
219 test('https://chrome-review.source.com/123/4/',
220 123, None, 'chrome-review.source.com')
221
222 test('https://codereview.chromium.org/deadbeaf', fail=True)
223 test('https://codereview.chromium.org/api/123', fail=True)
224 test('bad://codereview.chromium.org/123', fail=True)
225 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
226
227 def test_ParseIssueURL_gerrit(self):
228 def test(url, issue=None, patchset=None, hostname=None, fail=None):
229 self._test_ParseIssueUrl(
230 git_cl._GerritChangelistImpl.ParseIssueURL,
231 url, issue, patchset, hostname, fail)
232
233 test('http://chrome-review.source.com/c/123',
234 123, None, 'chrome-review.source.com')
235 test('https://chrome-review.source.com/c/123/',
236 123, None, 'chrome-review.source.com')
237 test('https://chrome-review.source.com/c/123/4',
238 123, 4, 'chrome-review.source.com')
239 test('https://chrome-review.source.com/#/c/123/4',
240 123, 4, 'chrome-review.source.com')
241 test('https://chrome-review.source.com/c/123/4',
242 123, 4, 'chrome-review.source.com')
243 test('https://chrome-review.source.com/123',
244 123, None, 'chrome-review.source.com')
245 test('https://chrome-review.source.com/123/4',
246 123, 4, 'chrome-review.source.com')
247
248 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
249 test('https://chrome-review.source.com/c/abc/', fail=True)
250 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
251
252 def test_ParseIssueNumberArgument(self):
253 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
254 result = git_cl.ParseIssueNumberArgument(arg)
255 self.assertIsNotNone(result)
256 if fail:
257 self.assertFalse(result.valid)
258 else:
259 self.assertEqual(result.issue, issue)
260 self.assertEqual(result.patchset, patchset)
261 self.assertEqual(result.hostname, hostname)
262
263 test('123', 123)
264 test('', fail=True)
265 test('abc', fail=True)
266 test('123/1', fail=True)
267 test('123a', fail=True)
268 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
269 # Rietveld.
270 test('https://codereview.source.com/123',
271 123, None, 'codereview.source.com')
272 test('https://codereview.source.com/www123', fail=True)
273 # Gerrrit.
274 test('https://chrome-review.source.com/c/123/4',
275 123, 4, 'chrome-review.source.com')
276 test('https://chrome-review.source.com/bad/123/4', fail=True)
277
tandriif9aefb72016-07-01 09:06:51 -0700278 def test_get_bug_line_values(self):
279 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
280 self.assertEqual(f('', ''), [])
281 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
282 self.assertEqual(f('v8', '456'), ['v8:456'])
283 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
284 # Not nice, but not worth carying.
285 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
286 ['v8:456', 'chromium:123', 'v8:123'])
287
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100288 def _test_git_number(self, parent_msg, dest_ref, child_msg,
289 parent_hash='parenthash'):
290 desc = git_cl.ChangeDescription(child_msg)
291 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
292 return desc.description
293
294 def assertEqualByLine(self, actual, expected):
295 self.assertEqual(actual.splitlines(), expected.splitlines())
296
297 def test_git_number_bad_parent(self):
298 with self.assertRaises(ValueError):
299 self._test_git_number('Parent', 'refs/heads/master', 'Child')
300
301 def test_git_number_bad_parent_footer(self):
302 with self.assertRaises(AssertionError):
303 self._test_git_number(
304 'Parent\n'
305 '\n'
306 'Cr-Commit-Position: wrong',
307 'refs/heads/master', 'Child')
308
309 def test_git_number_bad_lineage_ignored(self):
310 actual = self._test_git_number(
311 'Parent\n'
312 '\n'
313 'Cr-Commit-Position: refs/heads/master@{#1}\n'
314 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
315 'refs/heads/master', 'Child')
316 self.assertEqualByLine(
317 actual,
318 'Child\n'
319 '\n'
320 'Cr-Commit-Position: refs/heads/master@{#2}\n'
321 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
322
323 def test_git_number_same_branch(self):
324 actual = self._test_git_number(
325 'Parent\n'
326 '\n'
327 'Cr-Commit-Position: refs/heads/master@{#12}',
328 dest_ref='refs/heads/master',
329 child_msg='Child')
330 self.assertEqualByLine(
331 actual,
332 'Child\n'
333 '\n'
334 'Cr-Commit-Position: refs/heads/master@{#13}')
335
336 def test_git_number_same_branch_with_originals(self):
337 actual = self._test_git_number(
338 'Parent\n'
339 '\n'
340 'Cr-Commit-Position: refs/heads/master@{#12}',
341 dest_ref='refs/heads/master',
342 child_msg='Child\n'
343 '\n'
344 'Some users are smart and insert their own footers\n'
345 '\n'
346 'Cr-Whatever: value\n'
347 'Cr-Commit-Position: refs/copy/paste@{#22}')
348 self.assertEqualByLine(
349 actual,
350 'Child\n'
351 '\n'
352 'Some users are smart and insert their own footers\n'
353 '\n'
354 'Cr-Original-Whatever: value\n'
355 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
356 'Cr-Commit-Position: refs/heads/master@{#13}')
357
358 def test_git_number_new_branch(self):
359 actual = self._test_git_number(
360 'Parent\n'
361 '\n'
362 'Cr-Commit-Position: refs/heads/master@{#12}',
363 dest_ref='refs/heads/branch',
364 child_msg='Child')
365 self.assertEqualByLine(
366 actual,
367 'Child\n'
368 '\n'
369 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
370 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
371
372 def test_git_number_lineage(self):
373 actual = self._test_git_number(
374 'Parent\n'
375 '\n'
376 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
377 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
378 dest_ref='refs/heads/branch',
379 child_msg='Child')
380 self.assertEqualByLine(
381 actual,
382 'Child\n'
383 '\n'
384 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
385 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
386
387 def test_git_number_moooooooore_lineage(self):
388 actual = self._test_git_number(
389 'Parent\n'
390 '\n'
391 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
392 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
393 dest_ref='refs/heads/mooore',
394 child_msg='Child')
395 self.assertEqualByLine(
396 actual,
397 'Child\n'
398 '\n'
399 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
400 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
401 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
402
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100403 def test_git_number_ever_moooooooore_lineage(self):
404 self.maxDiff = 10000
405 actual = self._test_git_number(
406 'CQ commit on fresh new branch + numbering.\n'
407 '\n'
408 'NOTRY=True\n'
409 'NOPRESUBMIT=True\n'
410 'BUG=\n'
411 '\n'
412 'Review-Url: https://codereview.chromium.org/2577703003\n'
413 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
414 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
415 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
416 dest_ref='refs/heads/gnumb-test/cl',
417 child_msg='git cl on fresh new branch + numbering.\n'
418 '\n'
419 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
420 self.assertEqualByLine(
421 actual,
422 'git cl on fresh new branch + numbering.\n'
423 '\n'
424 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
425 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
426 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
427 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
428 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100429
430 def test_git_number_cherry_pick(self):
431 actual = self._test_git_number(
432 'Parent\n'
433 '\n'
434 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
435 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
436 dest_ref='refs/heads/branch',
437 child_msg='Child, which is cherry-pick from master\n'
438 '\n'
439 'Cr-Commit-Position: refs/heads/master@{#100}\n'
440 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
441 self.assertEqualByLine(
442 actual,
443 'Child, which is cherry-pick from master\n'
444 '\n'
445 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
446 '\n'
447 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
448 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
449 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
450
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000451
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100452class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100453 def setUp(self):
454 super(GitCookiesCheckerTest, self).setUp()
455 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100456 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100457
458 def mock_hosts_creds(self, subhost_identity_pairs):
459 def ensure_googlesource(h):
460 if not h.endswith(self.c._GOOGLESOURCE):
461 assert not h.endswith('.')
462 return h + '.' + self.c._GOOGLESOURCE
463 return h
464 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
465 for h, i in subhost_identity_pairs]
466
467 def test_analysis_nothing(self):
468 self.c._all_hosts = []
469 self.assertFalse(self.c.has_generic_host())
470 self.assertEqual(set(), self.c.get_conflicting_hosts())
471 self.assertEqual(set(), self.c.get_duplicated_hosts())
472 self.assertEqual(set(), self.c.get_partially_configured_hosts())
473 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
474
475 def test_analysis(self):
476 self.mock_hosts_creds([
477 ('.googlesource.com', 'git-example.chromium.org'),
478
479 ('chromium', 'git-example.google.com'),
480 ('chromium-review', 'git-example.google.com'),
481 ('chrome-internal', 'git-example.chromium.org'),
482 ('chrome-internal-review', 'git-example.chromium.org'),
483 ('conflict', 'git-example.google.com'),
484 ('conflict-review', 'git-example.chromium.org'),
485 ('dup', 'git-example.google.com'),
486 ('dup', 'git-example.google.com'),
487 ('dup-review', 'git-example.google.com'),
488 ('partial', 'git-example.google.com'),
489 ])
490 self.assertTrue(self.c.has_generic_host())
491 self.assertEqual(set(['conflict.googlesource.com']),
492 self.c.get_conflicting_hosts())
493 self.assertEqual(set(['dup.googlesource.com']),
494 self.c.get_duplicated_hosts())
495 self.assertEqual(set(['partial.googlesource.com']),
496 self.c.get_partially_configured_hosts())
497 self.assertEqual(set(['chromium.googlesource.com',
498 'chrome-internal.googlesource.com']),
499 self.c.get_hosts_with_wrong_identities())
500
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100501 def test_report_no_problems(self):
502 self.test_analysis_nothing()
503 self.mock(sys, 'stdout', StringIO.StringIO())
504 self.assertFalse(self.c.find_and_report_problems())
505 self.assertEqual(sys.stdout.getvalue(), '')
506
507 def test_report(self):
508 self.test_analysis()
509 self.mock(sys, 'stdout', StringIO.StringIO())
510 self.assertTrue(self.c.find_and_report_problems())
511 with open(os.path.join(os.path.dirname(__file__),
512 'git_cl_creds_check_report.txt')) as f:
513 expected = f.read()
514 def by_line(text):
515 return [l.rstrip() for l in text.rstrip().splitlines()]
516 self.assertEqual(by_line(sys.stdout.getvalue()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100517
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000518class TestGitCl(TestCase):
519 def setUp(self):
520 super(TestGitCl, self).setUp()
521 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700522 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000523 self.mock(subprocess2, 'call', self._mocked_call)
524 self.mock(subprocess2, 'check_call', self._mocked_call)
525 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700526 self.mock(subprocess2, 'communicate',
527 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000528 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000529 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000530 self.mock(git_common, 'get_or_create_merge_base',
531 lambda *a: (
532 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000533 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000534 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100535 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
536 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700537 self.mock(git_cl, 'write_json', lambda path, contents:
538 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000539 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000540 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000541 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700542 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
543 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000544 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000545 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000546 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100547 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
548 lambda *args, **kwargs: self._mocked_call(
549 'GetChangeDetail', *args, **kwargs))
550 self.mock(git_cl.gerrit_util, 'AddReviewers',
551 lambda h, i, add, is_reviewer, notify: self._mocked_call(
552 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000553 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
554 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700555 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100556 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000557 # It's important to reset settings to not have inter-tests interference.
558 git_cl.settings = None
559
560 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000561 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100562 self.assertEquals([], self.calls)
563 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000564 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100565 raise
566 # Sadly, has_failed() returns True if this OR any other tests before this
567 # one have failed.
568 git_cl.logging.exception(
569 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
570 'There are un-consumed self.calls after this test has finished.\n'
571 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700572 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100573 '\n'
574 'If you are already running just this single test, then **first** '
575 'fix the problem whose exception is emitted below by unittest '
576 'runner.\n'
577 '\n'
578 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700579 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100580 'and follow instructions above.\n' +
581 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000582 finally:
583 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000584
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000585 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000586 self.assertTrue(
587 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700588 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000589 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000590 expected_args, result = top
591
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000592 # Also logs otherwise it could get caught in a try/finally and be hard to
593 # diagnose.
594 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700595 N = 5
596 prior_calls = '\n '.join(
597 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
598 for i, c in enumerate(self._calls_done[-N:]))
599 following_calls = '\n '.join(
600 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
601 for i, c in enumerate(self.calls[:N]))
602 extended_msg = (
603 'A few prior calls:\n %s\n\n'
604 'This (expected):\n @%d: %r\n'
605 'This (actual):\n @%d: %r\n\n'
606 'A few following expected calls:\n %s' %
607 (prior_calls, len(self._calls_done), expected_args,
608 len(self._calls_done), args, following_calls))
609 git_cl.logging.error(extended_msg)
610
tandrii99a72f22016-08-17 14:33:24 -0700611 self.fail('@%d\n'
612 ' Expected: %r\n'
613 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700614 len(self._calls_done), expected_args, args))
615
616 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700617 if isinstance(result, Exception):
618 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000619 return result
620
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100621 def test_ask_for_explicit_yes_true(self):
622 self.calls = [
623 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
624 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
625 ]
626 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
627
628 def test_ask_for_explicit_yes_true(self):
629 self.calls = [
630 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
631 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
632 ]
633 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
634
tandrii48df5812016-10-17 03:55:37 -0700635 def test_LoadCodereviewSettingsFromFile_gerrit(self):
636 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
637 self.calls = [
638 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
639 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
640 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
641 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
642 ((['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'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700725 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000726 ]
727
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000728 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000729 def _git_upload_no_rev_calls(cls):
730 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000731 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000732 ]
733
734 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000735 def _git_upload_calls(cls, private):
736 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000737 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000738 private_call = []
739 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000740 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000741 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000742 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000743
maruel@chromium.orga3353652011-11-30 14:26:57 +0000744 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000745 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000746 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000747 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800748 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000749 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700750 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000751 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000752 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000753 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700754 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000755 ] + cls._git_post_upload_calls()
756
757 @classmethod
758 def _git_post_upload_calls(cls):
759 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000760 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
761 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
762 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000763 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000764 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000765 ]
766
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000767 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000768 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000769 fake_ancestor = 'fake_ancestor'
770 fake_cl = 'fake_cl_for_patch'
771 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000772 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000773 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000774 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000775 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000776 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000777 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000778 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000779 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700780 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000781 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000782 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000783 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000784 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000785 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000786 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000787 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000788 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000789 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000790 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000791 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000792
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000793 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700794 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000795 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000796 return [
797 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000798 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000799 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000800 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700801 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000802 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000803 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100804 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000805 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000806 ]
807
808 def _run_reviewer_test(
809 self,
810 upload_args,
811 expected_description,
812 returned_description,
813 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000814 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700815 private=False,
816 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000817 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000818 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000819 try:
820 similarity = upload_args[upload_args.index('--similarity')+1]
821 except ValueError:
822 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000823
824 if '--find-copies' in upload_args:
825 find_copies = True
826 elif '--no-find-copies' in upload_args:
827 find_copies = False
828 else:
829 find_copies = None
830
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000831 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700832 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000833
834 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000835
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000836 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000837 self.assertEquals(
838 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000839 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000840 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000841 '#--------------------This line is 72 characters long'
842 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000843 expected_description,
844 desc)
845 return returned_description
846 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000847
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000848 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000849 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700850 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000851 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000852 return 1, 2
853 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000854
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000855 git_cl.main(['upload'] + upload_args)
856
857 def test_no_reviewer(self):
858 self._run_reviewer_test(
859 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000860 'desc\n\nBUG=',
861 '# Blah blah comment.\ndesc\n\nBUG=',
862 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000863 [])
864
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000865 def test_keep_similarity(self):
866 self._run_reviewer_test(
867 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000868 'desc\n\nBUG=',
869 '# Blah blah comment.\ndesc\n\nBUG=',
870 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000871 [])
872
iannucci@chromium.org79540052012-10-19 23:15:26 +0000873 def test_keep_find_copies(self):
874 self._run_reviewer_test(
875 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000876 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000877 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000878 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000879 [])
880
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000881 def test_private(self):
882 self._run_reviewer_test(
883 ['--private'],
884 'desc\n\nBUG=',
885 '# Blah blah comment.\ndesc\n\nBUG=\n',
886 'desc\n\nBUG=',
887 [])
888
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000889 def test_reviewers_cmd_line(self):
890 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000891 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000892 self._run_reviewer_test(
893 ['-r' 'foo@example.com'],
894 description,
895 '\n%s\n' % description,
896 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000897 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000898
899 def test_reviewer_tbr_overriden(self):
900 # Reviewer is overriden with TBR
901 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000902 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000903 self._run_reviewer_test(
904 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000905 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000906 description.strip('\n'),
907 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000908 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000909
910 def test_reviewer_multiple(self):
911 # Handles multiple R= or TBR= lines.
912 description = (
bradnelsond975b302016-10-23 12:20:23 -0700913 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
914 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000915 self._run_reviewer_test(
916 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000917 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000918 description,
919 description,
bradnelsond975b302016-10-23 12:20:23 -0700920 ['--reviewers=another@example.com,reviewer@example.com'],
921 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000922
maruel@chromium.orga3353652011-11-30 14:26:57 +0000923 def test_reviewer_send_mail(self):
924 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000925 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000926 self._run_reviewer_test(
927 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000928 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000929 description.strip('\n'),
930 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000931 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000932
933 def test_reviewer_send_mail_no_rev(self):
934 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000935 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700936 self.calls = self._upload_no_rev_calls(None, None) + [
937 ((['DieWithError', 'Must specify reviewers to send email.'],),
938 SystemExitMock())
939 ]
940
941 def RunEditor(desc, _, **kwargs):
942 return desc
943 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
944 self.mock(sys, 'stdout', stdout)
945 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000946 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700947 self.assertEqual(
948 'Using 50% similarity for rename/copy detection. Override with '
949 '--similarity.\n',
950 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000951
tandriif9aefb72016-07-01 09:06:51 -0700952 def test_bug_on_cmd(self):
953 self._run_reviewer_test(
954 ['--bug=500658,proj:123'],
955 'desc\n\nBUG=500658\nBUG=proj:123',
956 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
957 'desc\n\nBUG=500658\nBUG=proj:1234',
958 [])
959
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100960 def _land_rietveld_common(self, debug=False):
961 if debug:
962 # Very useful due to finally clause in git cl land raising exceptions and
963 # shadowing real cause of failure.
964 self.mock(git_cl, '_IS_BEING_TESTED', True)
965 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100966 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100967
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100968 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
969 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100970 self.mock(RietveldMock, 'update_description', staticmethod(
971 lambda i, d: self._mocked_call(['update_description', i, d])))
972 self.mock(RietveldMock, 'add_comment', staticmethod(
973 lambda i, c: self._mocked_call(['add_comment', i, c])))
974 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100975 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
976 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
977 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
978 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
979 CERR1),
980 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
981 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800982 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100983 ((['git', 'config', 'rietveld.server'],),
984 'https://codereview.chromium.org'),
985 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
986 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
987 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
988 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100989 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
990 ''), # No commits to rebase, according to local view of origin.
991 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
992 'fake_ancestor_sha'),
993 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
994 ((['git', 'rev-parse', '--show-cdup'],), ''),
995 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
996 ((['git', 'diff', '--name-status', '--no-renames', '-r',
997 'fake_ancestor_sha...', '.'],),
998 'M\tfile1.cpp'),
999 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1000 ((['git', 'config', 'branch.feature.rietveldserver'],),
1001 'https://codereview.chromium.org'),
1002 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1003 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1004 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1005 'fake_ancestor_sha', 'feature'],),
1006 # This command just prints smth like this:
1007 # file1.cpp | 53 ++++++--
1008 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1009 ''),
1010 ((['git', 'show-ref', '--quiet', '--verify',
1011 'refs/heads/git-cl-commit'],),
1012 ''), # 0 return code means branch exists.
1013 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1014 ((['git', 'show-ref', '--quiet', '--verify',
1015 'refs/heads/git-cl-cherry-pick'],),
1016 CERR1), # This means git-cl-cherry-pick branch does not exist.
1017 ((['git', 'rev-parse', '--show-cdup'],), ''),
1018 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1019 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1020 ((['git', 'commit', '-m',
1021 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001022 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001023 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1024 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1025 ((['git', 'config', '--get', 'remote.origin.url'],),
1026 'https://chromium.googlesource.com/infra/infra'),
1027 ]
1028
1029 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001030 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001031 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001032 ((['git', 'config', 'remote.origin.url'],),
1033 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001034 (('_is_git_numberer_enabled',
1035 'https://chromium.googlesource.com/infra/infra',
1036 'refs/heads/master'),
1037 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001038 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1039 ''),
1040 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1041 ((['git', 'checkout', '-q', 'feature'],), ''),
1042 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1043 ((['git', 'config', 'rietveld.viewvc-url'],),
1044 'https://chromium.googlesource.com/infra/infra/+/'),
1045 ((['update_description', 123,
1046 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
1047 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1048 ''),
1049 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1050 'fake_sha_rebased (presubmit successful).'],), ''),
1051 ]
1052 git_cl.main(['land'])
1053
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001054 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001055 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001056
1057 # Special mocks to check validity of timestamp.
1058 original_git_amend_head = git_cl._git_amend_head
1059 def _git_amend_head_mock(msg, tstamp):
1060 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1061 return original_git_amend_head(msg, tstamp)
1062 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1063
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001064 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001065 ((['git', 'config', 'remote.origin.url'],),
1066 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001067 (('_is_git_numberer_enabled',
1068 'https://chromium.googlesource.com/chromium/src',
1069 'refs/heads/master'),
1070 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001071 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1072 'This is parent commit.\n'
1073 '\n'
1074 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1075 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001076 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
1077 '1480022355'), # Committer's unix timestamp.
1078 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1079 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001080
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001081 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001082 ((['git', 'commit', '--amend', '-m',
1083 'Issue: 123\n\nR=john@chromium.org\n'
1084 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001085 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001086 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1087 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1088
1089 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1090 ''),
1091 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1092 ((['git', 'checkout', '-q', 'feature'],), ''),
1093 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1094 ((['git', 'config', 'rietveld.viewvc-url'],),
1095 'https://chromium.googlesource.com/infra/infra/+/'),
1096 ((['update_description', 123,
1097 'Issue: 123\n\nR=john@chromium.org\n'
1098 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001099 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001100 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1101 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1102 'Committed: '
1103 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1104 ''),
1105 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1106 'fake_sha_rebased (presubmit successful).'],), ''),
1107 ]
1108 git_cl.main(['land'])
1109
1110 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001111 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001112 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001113 ((['git', 'config', 'remote.origin.url'],),
1114 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001115 (('_is_git_numberer_enabled',
1116 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1117 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001118
1119 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1120 'This is parent commit with no footer.'),
1121
1122 ((['git', 'checkout', '-q', 'feature'],), ''),
1123 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1124 ]
1125 with self.assertRaises(ValueError) as cm:
1126 git_cl.main(['land'])
1127 self.assertEqual(cm.exception.message,
1128 'Unable to infer commit position from footers')
1129
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001130 def test_git_numberer_not_whitelisted_repo(self):
1131 self.calls = []
1132 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001133 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1134 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001135 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001136
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001137 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001138 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1139 self.calls = [
1140 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001141 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001142 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001143 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001144 remote_url='https://chromium.googlesource.com/chromium/src',
1145 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001146 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001147
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001148 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001149 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001150 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001151 def fake_temporary_directory(**kwargs):
1152 yield tempdir
1153 self.mock(git_cl.gclient_utils, 'temporary_directory',
1154 fake_temporary_directory)
1155 self._test_GitNumbererState_valid_configs_inner(tempdir)
1156
1157 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001158 self.calls = [
1159 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001160 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001161 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1162 '''
1163 [plugin "git-numberer"]
1164 validate-enabled-refglob = refs/else/*
1165 validate-enabled-refglob = refs/heads/*
1166 validate-disabled-refglob = refs/heads/disabled
1167 validate-disabled-refglob = refs/branch-heads/*
1168 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001169 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1170 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001171 'refs/else/*\n'
1172 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001173 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1174 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001175 'refs/heads/disabled\n'
1176 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001177 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001178
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001179 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001180 remote_url='https://chromium.googlesource.com/chromium/src',
1181 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001182 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001183
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001184 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001185 remote_url='https://chromium.googlesource.com/chromium/src',
1186 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001187 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001188
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001189 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001190 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001191 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001192 remote_url='https://chromium.googlesource.com/chromium/src',
1193 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001194 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001195
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001196 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001197 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001198 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001199 if skip_auth_check:
1200 return [((cmd, ), 'true')]
1201
tandrii5d48c322016-08-18 16:19:37 -07001202 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001203 if issue:
1204 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001205 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001206 ])
1207 calls.extend([
1208 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1209 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1210 ((['git', 'config', 'remote.origin.url'],),
1211 'https://chromium.googlesource.com/my/repo'),
1212 ((['git', 'config', 'remote.origin.url'],),
1213 'https://chromium.googlesource.com/my/repo'),
1214 ])
1215 return calls
1216
1217 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001218 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001219 fetched_status=None, other_cl_owner=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001220 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001221 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001222 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001223 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001224 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001225 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1226 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001227 ]
1228 calls += cls._is_gerrit_calls(True)
1229 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001230 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001231 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1232 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001233 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001234 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001235 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001236 ((['get_or_create_merge_base', 'master',
1237 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001238 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001239 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001240 ]
1241 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1242
1243 if issue:
1244 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001245 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001246 '123456',
1247 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001248 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001249 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001250 'change_id': '123456789',
1251 'current_revision': 'sha1_of_current_revision',
1252 'revisions': { 'sha1_of_current_revision': {
1253 'commit': {'message': fetched_description},
1254 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001255 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001256 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001257 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001258 if fetched_status == 'ABANDONED':
1259 calls += [
1260 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1261 '123456 has been abandoned, new uploads are not '
1262 'allowed'), SystemExitMock()),
1263 ]
1264 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001265 if other_cl_owner:
1266 calls += [
1267 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1268 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001269
1270 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1271 get_remote_branch=False)
1272 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001273 ((['git', 'rev-parse', '--show-cdup'],), ''),
1274 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001275
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001276 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001277 'diff', '--name-status', '--no-renames', '-r',
1278 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001279 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001280 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001281 ]
1282
1283 if not issue:
1284 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001285 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001286 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001287 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001288 ]
1289
1290 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001291 ((['git', 'config', 'user.email'],), 'me@example.com'),
1292 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001293 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1294 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001295 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001296 ]
1297 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001298
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001299 @classmethod
1300 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001301 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001302 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001303 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001304 post_amend_description=None, issue=None, cc=None,
1305 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001306 if post_amend_description is None:
1307 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001308 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001309 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001310
tandriia60502f2016-06-20 02:01:53 -07001311 if squash_mode == 'default':
1312 calls.extend([
1313 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1314 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1315 ])
1316 elif squash_mode in ('override_squash', 'override_nosquash'):
1317 calls.extend([
1318 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1319 'true' if squash_mode == 'override_squash' else 'false'),
1320 ])
1321 else:
1322 assert squash_mode in ('squash', 'nosquash')
1323
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001324 # If issue is given, then description is fetched from Gerrit instead.
1325 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001326 calls += [
1327 ((['git', 'log', '--pretty=format:%s\n\n%b',
1328 'fake_ancestor_sha..HEAD'],),
1329 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001330 if squash:
1331 title = 'Initial_upload'
1332 else:
1333 if not title:
1334 calls += [
1335 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001336 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001337 ]
1338 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001339 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001340 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001341 # DownloadGerritHook(False)
1342 ((False, ),
1343 ''),
1344 # Amending of commit message to get the Change-Id.
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'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001347 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001348 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001349 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001350 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001351 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001352 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001353 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001354 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001355 if not issue:
1356 # Prompting to edit description on first upload.
1357 calls += [
1358 ((['git', 'config', 'core.editor'],), ''),
1359 ((['RunEditor'],), description),
1360 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001361 ref_to_push = 'abcdef0123456789'
1362 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001363 ((['git', 'config', 'branch.master.merge'],),
1364 'refs/heads/master'),
1365 ((['git', 'config', 'branch.master.remote'],),
1366 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001367 ((['get_or_create_merge_base', 'master',
1368 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001369 'origin/master'),
1370 ((['git', 'rev-parse', 'HEAD:'],),
1371 '0123456789abcdef'),
1372 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001373 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001374 ref_to_push),
1375 ]
1376 else:
1377 ref_to_push = 'HEAD'
1378
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001379 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001380 ((['git', 'rev-list',
1381 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001382 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001383
Aaron Gable9b713dd2016-12-14 16:04:21 -08001384 if title:
1385 if ref_suffix:
1386 ref_suffix += ',m=' + title
1387 else:
1388 ref_suffix = '%m=' + title
1389
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001390 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1391 if ref_suffix:
1392 ref_suffix += ',' + notify_suffix
1393 else:
1394 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001395
ukai@chromium.orge8077812012-02-03 03:41:46 +00001396 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001397 ref_suffix += ',' + ','.join('r=%s' % email
1398 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001399
1400 if git_mirror is None:
1401 calls += [
1402 ((['git', 'config', 'remote.origin.url'],),
1403 'https://chromium.googlesource.com/yyy/zzz'),
1404 ]
1405 else:
1406 calls += [
1407 ((['git', 'config', 'remote.origin.url'],),
1408 '/cache/this-dir-exists'),
1409 (('os.path.isdir', '/cache/this-dir-exists'),
1410 True),
1411 # Runs in /cache/this-dir-exists.
1412 ((['git', 'config', 'remote.origin.url'],),
1413 'https://chromium.googlesource.com/yyy/zzz'),
1414 ]
1415
ukai@chromium.orge8077812012-02-03 03:41:46 +00001416 calls += [
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001417 ((['git', 'push',
1418 'https://chromium.googlesource.com/yyy/zzz',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001419 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001420 ('remote:\n'
1421 'remote: Processing changes: (\)\n'
1422 'remote: Processing changes: (|)\n'
1423 'remote: Processing changes: (/)\n'
1424 'remote: Processing changes: (-)\n'
1425 'remote: Processing changes: new: 1 (/)\n'
1426 'remote: Processing changes: new: 1, done\n'
1427 'remote:\n'
1428 'remote: New Changes:\n'
1429 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1430 'remote:\n'
1431 'To https://chromium.googlesource.com/yyy/zzz\n'
1432 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001433 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001434 if squash:
1435 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001436 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001437 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001438 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001439 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001440 ((['git', 'config', 'branch.master.gerritsquashhash',
1441 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001442 ]
tandrii88189772016-09-29 04:29:57 -07001443 calls += [
1444 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001445 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001446 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001447 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001448 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001449 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001450 return calls
1451
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001452 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001453 self,
1454 upload_args,
1455 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001456 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001457 squash=True,
1458 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001459 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001460 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001461 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001462 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001463 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001464 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001465 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001466 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001467 fetched_status=None,
1468 other_cl_owner=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001469 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001470 if squash_mode is None:
1471 if '--no-squash' in upload_args:
1472 squash_mode = 'nosquash'
1473 elif '--squash' in upload_args:
1474 squash_mode = 'squash'
1475 else:
1476 squash_mode = 'default'
1477
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001478 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001479 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001480 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001481 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001482 CookiesAuthenticatorMockFactory(
1483 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001484 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1485 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001486 self.mock(git_cl.gclient_utils, 'RunEditor',
1487 lambda *_, **__: self._mocked_call(['RunEditor']))
1488 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1489
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001490 original_os_path_isdir = os.path.isdir
1491 def selective_os_path_isdir_mock(path):
1492 if path == '/cache/this-dir-exists':
1493 return self._mocked_call('os.path.isdir', path)
1494 return original_os_path_isdir(path)
1495 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1496
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001497 self.calls = self._gerrit_base_calls(
1498 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001499 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001500 fetched_status=fetched_status,
1501 other_cl_owner=other_cl_owner)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001502 if fetched_status != 'ABANDONED':
1503 self.calls += self._gerrit_upload_calls(
1504 description, reviewers, squash,
1505 squash_mode=squash_mode,
1506 expected_upstream_ref=expected_upstream_ref,
1507 ref_suffix=ref_suffix, title=title, notify=notify,
1508 post_amend_description=post_amend_description,
1509 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001510 # Uncomment when debugging.
1511 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001512 git_cl.main(['upload'] + upload_args)
1513
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001514 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001515 self._run_gerrit_upload_test(
1516 ['--no-squash'],
1517 'desc\n\nBUG=\n',
1518 [],
1519 squash=False,
1520 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1521
1522 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001523 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001524 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001525 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001526 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001527 [],
tandriia60502f2016-06-20 02:01:53 -07001528 squash=False,
1529 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001530 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001531
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001532 def test_gerrit_no_reviewer(self):
1533 self._run_gerrit_upload_test(
1534 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001535 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001536 [],
1537 squash=False,
1538 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001539
tandriieefe8322016-08-17 10:12:24 -07001540 def test_gerrit_patch_bad_chars(self):
1541 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001542 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001543 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001544 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001545 squash=False,
1546 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001547 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001548 self.assertIn(
1549 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001550 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1551 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001552 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001553
ukai@chromium.orge8077812012-02-03 03:41:46 +00001554 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001555 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001556 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001557 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001558 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001559 squash=False,
1560 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001561 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001562
1563 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001564 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001565 [],
bradnelsond975b302016-10-23 12:20:23 -07001566 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1567 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001568 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001569 ['reviewer@example.com', 'another@example.com'],
1570 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001571 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001572 ref_suffix='%l=Code-Review+1',
1573 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001574
1575 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001576 self._run_gerrit_upload_test(
1577 [],
1578 'desc\nBUG=\n\nChange-Id: 123456789',
1579 [],
1580 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001581
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001582 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001583 self._run_gerrit_upload_test(
1584 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001585 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001586 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001587 squash=True,
1588 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001589
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001590 def test_gerrit_upload_squash_first_with_mirror(self):
1591 self._run_gerrit_upload_test(
1592 ['--squash'],
1593 'desc\nBUG=\n\nChange-Id: 123456789',
1594 [],
1595 squash=True,
1596 expected_upstream_ref='origin/master',
1597 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1598
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001599 def test_gerrit_upload_squash_reupload(self):
1600 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001601 self._run_gerrit_upload_test(
1602 ['--squash'],
1603 description,
1604 [],
1605 squash=True,
1606 expected_upstream_ref='origin/master',
1607 issue=123456)
1608
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001609 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1610 self.mock(git_cl, 'DieWithError',
1611 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1612 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1613 with self.assertRaises(SystemExitMock):
1614 self._run_gerrit_upload_test(
1615 ['--squash'],
1616 description,
1617 [],
1618 squash=True,
1619 expected_upstream_ref='origin/master',
1620 issue=123456,
1621 fetched_status='ABANDONED')
1622
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001623 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1624 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1625 lambda *_, **__: {'email': 'yet-another@example.com'})
1626 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1627 self._run_gerrit_upload_test(
1628 ['--squash'],
1629 description,
1630 [],
1631 squash=True,
1632 expected_upstream_ref='origin/master',
1633 issue=123456,
1634 other_cl_owner='other@example.com')
1635 self.assertIn(
1636 'WARNING: change 123456 is owned by other@example.com, but you '
1637 'authenticate to Gerrit as yet-another@example.com.\n'
1638 'Uploading may fail due to lack of permissions',
1639 git_cl.sys.stdout.getvalue())
1640
rmistry@google.com2dd99862015-06-22 12:22:18 +00001641 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001642 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001643 def mock_run_git(*args, **_kwargs):
1644 if args[0] == ['for-each-ref',
1645 '--format=%(refname:short) %(upstream:short)',
1646 'refs/heads']:
1647 # Create a local branch dependency tree that looks like this:
1648 # test1 -> test2 -> test3 -> test4 -> test5
1649 # -> test3.1
1650 # test6 -> test0
1651 branch_deps = [
1652 'test2 test1', # test1 -> test2
1653 'test3 test2', # test2 -> test3
1654 'test3.1 test2', # test2 -> test3.1
1655 'test4 test3', # test3 -> test4
1656 'test5 test4', # test4 -> test5
1657 'test6 test0', # test0 -> test6
1658 'test7', # test7
1659 ]
1660 return '\n'.join(branch_deps)
1661 self.mock(git_cl, 'RunGit', mock_run_git)
1662
1663 class RecordCalls:
1664 times_called = 0
1665 record_calls = RecordCalls()
1666 def mock_CMDupload(*args, **_kwargs):
1667 record_calls.times_called += 1
1668 return 0
1669 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1670
1671 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001672 (('ask_for_data', 'This command will checkout all dependent branches '
1673 'and run "git cl upload". Press Enter to continue, '
1674 'or Ctrl+C to abort'), ''),
1675 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001676
1677 class MockChangelist():
1678 def __init__(self):
1679 pass
1680 def GetBranch(self):
1681 return 'test1'
1682 def GetIssue(self):
1683 return '123'
1684 def GetPatchset(self):
1685 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001686 def IsGerrit(self):
1687 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001688
1689 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1690 # CMDupload should have been called 5 times because of 5 dependent branches.
1691 self.assertEquals(5, record_calls.times_called)
1692 self.assertEquals(0, ret)
1693
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001694 def test_gerrit_change_id(self):
1695 self.calls = [
1696 ((['git', 'write-tree'], ),
1697 'hashtree'),
1698 ((['git', 'rev-parse', 'HEAD~0'], ),
1699 'branch-parent'),
1700 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1701 'A B <a@b.org> 1456848326 +0100'),
1702 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1703 'C D <c@d.org> 1456858326 +0100'),
1704 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1705 'hashchange'),
1706 ]
1707 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1708 self.assertEqual(change_id, 'Ihashchange')
1709
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001710 def test_desecription_append_footer(self):
1711 for init_desc, footer_line, expected_desc in [
1712 # Use unique desc first lines for easy test failure identification.
1713 ('foo', 'R=one', 'foo\n\nR=one'),
1714 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1715 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1716 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1717 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1718 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1719 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1720 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1721 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1722 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1723 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1724 ]:
1725 desc = git_cl.ChangeDescription(init_desc)
1726 desc.append_footer(footer_line)
1727 self.assertEqual(desc.description, expected_desc)
1728
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001729 def test_update_reviewers(self):
1730 data = [
1731 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001732 ('foo\nR=xx', [], 'foo\nR=xx'),
1733 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001734 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001735 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1736 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1737 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001738 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001739 ('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 +00001740 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001741 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1742 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1743 # Same as the line before, but full of whitespaces.
1744 (
1745 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1746 'foo\nBar\n\nR=c@c\n BUG =',
1747 ),
1748 # Whitespaces aren't interpreted as new lines.
1749 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001750 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001751 expected = [i[2] for i in data]
1752 actual = []
1753 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001754 obj = git_cl.ChangeDescription(orig)
1755 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001756 actual.append(obj.description)
1757 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001758
wittman@chromium.org455dc922015-01-26 20:15:50 +00001759 def test_get_target_ref(self):
1760 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001761 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001762 self.assertEqual(None, git_cl.GetTargetRef(None,
1763 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001764 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001765
wittman@chromium.org455dc922015-01-26 20:15:50 +00001766 # Check default target refs for branches.
1767 self.assertEqual('refs/heads/master',
1768 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001769 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001770 self.assertEqual('refs/heads/master',
1771 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001772 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001773 self.assertEqual('refs/heads/master',
1774 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001775 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001776 self.assertEqual('refs/branch-heads/123',
1777 git_cl.GetTargetRef('origin',
1778 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001779 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001780 self.assertEqual('refs/diff/test',
1781 git_cl.GetTargetRef('origin',
1782 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001783 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001784 self.assertEqual('refs/heads/chrome/m42',
1785 git_cl.GetTargetRef('origin',
1786 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001787 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001788
1789 # Check target refs for user-specified target branch.
1790 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1791 'refs/remotes/branch-heads/123'):
1792 self.assertEqual('refs/branch-heads/123',
1793 git_cl.GetTargetRef('origin',
1794 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001795 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001796 for branch in ('origin/master', 'remotes/origin/master',
1797 'refs/remotes/origin/master'):
1798 self.assertEqual('refs/heads/master',
1799 git_cl.GetTargetRef('origin',
1800 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001801 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001802 for branch in ('master', 'heads/master', 'refs/heads/master'):
1803 self.assertEqual('refs/heads/master',
1804 git_cl.GetTargetRef('origin',
1805 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001806 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001807
wychen@chromium.orga872e752015-04-28 23:42:18 +00001808 def test_patch_when_dirty(self):
1809 # Patch when local tree is dirty
1810 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1811 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1812
1813 def test_diff_when_dirty(self):
1814 # Do 'git cl diff' when local tree is dirty
1815 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1816 self.assertNotEqual(git_cl.main(['diff']), 0)
1817
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001818 @staticmethod
1819 def _get_gerrit_codereview_server_calls(branch, value=None,
1820 git_short_host='host',
1821 detect_branch=True):
1822 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1823
1824 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1825 """
1826 calls = []
1827 if detect_branch:
1828 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1829 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1830 CERR1 if value is None else value))
1831 if value is None:
1832 calls += [
1833 ((['git', 'config', 'branch.' + branch + '.merge'],),
1834 'refs/heads' + branch),
1835 ((['git', 'config', 'branch.' + branch + '.remote'],),
1836 'origin'),
1837 ((['git', 'config', 'remote.origin.url'],),
1838 'https://%s.googlesource.com/my/repo' % git_short_host),
1839 ]
1840 return calls
1841
tandriidf09a462016-08-18 16:23:55 -07001842 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001843 new_branch=False, git_short_host='host',
1844 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001845 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001846 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1847 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001848 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001849 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001850 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1851
tandriidf09a462016-08-18 16:23:55 -07001852 if new_branch:
1853 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1854 else:
1855 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001856
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001857 if not force_codereview:
1858 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001859 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001860 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001861 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1862 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001863 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001864 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001865
1866 if is_gerrit:
1867 if not force_codereview:
1868 self.calls += [
1869 ((['git', 'config', 'gerrit.host'],), 'true'),
1870 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001871 if detect_gerrit_server:
1872 self.calls += self._get_gerrit_codereview_server_calls(
1873 'master', git_short_host=git_short_host,
1874 detect_branch=not new_branch and force_codereview)
1875
1876 self.calls += [
1877 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001878 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001879 {
1880 'current_revision': '7777777777',
1881 'revisions': {
1882 '1111111111': {
1883 '_number': 1,
1884 'fetch': {'http': {
1885 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1886 'ref': 'refs/changes/56/123456/1',
1887 }},
1888 },
1889 '7777777777': {
1890 '_number': 7,
1891 'fetch': {'http': {
1892 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1893 'ref': 'refs/changes/56/123456/7',
1894 }},
1895 },
1896 },
1897 }),
1898 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001899 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001900 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001901 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001902 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001903 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001904 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001905 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001906
tandriidf09a462016-08-18 16:23:55 -07001907 def _common_patch_successful(self, new_branch=False):
1908 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001909 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001910 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001911 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001912 ((['git', 'config', 'branch.master.rietveldserver',
1913 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001914 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001915 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001916 ((['git', 'commit', '-m',
1917 'Description\n\n' +
1918 'patch from issue 123456 at patchset 60001 ' +
1919 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001920 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001921
1922 def test_patch_successful(self):
1923 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001924 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1925
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001926 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001927 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001928 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1929
wychen@chromium.orga872e752015-04-28 23:42:18 +00001930 def test_patch_conflict(self):
1931 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001932 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001933 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001934
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001935 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001936 self._patch_common(is_gerrit=True, git_short_host='chromium',
1937 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001938 self.calls += [
1939 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1940 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001941 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001942 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001943 ((['git', 'config', 'branch.master.gerritserver',
1944 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001945 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001946 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001947 ]
1948 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1949
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001950 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001951 self._patch_common(is_gerrit=True, force_codereview=True,
1952 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001953 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001954 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001955 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001956 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001957 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001958 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001959 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001960 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001961 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001962 ]
1963 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1964
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001965 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001966 self._patch_common(is_gerrit=True, git_short_host='else',
1967 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001968 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001969 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001970 'refs/changes/56/123456/1'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001971 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001972 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001973 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001974 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001975 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001976 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001977 ]
1978 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001979 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001980
1981 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001982 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
1983 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001984 self.calls += [
1985 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1986 'refs/changes/56/123456/1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001987 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1988 ''),
1989 ((['git', 'config', 'branch.master.gerritserver',
1990 'https://chromium-review.googlesource.com'],), ''),
1991 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001992 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1993 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1994 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001995 ]
1996 with self.assertRaises(SystemExitMock):
1997 git_cl.main(['patch',
1998 'https://chromium-review.googlesource.com/#/c/123456/1'])
1999
tandriic2405f52016-10-10 08:13:15 -07002000 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002001 def notExists(_issue, *_, **kwargs):
2002 self.assertFalse(kwargs['ignore_404'])
2003 raise git_cl.gerrit_util.GerritError(404, '')
2004 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2005
tandriic2405f52016-10-10 08:13:15 -07002006 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07002007 self.calls = [
2008 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2009 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2010 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2011 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2012 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2013 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08002014 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07002015 'or you have no access to it'],), SystemExitMock()),
2016 ]
2017 with self.assertRaises(SystemExitMock):
2018 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
2019
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002020 def _checkout_calls(self):
2021 return [
2022 ((['git', 'config', '--local', '--get-regexp',
2023 'branch\\..*\\.rietveldissue'], ),
2024 ('branch.retrying.rietveldissue 1111111111\n'
2025 'branch.some-fix.rietveldissue 2222222222\n')),
2026 ((['git', 'config', '--local', '--get-regexp',
2027 'branch\\..*\\.gerritissue'], ),
2028 ('branch.ger-branch.gerritissue 123456\n'
2029 'branch.gbranch654.gerritissue 654321\n')),
2030 ]
2031
2032 def test_checkout_gerrit(self):
2033 """Tests git cl checkout <issue>."""
2034 self.calls = self._checkout_calls()
2035 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2036 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2037
2038 def test_checkout_rietveld(self):
2039 """Tests git cl checkout <issue>."""
2040 self.calls = self._checkout_calls()
2041 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2042 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2043
2044 def test_checkout_not_found(self):
2045 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002046 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002047 self.calls = self._checkout_calls()
2048 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2049
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002050 def test_checkout_no_branch_issues(self):
2051 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002052 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002053 self.calls = [
2054 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002055 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002056 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002057 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002058 ]
2059 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2060
tandrii@chromium.org28253532016-04-14 13:46:56 +00002061 def _test_gerrit_ensure_authenticated_common(self, auth,
2062 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002063 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2064 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2065 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002066 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002067 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002068 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002069 cl.branch = 'master'
2070 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002071 cl.lookedup_issue = True
2072 return cl
2073
2074 def test_gerrit_ensure_authenticated_missing(self):
2075 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002076 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002077 })
2078 self.calls.append(
2079 ((['DieWithError',
2080 'Credentials for the following hosts are required:\n'
2081 ' chromium-review.googlesource.com\n'
2082 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002083 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002084 'https://chromium-review.googlesource.com/new-password'],), ''),)
2085 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2086
2087 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002088 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002089 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002090 'chromium.googlesource.com':
2091 ('git-one.example.com', None, 'secret1'),
2092 'chromium-review.googlesource.com':
2093 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002094 })
2095 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002096 (('ask_for_data', 'If you know what you are doing '
2097 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002098 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2099
2100 def test_gerrit_ensure_authenticated_ok(self):
2101 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002102 'chromium.googlesource.com':
2103 ('git-same.example.com', None, 'secret'),
2104 'chromium-review.googlesource.com':
2105 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002106 })
2107 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2108
tandrii@chromium.org28253532016-04-14 13:46:56 +00002109 def test_gerrit_ensure_authenticated_skipped(self):
2110 cl = self._test_gerrit_ensure_authenticated_common(
2111 auth={}, skip_auth_check=True)
2112 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2113
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002114 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002115 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2116 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002117 self.calls = [
2118 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002119 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002120 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2121 ((['git', 'config', 'rietveld.server'],), ''),
2122 ((['git', 'config', 'rietveld.server'],), ''),
2123 ((['git', 'config', 'branch.feature.rietveldserver'],),
2124 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002125 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002126 ]
2127 self.assertEqual(0, git_cl.main(['set-commit']))
2128
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002129 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002130 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002131 lambda h, i, labels, notify=None:
2132 self._mocked_call(['SetReview', h, i, labels, notify]))
2133
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002134 self.calls = [
2135 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002136 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2137 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002138 ((['git', 'config', 'branch.feature.gerritserver'],),
2139 'https://chromium-review.googlesource.com'),
2140 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002141 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002142 ]
tandriid9e5ce52016-07-13 02:32:59 -07002143
2144 def test_cmd_set_commit_gerrit_clear(self):
2145 self._cmd_set_commit_gerrit_common(0)
2146 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2147
2148 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002149 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002150 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2151
tandriid9e5ce52016-07-13 02:32:59 -07002152 def test_cmd_set_commit_gerrit(self):
2153 self._cmd_set_commit_gerrit_common(2)
2154 self.assertEqual(0, git_cl.main(['set-commit']))
2155
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002156 def test_description_display(self):
2157 out = StringIO.StringIO()
2158 self.mock(git_cl.sys, 'stdout', out)
2159
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002160 self.mock(git_cl, 'Changelist', ChangelistMock)
2161 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002162
2163 self.assertEqual(0, git_cl.main(['description', '-d']))
2164 self.assertEqual('foo\n', out.getvalue())
2165
2166 def test_description_rietveld(self):
2167 out = StringIO.StringIO()
2168 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002169 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002170
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002171 self.assertEqual(0, git_cl.main([
2172 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2173 self.assertEqual('foobar\n', out.getvalue())
2174
iannucci3c972b92016-08-17 13:24:10 -07002175 def test_StatusFieldOverrideIssueMissingArgs(self):
2176 out = StringIO.StringIO()
2177 self.mock(git_cl.sys, 'stderr', out)
2178
2179 try:
2180 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2181 except SystemExit as ex:
2182 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002183 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002184
2185 out = StringIO.StringIO()
2186 self.mock(git_cl.sys, 'stderr', out)
2187
2188 try:
2189 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2190 except SystemExit as ex:
2191 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002192 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002193
2194 def test_StatusFieldOverrideIssue(self):
2195 out = StringIO.StringIO()
2196 self.mock(git_cl.sys, 'stdout', out)
2197
2198 def assertIssue(cl_self, *_args):
2199 self.assertEquals(cl_self.issue, 1)
2200 return 'foobar'
2201
2202 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2203 self.calls = [
2204 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2205 ((['git', 'config', 'rietveld.server'],), ''),
2206 ((['git', 'config', 'rietveld.server'],), ''),
2207 ]
iannuccie53c9352016-08-17 14:40:40 -07002208 self.assertEqual(
2209 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2210 0)
iannucci3c972b92016-08-17 13:24:10 -07002211 self.assertEqual(out.getvalue(), 'foobar\n')
2212
iannuccie53c9352016-08-17 14:40:40 -07002213 def test_SetCloseOverrideIssue(self):
2214 def assertIssue(cl_self, *_args):
2215 self.assertEquals(cl_self.issue, 1)
2216 return 'foobar'
2217
2218 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2219 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2220 self.calls = [
2221 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2222 ((['git', 'config', 'rietveld.server'],), ''),
2223 ((['git', 'config', 'rietveld.server'],), ''),
2224 ]
2225 self.assertEqual(
2226 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2227
2228 def test_SetCommitOverrideIssue(self):
2229 def assertIssue(cl_self, *_args):
2230 self.assertEquals(cl_self.issue, 1)
2231 return 'foobar'
2232
2233 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2234 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2235 self.calls = [
2236 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2237 ((['git', 'config', 'rietveld.server'],), ''),
2238 ((['git', 'config', 'rietveld.server'],), ''),
2239 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2240 ((['git', 'config', 'rietveld.server'],), ''),
2241 ((['git', 'config', 'rietveld.server'],), ''),
2242 ]
2243 self.assertEqual(
2244 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2245
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002246 def test_description_gerrit(self):
2247 out = StringIO.StringIO()
2248 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002249 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002250 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002251 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2252 {
2253 'current_revision': 'sha1',
2254 'revisions': {'sha1': {
2255 'commit': {'message': 'foobar'},
2256 }},
2257 }),
2258 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002259 self.assertEqual(0, git_cl.main([
2260 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2261 self.assertEqual('foobar\n', out.getvalue())
2262
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002263 def test_description_set_raw(self):
2264 out = StringIO.StringIO()
2265 self.mock(git_cl.sys, 'stdout', out)
2266
2267 self.mock(git_cl, 'Changelist', ChangelistMock)
2268 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2269
2270 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2271 self.assertEqual('hihi', ChangelistMock.desc)
2272
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002273 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002274 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002275
2276 def RunEditor(desc, _, **kwargs):
2277 self.assertEquals(
2278 '# Enter a description of the change.\n'
2279 '# This will be displayed on the codereview site.\n'
2280 '# The first line will also be used as the subject of the review.\n'
2281 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002282 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002283 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002284 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002285 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002286 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002287
dsansomee2d6fd92016-09-08 00:10:47 -07002288 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002289 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002290
2291 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2292 self.mock(git_cl.Changelist, 'GetDescription',
2293 lambda *args: current_desc)
2294 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2295 UpdateDescriptionRemote)
2296 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2297
2298 self.calls = [
2299 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002300 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002301 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2302 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002303 ((['git', 'config', 'core.editor'],), 'vi'),
2304 ]
2305 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2306
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002307 def test_description_set_stdin(self):
2308 out = StringIO.StringIO()
2309 self.mock(git_cl.sys, 'stdout', out)
2310
2311 self.mock(git_cl, 'Changelist', ChangelistMock)
2312 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2313
2314 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2315 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2316
kmarshall3bff56b2016-06-06 18:31:47 -07002317 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002318 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2319
kmarshall3bff56b2016-06-06 18:31:47 -07002320 self.calls = \
2321 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2322 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002323 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002324 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2325 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002326 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2327 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2328 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002329 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2330 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2331 ((['git', 'branch', '-D', 'foo'],), '')]
2332
kmarshall3bff56b2016-06-06 18:31:47 -07002333 self.mock(git_cl, 'get_cl_statuses',
2334 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002335 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2336 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2337 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002338
2339 self.assertEqual(0, git_cl.main(['archive', '-f']))
2340
2341 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002342 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002343 self.calls = \
2344 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2345 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002346 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002347 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2348 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002349 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2350
kmarshall9249e012016-08-23 12:02:16 -07002351 self.mock(git_cl, 'get_cl_statuses',
2352 lambda branches, fine_grained, max_processes:
2353 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2354
2355 self.assertEqual(1, git_cl.main(['archive', '-f']))
2356
2357 def test_archive_dry_run(self):
2358 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2359
2360 self.calls = \
2361 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2362 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2363 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2364 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2365 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2366 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2367 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2368 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2369 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002370
2371 self.mock(git_cl, 'get_cl_statuses',
2372 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002373 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2374 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2375 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002376
kmarshall9249e012016-08-23 12:02:16 -07002377 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2378
2379 def test_archive_no_tags(self):
2380 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2381
2382 self.calls = \
2383 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2384 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2385 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2386 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2387 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2388 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2389 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2390 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2391 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2392 ((['git', 'branch', '-D', 'foo'],), '')]
2393
2394 self.mock(git_cl, 'get_cl_statuses',
2395 lambda branches, fine_grained, max_processes:
2396 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2397 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2398 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2399
2400 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002401
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002402 def test_cmd_issue_erase_existing(self):
2403 out = StringIO.StringIO()
2404 self.mock(git_cl.sys, 'stdout', out)
2405 self.calls = [
2406 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002407 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2408 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002409 # Let this command raise exception (retcode=1) - it should be ignored.
2410 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002411 CERR1),
2412 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2413 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002414 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2415 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2416 ''),
2417 ]
2418 self.assertEqual(0, git_cl.main(['issue', '0']))
2419
phajdan.jre328cf92016-08-22 04:12:17 -07002420 def test_cmd_issue_json(self):
2421 out = StringIO.StringIO()
2422 self.mock(git_cl.sys, 'stdout', out)
2423 self.calls = [
2424 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002425 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002426 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2427 ((['git', 'config', 'rietveld.server'],),
2428 'https://codereview.chromium.org'),
2429 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2430 (('write_json', 'output.json',
2431 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2432 ''),
2433 ]
2434 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2435
tandriide281ae2016-10-12 06:02:30 -07002436 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002437 self.mock(git_cl.Changelist, 'GetChange',
2438 lambda _, *a: (
2439 self._mocked_call(['GetChange']+list(a))))
2440 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2441 lambda *_, **__: (
2442 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002443 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2444 lambda _, s: self._mocked_call(['SetCQState', s]))
2445 self.calls = [
2446 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002447 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002448 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2449 ((['git', 'config', 'rietveld.server'],),
2450 'https://codereview.chromium.org'),
2451 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2452 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2453 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2454 ((['get_or_create_merge_base', 'feature', 'feature'],),
2455 'fake_ancestor_sha'),
2456 ((['GetChange', 'fake_ancestor_sha', None], ),
2457 git_cl.presubmit_support.GitChange(
2458 '', '', '', '', '', '', '', '')),
2459 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2460 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002461 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2462 ]
2463 out = StringIO.StringIO()
2464 self.mock(git_cl.sys, 'stdout', out)
2465 self.assertEqual(0, git_cl.main(['try']))
2466 self.assertEqual(
2467 out.getvalue(),
2468 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2469
tandrii8c5a3532016-11-04 07:52:02 -07002470 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2471 self.mock(git_cl.Changelist, 'GetChange',
2472 lambda _, *a: (
2473 self._mocked_call(['GetChange']+list(a))))
2474 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2475 lambda *_, **__: (
2476 self._mocked_call(['DoGetTryMasters'])))
2477 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2478 lambda _, s: self._mocked_call(['SetCQState', s]))
2479
tandrii8c5a3532016-11-04 07:52:02 -07002480 self.calls = [
2481 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2482 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2483 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2484 ((['git', 'config', 'branch.feature.gerritserver'],),
2485 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002486 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2487 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2488 'project': 'depot_tools',
2489 'status': 'OPEN',
2490 'owner': {'email': 'owner@e.mail'},
2491 'revisions': {
2492 'deadbeaf': {
2493 '_number': 6,
2494 },
2495 'beeeeeef': {
2496 '_number': 7,
2497 'fetch': {'http': {
2498 'url': 'https://chromium.googlesource.com/depot_tools',
2499 'ref': 'refs/changes/56/123456/7'
2500 }},
2501 },
2502 },
2503 }),
tandrii8c5a3532016-11-04 07:52:02 -07002504 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2505 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2506 ((['get_or_create_merge_base', 'feature', 'feature'],),
2507 'fake_ancestor_sha'),
2508 ((['GetChange', 'fake_ancestor_sha', None], ),
2509 git_cl.presubmit_support.GitChange(
2510 '', '', '', '', '', '', '', '')),
2511 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2512 ((['DoGetTryMasters'], ), None),
2513 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2514 ]
2515 out = StringIO.StringIO()
2516 self.mock(git_cl.sys, 'stdout', out)
2517 self.assertEqual(0, git_cl.main(['try']))
2518 self.assertEqual(
2519 out.getvalue(),
2520 'scheduled CQ Dry Run on '
2521 'https://chromium-review.googlesource.com/123456\n')
2522
2523 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2524 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2525 lambda _: {
2526 'owner_email': 'owner@e.mail',
2527 'private': False,
2528 'closed': False,
2529 'project': 'depot_tools',
2530 'patchsets': [20001],
2531 })
tandriide281ae2016-10-12 06:02:30 -07002532 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2533 self.calls = [
2534 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2535 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2536 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2537 ((['git', 'config', 'rietveld.server'],),
2538 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002539 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002540 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002541 ]
2542
2543 def _buildbucket_retry(*_, **kw):
2544 # self.maxDiff = 10000
2545 body = json.loads(kw['body'])
2546 self.assertEqual(len(body['builds']), 1)
2547 build = body['builds'][0]
2548 params = json.loads(build.pop('parameters_json'))
2549 self.assertEqual(params, {
2550 u'builder_name': u'win',
2551 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2552 u'revision': None}],
2553 u'properties': {
2554 u'category': u'git_cl_try',
2555 u'issue': 123,
2556 u'key': u'val',
2557 u'json': [{u'a': 1}, None],
2558 u'master': u'tryserver.chromium',
2559 u'patch_project': u'depot_tools',
2560 u'patch_storage': u'rietveld',
2561 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002562 u'rietveld': u'https://codereview.chromium.org',
2563 }
2564 })
2565 self.assertEqual(build, {
2566 u'bucket': u'master.tryserver.chromium',
2567 u'client_operation_id': u'uuid4',
2568 u'tags': [u'builder:win',
2569 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002570 u'user_agent:git_cl_try',
2571 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002572 })
2573
2574 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2575
2576 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2577 self.assertEqual(0, git_cl.main([
2578 'try', '-m', 'tryserver.chromium', '-b', 'win',
2579 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2580 self.assertRegexpMatches(
2581 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002582 'Tried jobs on:\nBucket: master.tryserver.chromium')
2583
tandrii8c5a3532016-11-04 07:52:02 -07002584 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2585 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2586 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2587
tandrii8c5a3532016-11-04 07:52:02 -07002588 self.calls = [
2589 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2590 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2591 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2592 ((['git', 'config', 'branch.feature.gerritserver'],),
2593 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002594 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002595 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002596 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002597 'status': 'OPEN',
2598 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002599 'revisions': {
2600 'deadbeaf': {
2601 '_number': 6,
2602 },
2603 'beeeeeef': {
2604 '_number': 7,
2605 'fetch': {'http': {
2606 'url': 'https://chromium.googlesource.com/depot_tools',
2607 'ref': 'refs/changes/56/123456/7'
2608 }},
2609 },
2610 },
2611 }),
2612 ]
2613
2614 def _buildbucket_retry(*_, **kw):
2615 # self.maxDiff = 10000
2616 body = json.loads(kw['body'])
2617 self.assertEqual(len(body['builds']), 1)
2618 build = body['builds'][0]
2619 params = json.loads(build.pop('parameters_json'))
2620 self.assertEqual(params, {
2621 u'builder_name': u'win',
2622 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2623 u'revision': None}],
2624 u'properties': {
2625 u'category': u'git_cl_try',
2626 u'key': u'val',
2627 u'json': [{u'a': 1}, None],
2628 u'master': u'tryserver.chromium',
2629
2630 u'patch_gerrit_url':
2631 u'https://chromium-review.googlesource.com',
2632 u'patch_issue': 123456,
2633 u'patch_project': u'depot_tools',
2634 u'patch_ref': u'refs/changes/56/123456/7',
2635 u'patch_repository_url':
2636 u'https://chromium.googlesource.com/depot_tools',
2637 u'patch_set': 7,
2638 u'patch_storage': u'gerrit',
2639 }
2640 })
2641 self.assertEqual(build, {
2642 u'bucket': u'master.tryserver.chromium',
2643 u'client_operation_id': u'uuid4',
2644 u'tags': [
2645 u'builder:win',
2646 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2647 u'user_agent:git_cl_try',
2648 u'master:tryserver.chromium'],
2649 })
2650
2651 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2652
2653 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2654 self.assertEqual(0, git_cl.main([
2655 'try', '-m', 'tryserver.chromium', '-b', 'win',
2656 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2657 self.assertRegexpMatches(
2658 git_cl.sys.stdout.getvalue(),
2659 'Tried jobs on:\nBucket: master.tryserver.chromium')
2660
borenet6c0efe62016-10-19 08:13:29 -07002661 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002662 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2663 lambda _: {
2664 'owner_email': 'owner@e.mail',
2665 'private': False,
2666 'closed': False,
2667 'project': 'depot_tools',
2668 'patchsets': [20001],
2669 })
borenet6c0efe62016-10-19 08:13:29 -07002670 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2671 self.calls = [
2672 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2673 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2674 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2675 ((['git', 'config', 'rietveld.server'],),
2676 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002677 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002678 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002679 ]
2680
2681 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002682 body = json.loads(kw['body'])
2683 self.assertEqual(len(body['builds']), 1)
2684 build = body['builds'][0]
2685 params = json.loads(build.pop('parameters_json'))
2686 self.assertEqual(params, {
2687 u'builder_name': u'win',
2688 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2689 u'revision': None}],
2690 u'properties': {
2691 u'category': u'git_cl_try',
2692 u'issue': 123,
2693 u'patch_project': u'depot_tools',
2694 u'patch_storage': u'rietveld',
2695 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002696 u'rietveld': u'https://codereview.chromium.org',
2697 }
2698 })
2699 self.assertEqual(build, {
2700 u'bucket': u'test.bucket',
2701 u'client_operation_id': u'uuid4',
2702 u'tags': [u'builder:win',
2703 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2704 u'user_agent:git_cl_try'],
2705 })
2706
2707 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2708
2709 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2710 self.assertEqual(0, git_cl.main([
2711 'try', '-B', 'test.bucket', '-b', 'win']))
2712 self.assertRegexpMatches(
2713 git_cl.sys.stdout.getvalue(),
2714 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002715
qyearsley123a4682016-10-26 09:12:17 -07002716 def test_git_cl_try_bots_on_multiple_masters(self):
2717 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2718 self.calls = [
2719 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2720 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2721 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2722 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002723 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002724 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2725 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2726 ]
2727
2728 def _buildbucket_retry(*_, **kw):
2729 body = json.loads(kw['body'])
2730 self.assertEqual(len(body['builds']), 2)
2731
2732 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2733 self.assertEqual(first_build_params['builder_name'], 'builder1')
2734 self.assertEqual(first_build_params['properties']['master'], 'master1')
2735
2736 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2737 self.assertEqual(first_build_params['builder_name'], 'builder2')
2738 self.assertEqual(first_build_params['properties']['master'], 'master2')
2739
2740 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2741
2742 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2743 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2744
2745 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2746 self.assertEqual(
2747 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2748 self.assertEqual(
2749 git_cl.sys.stdout.getvalue(),
2750 'Tried jobs on:\n'
2751 'Bucket: master.master1\n'
2752 ' builder1: []\n'
2753 'Bucket: master.master2\n'
2754 ' builder2: []\n'
2755 'To see results here, run: git cl try-results\n'
2756 'To see results in browser, run: git cl web\n')
2757
tandrii16e0b4e2016-06-07 10:34:28 -07002758 def _common_GerritCommitMsgHookCheck(self):
2759 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2760 self.mock(git_cl.os.path, 'abspath',
2761 lambda path: self._mocked_call(['abspath', path]))
2762 self.mock(git_cl.os.path, 'exists',
2763 lambda path: self._mocked_call(['exists', path]))
2764 self.mock(git_cl.gclient_utils, 'FileRead',
2765 lambda path: self._mocked_call(['FileRead', path]))
2766 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2767 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2768 self.calls = [
2769 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2770 ((['abspath', '../'],), '/abs/git_repo_root'),
2771 ]
2772 return git_cl.Changelist(codereview='gerrit', issue=123)
2773
2774 def test_GerritCommitMsgHookCheck_custom_hook(self):
2775 cl = self._common_GerritCommitMsgHookCheck()
2776 self.calls += [
2777 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2778 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2779 '#!/bin/sh\necho "custom hook"')
2780 ]
2781 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2782
2783 def test_GerritCommitMsgHookCheck_not_exists(self):
2784 cl = self._common_GerritCommitMsgHookCheck()
2785 self.calls += [
2786 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2787 ]
2788 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2789
2790 def test_GerritCommitMsgHookCheck(self):
2791 cl = self._common_GerritCommitMsgHookCheck()
2792 self.calls += [
2793 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2794 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2795 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002796 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002797 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2798 ''),
2799 ]
2800 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2801
tandriic4344b52016-08-29 06:04:54 -07002802 def test_GerritCmdLand(self):
2803 self.calls += [
2804 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2805 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2806 'deadbeaf'),
2807 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2808 ((['git', 'config', 'branch.feature.gerritserver'],),
2809 'chromium-review.googlesource.com'),
2810 ]
2811 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2812 cl._codereview_impl._GetChangeDetail = lambda _: {
2813 'labels': {},
2814 'current_revision': 'deadbeaf',
2815 }
agable32978d92016-11-01 12:55:02 -07002816 cl._codereview_impl._GetChangeCommit = lambda: {
2817 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002818 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002819 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2820 }
tandriic4344b52016-08-29 06:04:54 -07002821 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002822 out = StringIO.StringIO()
2823 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002824 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002825 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002826 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002827
tandrii221ab252016-10-06 08:12:04 -07002828 BUILDBUCKET_BUILDS_MAP = {
2829 '9000': {
2830 'id': '9000',
2831 'status': 'STARTED',
2832 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2833 'result_details_json': '{"properties": {}}',
2834 'bucket': 'master.x.y',
2835 'created_by': 'user:someone@chromium.org',
2836 'created_ts': '147200002222000',
2837 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2838 },
2839 '8000': {
2840 'id': '8000',
2841 'status': 'COMPLETED',
2842 'result': 'FAILURE',
2843 'failure_reason': 'BUILD_FAILURE',
2844 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2845 'result_details_json': '{"properties": {}}',
2846 'bucket': 'master.x.y',
2847 'created_by': 'user:someone@chromium.org',
2848 'created_ts': '147200001111000',
2849 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2850 },
2851 }
2852
2853 def test_write_try_results_json(self):
2854 expected_output = [
2855 {
2856 'buildbucket_id': '8000',
2857 'bucket': 'master.x.y',
2858 'builder_name': 'my-builder',
2859 'status': 'COMPLETED',
2860 'result': 'FAILURE',
2861 'failure_reason': 'BUILD_FAILURE',
2862 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2863 },
2864 {
2865 'buildbucket_id': '9000',
2866 'bucket': 'master.x.y',
2867 'builder_name': 'my-builder',
2868 'status': 'STARTED',
2869 'result': None,
2870 'failure_reason': None,
2871 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2872 }
2873 ]
2874 self.calls = [(('write_json', 'output.json', expected_output), '')]
2875 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2876
tandrii45b2a582016-10-11 03:14:16 -07002877 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002878 out = StringIO.StringIO()
2879 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002880 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2881 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002882 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2883 self._mocked_call(['get_authenticator_for_host', host]))
2884 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2885 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002886
2887 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2888 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002889 self.calls += [
2890 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2891 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2892 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2893 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2894 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2895 ((['git', 'config', 'branch.feature.rietveldserver'],),
2896 'codereview.example.com'),
2897 ((['get_authenticator_for_host', 'codereview.example.com'],),
2898 AuthenticatorMock()),
2899 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2900
2901 def test_fetch_try_jobs_none_rietveld(self):
2902 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002903 # Simulate that user isn't logged in.
2904 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002905 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002906 self.assertRegexpMatches(sys.stdout.getvalue(),
2907 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002908 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2909
2910 def test_fetch_try_jobs_some_rietveld(self):
2911 self._setup_fetch_try_jobs_rietveld({
2912 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2913 })
2914 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002915 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2916 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2917 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2918
2919 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2920 self._setup_fetch_try_jobs(most_recent_patchset=13)
2921 self.calls += [
2922 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2923 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2924 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002925 # TODO(tandrii): Uncomment the below if we decide to support checking
2926 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002927 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002928 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002929 ((['git', 'config', 'branch.feature.gerritserver'],),
2930 'https://x-review.googlesource.com'),
2931 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2932 AuthenticatorMock()),
2933 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2934
2935 def test_fetch_try_jobs_none_gerrit(self):
2936 self._setup_fetch_try_jobs_gerrit({})
2937 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002938 # TODO(tandrii): Uncomment the below if we decide to support checking
2939 # patchsets for Gerrit.
2940 # self.assertRegexpMatches(
2941 # sys.stdout.getvalue(),
2942 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002943 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2944
2945 def test_fetch_try_jobs_some_gerrit(self):
2946 self._setup_fetch_try_jobs_gerrit({
2947 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2948 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002949 # TODO(tandrii): Uncomment the below if we decide to support checking
2950 # patchsets for Gerrit.
2951 # self.calls.remove(
2952 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002953 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2954
2955 # ... and doesn't result in warning.
2956 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2957 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002958 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2959 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2960
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002961 def _mock_gerrit_changes_for_detail_cache(self):
2962 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002963
2964 def test_gerrit_change_detail_cache_normalize(self):
2965 self._mock_gerrit_changes_for_detail_cache()
2966 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002967 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002968 ]
2969 cl = git_cl.Changelist(codereview='gerrit')
2970 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2971 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2972 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2973 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2974
2975 def test_gerrit_change_detail_cache_simple(self):
2976 self._mock_gerrit_changes_for_detail_cache()
2977 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002978 (('GetChangeDetail', 'host', '1', []), 'a'),
2979 (('GetChangeDetail', 'host', '2', []), 'b'),
2980 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002981 ]
2982 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2983 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2984 self.assertEqual(cl._GetChangeDetail(), 'a')
2985 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002986 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002987 self.assertEqual(cl._GetChangeDetail(), 'a')
2988 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2989
2990 def test_gerrit_change_detail_cache_options(self):
2991 self._mock_gerrit_changes_for_detail_cache()
2992 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002993 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
2994 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
2995 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
2996 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002997 ]
2998 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2999 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3000 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3001 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3002 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3003 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3004 self.assertEqual(cl._GetChangeDetail(), 'cab')
3005
3006 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3007 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3008 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3009 self.assertEqual(cl._GetChangeDetail(), 'cab')
3010
3011 # Finally, no_cache should invalidate all caches for given change.
3012 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3013 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3014
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003015 def test_gerrit_description_caching(self):
3016 def gen_detail(rev, desc):
3017 return {
3018 'current_revision': rev,
3019 'revisions': {rev: {'commit': {'message': desc}}}
3020 }
3021 self.calls = [
3022 (('GetChangeDetail', 'host', '1',
3023 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3024 gen_detail('rev1', 'desc1')),
3025 (('GetChangeDetail', 'host', '1',
3026 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3027 gen_detail('rev2', 'desc2')),
3028 ]
3029
3030 self._mock_gerrit_changes_for_detail_cache()
3031 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3032 self.assertEqual(cl.GetDescription(), 'desc1')
3033 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3034 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003035
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003036 def test_print_current_creds(self):
3037 class CookiesAuthenticatorMock(object):
3038 def __init__(self):
3039 self.gitcookies = {
3040 'host.googlesource.com': ('user', 'pass'),
3041 'host-review.googlesource.com': ('user', 'pass'),
3042 }
3043 self.netrc = self
3044 self.netrc.hosts = {
3045 'github.com': ('user2', None, 'pass2'),
3046 'host2.googlesource.com': ('user3', None, 'pass'),
3047 }
3048 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3049 CookiesAuthenticatorMock)
3050 self.mock(sys, 'stdout', StringIO.StringIO())
3051 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3052 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3053 ' Host\t User\t Which file',
3054 '============================\t=====\t===========',
3055 'host-review.googlesource.com\t user\t.gitcookies',
3056 ' host.googlesource.com\t user\t.gitcookies',
3057 ' host2.googlesource.com\tuser3\t .netrc',
3058 ])
3059 sys.stdout.buf = ''
3060 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3061 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3062 ' Host\tUser\t Which file',
3063 '============================\t====\t===========',
3064 'host-review.googlesource.com\tuser\t.gitcookies',
3065 ' host.googlesource.com\tuser\t.gitcookies',
3066 ])
3067
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003068 def _common_creds_check_mocks(self):
3069 def exists_mock(path):
3070 dirname = os.path.dirname(path)
3071 if dirname == os.path.expanduser('~'):
3072 dirname = '~'
3073 base = os.path.basename(path)
3074 if base in ('.netrc', '.gitcookies'):
3075 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3076 # git cl also checks for existence other files not relevant to this test.
3077 return None
3078 self.mock(os.path, 'exists', exists_mock)
3079 self.mock(sys, 'stdout', StringIO.StringIO())
3080
3081 def test_creds_check_gitcookies_not_configured(self):
3082 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003083 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003084 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003085 self.calls = [
3086 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3087 (('os.path.exists', '~/.netrc'), True),
3088 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3089 'or Ctrl+C to abort'), ''),
3090 ((['git', 'config', '--global', 'http.cookiefile',
3091 os.path.expanduser('~/.gitcookies')], ), ''),
3092 ]
3093 self.assertEqual(0, git_cl.main(['creds-check']))
3094 self.assertRegexpMatches(
3095 sys.stdout.getvalue(),
3096 '^You seem to be using outdated .netrc for git credentials:')
3097 self.assertRegexpMatches(
3098 sys.stdout.getvalue(),
3099 '\nConfigured git to use .gitcookies from')
3100
3101 def test_creds_check_gitcookies_configured_custom_broken(self):
3102 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003103 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003104 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003105 self.calls = [
3106 ((['git', 'config', '--global', 'http.cookiefile'],),
3107 '/custom/.gitcookies'),
3108 (('os.path.exists', '/custom/.gitcookies'), False),
3109 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3110 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3111 ((['git', 'config', '--global', 'http.cookiefile',
3112 os.path.expanduser('~/.gitcookies')], ), ''),
3113 ]
3114 self.assertEqual(0, git_cl.main(['creds-check']))
3115 self.assertRegexpMatches(
3116 sys.stdout.getvalue(),
3117 'WARNING: you have configured custom path to .gitcookies: ')
3118 self.assertRegexpMatches(
3119 sys.stdout.getvalue(),
3120 'However, your configured .gitcookies file is missing.')
3121
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003122 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003123 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3124 lambda _, message: self._mocked_call('AddComment', message))
3125 self.calls = [
3126 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3127 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3128 (('AddComment', 'msg'), ''),
3129 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003130 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3131 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003132
3133 def test_git_cl_comment_add_gerrit(self):
3134 self.mock(git_cl.gerrit_util, 'SetReview',
3135 lambda host, change, msg:
3136 self._mocked_call('SetReview', host, change, msg))
3137 self.calls = [
3138 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3139 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3140 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3141 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3142 'origin/master'),
3143 ((['git', 'config', 'remote.origin.url'],),
3144 'https://chromium.googlesource.com/infra/infra'),
3145 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3146 ]
3147 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3148 '-a', 'msg']))
3149
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003150 def test_git_cl_comments_fetch_rietveld(self):
3151 self.mock(sys, 'stdout', StringIO.StringIO())
3152 self.calls = [
3153 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3154 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3155 ] * 2
3156 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3157 'messages': [
3158 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3159 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3160 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3161 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3162 # Intentionally wrong order here.
3163 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3164 'disapproval': False, 'approval': False,
3165 'sender': 'owner@example.com'},
3166 ],
3167 'owner_email': 'owner@example.com',
3168 })
3169 expected_comments_summary = [
3170 git_cl._CommentSummary(
3171 message='lgtm',
3172 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3173 disapproval=False, approval=True, sender='r@example.com'),
3174 git_cl._CommentSummary(
3175 message='not lgtm',
3176 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3177 disapproval=True, approval=False, sender='r2@example.com'),
3178 # Note: same order as in whatever Rietveld returns.
3179 git_cl._CommentSummary(
3180 message='PTAL',
3181 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3182 disapproval=False, approval=False, sender='owner@example.com'),
3183 ]
3184 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3185 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3186
3187 with git_cl.gclient_utils.temporary_directory() as tempdir:
3188 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3189 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3190 '-j', out_file]))
3191 with open(out_file) as f:
3192 read = json.load(f)
3193 self.assertEqual(len(read), 3)
3194 self.assertEqual(read[0], {
3195 'date': '2000-03-13 20:49:34.515270',
3196 'message': 'PTAL',
3197 'approval': False,
3198 'disapproval': False,
3199 'sender': 'owner@example.com'})
3200 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3201 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3202
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003203 def test_git_cl_comments_fetch_gerrit(self):
3204 self.mock(sys, 'stdout', StringIO.StringIO())
3205 self.calls = [
3206 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3207 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3208 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3209 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3210 'origin/master'),
3211 ((['git', 'config', 'remote.origin.url'],),
3212 'https://chromium.googlesource.com/infra/infra'),
3213 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3214 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3215 'owner': {'email': 'owner@example.com'},
3216 'messages': [
3217 {
3218 u'_revision_number': 1,
3219 u'author': {
3220 u'_account_id': 1111084,
3221 u'email': u'commit-bot@chromium.org',
3222 u'name': u'Commit Bot'
3223 },
3224 u'date': u'2017-03-15 20:08:45.000000000',
3225 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3226 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3227 u'tag': u'autogenerated:cq:dry-run'
3228 },
3229 {
3230 u'_revision_number': 2,
3231 u'author': {
3232 u'_account_id': 11151243,
3233 u'email': u'owner@example.com',
3234 u'name': u'owner'
3235 },
3236 u'date': u'2017-03-16 20:00:41.000000000',
3237 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3238 u'message': u'PTAL',
3239 },
3240 {
3241 u'_revision_number': 2,
3242 u'author': {
3243 u'_account_id': 148512 ,
3244 u'email': u'reviewer@example.com',
3245 u'name': u'reviewer'
3246 },
3247 u'date': u'2017-03-17 05:19:37.500000000',
3248 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3249 u'message': u'Patch Set 2: Code-Review+1',
3250 },
3251 ]
3252 })
3253 ] * 2
3254 expected_comments_summary = [
3255 git_cl._CommentSummary(
3256 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3257 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3258 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3259 git_cl._CommentSummary(
3260 message=u'PTAL',
3261 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3262 disapproval=False, approval=False, sender=u'owner@example.com'),
3263 git_cl._CommentSummary(
3264 message=u'Patch Set 2: Code-Review+1',
3265 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3266 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3267 ]
3268 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3269 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3270
3271 with git_cl.gclient_utils.temporary_directory() as tempdir:
3272 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3273 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3274 '-j', out_file]))
3275 with open(out_file) as f:
3276 read = json.load(f)
3277 self.assertEqual(len(read), 3)
3278 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3279 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3280 self.assertEqual(read[2], {
3281 u'date': u'2017-03-17 05:19:37.500000',
3282 u'message': u'Patch Set 2: Code-Review+1',
3283 u'approval': False,
3284 u'disapproval': False,
3285 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003286
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003287if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003288 logging.basicConfig(
3289 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003290 unittest.main()