blob: 2aaa984873f42b8066c6a03722a70006d79a128a [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
tandriide281ae2016-10-12 06:02:30 -07009import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010010import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000011import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000012import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000013import sys
14import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000015import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000016
17sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
18
19from testing_support.auto_stub import TestCase
20
21import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000022import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000023import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000024import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025
tandrii5d48c322016-08-18 16:19:37 -070026def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
27 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
28
29
30CERR1 = callError(1)
31
32
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000033class ChangelistMock(object):
34 # A class variable so we can access it when we don't have access to the
35 # instance that's being set.
36 desc = ""
37 def __init__(self, **kwargs):
38 pass
39 def GetIssue(self):
40 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080041 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000042 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070043 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000044 ChangelistMock.desc = desc
45
tandrii5d48c322016-08-18 16:19:37 -070046
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000047class PresubmitMock(object):
48 def __init__(self, *args, **kwargs):
49 self.reviewers = []
50 @staticmethod
51 def should_continue():
52 return True
53
54
55class RietveldMock(object):
56 def __init__(self, *args, **kwargs):
57 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000058
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000059 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080060 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000061 return 'Issue: %d' % issue
62
maruel@chromium.org78936cb2013-04-11 00:17:52 +000063 @staticmethod
64 def get_issue_properties(_issue, _messages):
65 return {
66 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
67 'messages': [
68 {
69 'approval': True,
70 'sender': 'john@chromium.org',
71 },
72 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010073 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000074 }
75
iannuccie53c9352016-08-17 14:40:40 -070076 @staticmethod
77 def close_issue(_issue):
78 return 'Closed'
79
skobes6468b902016-10-24 08:45:10 -070080 @staticmethod
81 def get_patch(issue, patchset):
82 return 'patch set from issue %s patchset %s' % (issue, patchset)
83
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010084 @staticmethod
85 def update_description(_issue, _description):
86 return 'Updated'
87
88 @staticmethod
89 def add_comment(_issue, _comment):
90 return 'Commented'
91
92
93
skobes6468b902016-10-24 08:45:10 -070094
95class GitCheckoutMock(object):
96 def __init__(self, *args, **kwargs):
97 pass
98
99 @staticmethod
100 def reset():
101 GitCheckoutMock.conflict = False
102
103 def apply_patch(self, p):
104 if GitCheckoutMock.conflict:
105 raise Exception('failed')
106
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000107
108class WatchlistsMock(object):
109 def __init__(self, _):
110 pass
111 @staticmethod
112 def GetWatchersForPaths(_):
113 return ['joe@example.com']
114
115
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000116class CodereviewSettingsFileMock(object):
117 def __init__(self):
118 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800119 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000120 def read(self):
121 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000122 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000123
124
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000125class AuthenticatorMock(object):
126 def __init__(self, *_args):
127 pass
128 def has_cached_credentials(self):
129 return True
tandrii221ab252016-10-06 08:12:04 -0700130 def authorize(self, http):
131 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000132
133
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000134def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
135 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
136
137 Usage:
138 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
139 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
140
141 OR
142 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
143 CookiesAuthenticatorMockFactory(cookie='cookie'))
144 """
145 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800146 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 # Intentionally not calling super() because it reads actual cookie files.
148 pass
149 @classmethod
150 def get_gitcookies_path(cls):
151 return '~/.gitcookies'
152 @classmethod
153 def get_netrc_path(cls):
154 return '~/.netrc'
155 def get_auth_header(self, host):
156 if same_cookie:
157 return same_cookie
158 return (hosts_with_creds or {}).get(host)
159 return CookiesAuthenticatorMock
160
kmarshall9249e012016-08-23 12:02:16 -0700161class MockChangelistWithBranchAndIssue():
162 def __init__(self, branch, issue):
163 self.branch = branch
164 self.issue = issue
165 def GetBranch(self):
166 return self.branch
167 def GetIssue(self):
168 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000169
tandriic2405f52016-10-10 08:13:15 -0700170
171class SystemExitMock(Exception):
172 pass
173
174
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000175class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100176 def test_get_description(self):
177 cl = git_cl.Changelist(issue=1, codereview='rietveld',
178 codereview_host='host')
179 cl.description = 'x'
180 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800181 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100182 self.assertEquals(cl.GetDescription(), 'x')
183 self.assertEquals(cl.GetDescription(force=True), 'y')
184 self.assertEquals(cl.GetDescription(), 'y')
185
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000186 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
187 parsed = urlparse.urlparse(url)
188 result = func(parsed)
189 if fail:
190 self.assertIsNone(result)
191 return None
192 self.assertIsNotNone(result)
193 self.assertEqual(result.issue, issue)
194 self.assertEqual(result.patchset, patchset)
195 self.assertEqual(result.hostname, hostname)
196 return result
197
198 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700199 def test(url, issue=None, patchset=None, hostname=None, fail=None):
200 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000201 git_cl._RietveldChangelistImpl.ParseIssueURL,
202 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000203
204 test('http://codereview.chromium.org/123',
205 123, None, 'codereview.chromium.org')
206 test('https://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/whatever',
211 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700212 test('https://codereview.chromium.org/123/#ps20001',
213 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000214 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700215 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000216 # This looks like bad Gerrit, but is actually valid Rietveld.
217 test('https://chrome-review.source.com/123/4/',
218 123, None, 'chrome-review.source.com')
219
220 test('https://codereview.chromium.org/deadbeaf', fail=True)
221 test('https://codereview.chromium.org/api/123', fail=True)
222 test('bad://codereview.chromium.org/123', fail=True)
223 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
224
225 def test_ParseIssueURL_gerrit(self):
226 def test(url, issue=None, patchset=None, hostname=None, fail=None):
227 self._test_ParseIssueUrl(
228 git_cl._GerritChangelistImpl.ParseIssueURL,
229 url, issue, patchset, hostname, fail)
230
231 test('http://chrome-review.source.com/c/123',
232 123, None, 'chrome-review.source.com')
233 test('https://chrome-review.source.com/c/123/',
234 123, None, 'chrome-review.source.com')
235 test('https://chrome-review.source.com/c/123/4',
236 123, 4, '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/123',
242 123, None, 'chrome-review.source.com')
243 test('https://chrome-review.source.com/123/4',
244 123, 4, 'chrome-review.source.com')
245
246 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
247 test('https://chrome-review.source.com/c/abc/', fail=True)
248 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
249
250 def test_ParseIssueNumberArgument(self):
251 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
252 result = git_cl.ParseIssueNumberArgument(arg)
253 self.assertIsNotNone(result)
254 if fail:
255 self.assertFalse(result.valid)
256 else:
257 self.assertEqual(result.issue, issue)
258 self.assertEqual(result.patchset, patchset)
259 self.assertEqual(result.hostname, hostname)
260
261 test('123', 123)
262 test('', fail=True)
263 test('abc', fail=True)
264 test('123/1', fail=True)
265 test('123a', fail=True)
266 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
267 # Rietveld.
268 test('https://codereview.source.com/123',
269 123, None, 'codereview.source.com')
270 test('https://codereview.source.com/www123', fail=True)
271 # Gerrrit.
272 test('https://chrome-review.source.com/c/123/4',
273 123, 4, 'chrome-review.source.com')
274 test('https://chrome-review.source.com/bad/123/4', fail=True)
275
tandriif9aefb72016-07-01 09:06:51 -0700276 def test_get_bug_line_values(self):
277 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
278 self.assertEqual(f('', ''), [])
279 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
280 self.assertEqual(f('v8', '456'), ['v8:456'])
281 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
282 # Not nice, but not worth carying.
283 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
284 ['v8:456', 'chromium:123', 'v8:123'])
285
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100286 def _test_git_number(self, parent_msg, dest_ref, child_msg,
287 parent_hash='parenthash'):
288 desc = git_cl.ChangeDescription(child_msg)
289 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
290 return desc.description
291
292 def assertEqualByLine(self, actual, expected):
293 self.assertEqual(actual.splitlines(), expected.splitlines())
294
295 def test_git_number_bad_parent(self):
296 with self.assertRaises(ValueError):
297 self._test_git_number('Parent', 'refs/heads/master', 'Child')
298
299 def test_git_number_bad_parent_footer(self):
300 with self.assertRaises(AssertionError):
301 self._test_git_number(
302 'Parent\n'
303 '\n'
304 'Cr-Commit-Position: wrong',
305 'refs/heads/master', 'Child')
306
307 def test_git_number_bad_lineage_ignored(self):
308 actual = self._test_git_number(
309 'Parent\n'
310 '\n'
311 'Cr-Commit-Position: refs/heads/master@{#1}\n'
312 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
313 'refs/heads/master', 'Child')
314 self.assertEqualByLine(
315 actual,
316 'Child\n'
317 '\n'
318 'Cr-Commit-Position: refs/heads/master@{#2}\n'
319 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
320
321 def test_git_number_same_branch(self):
322 actual = self._test_git_number(
323 'Parent\n'
324 '\n'
325 'Cr-Commit-Position: refs/heads/master@{#12}',
326 dest_ref='refs/heads/master',
327 child_msg='Child')
328 self.assertEqualByLine(
329 actual,
330 'Child\n'
331 '\n'
332 'Cr-Commit-Position: refs/heads/master@{#13}')
333
334 def test_git_number_same_branch_with_originals(self):
335 actual = self._test_git_number(
336 'Parent\n'
337 '\n'
338 'Cr-Commit-Position: refs/heads/master@{#12}',
339 dest_ref='refs/heads/master',
340 child_msg='Child\n'
341 '\n'
342 'Some users are smart and insert their own footers\n'
343 '\n'
344 'Cr-Whatever: value\n'
345 'Cr-Commit-Position: refs/copy/paste@{#22}')
346 self.assertEqualByLine(
347 actual,
348 'Child\n'
349 '\n'
350 'Some users are smart and insert their own footers\n'
351 '\n'
352 'Cr-Original-Whatever: value\n'
353 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
354 'Cr-Commit-Position: refs/heads/master@{#13}')
355
356 def test_git_number_new_branch(self):
357 actual = self._test_git_number(
358 'Parent\n'
359 '\n'
360 'Cr-Commit-Position: refs/heads/master@{#12}',
361 dest_ref='refs/heads/branch',
362 child_msg='Child')
363 self.assertEqualByLine(
364 actual,
365 'Child\n'
366 '\n'
367 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
368 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
369
370 def test_git_number_lineage(self):
371 actual = self._test_git_number(
372 'Parent\n'
373 '\n'
374 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
375 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
376 dest_ref='refs/heads/branch',
377 child_msg='Child')
378 self.assertEqualByLine(
379 actual,
380 'Child\n'
381 '\n'
382 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
383 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
384
385 def test_git_number_moooooooore_lineage(self):
386 actual = self._test_git_number(
387 'Parent\n'
388 '\n'
389 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
390 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
391 dest_ref='refs/heads/mooore',
392 child_msg='Child')
393 self.assertEqualByLine(
394 actual,
395 'Child\n'
396 '\n'
397 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
398 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
399 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
400
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100401 def test_git_number_ever_moooooooore_lineage(self):
402 self.maxDiff = 10000
403 actual = self._test_git_number(
404 'CQ commit on fresh new branch + numbering.\n'
405 '\n'
406 'NOTRY=True\n'
407 'NOPRESUBMIT=True\n'
408 'BUG=\n'
409 '\n'
410 'Review-Url: https://codereview.chromium.org/2577703003\n'
411 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
412 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
413 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
414 dest_ref='refs/heads/gnumb-test/cl',
415 child_msg='git cl on fresh new branch + numbering.\n'
416 '\n'
417 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
418 self.assertEqualByLine(
419 actual,
420 'git cl on fresh new branch + numbering.\n'
421 '\n'
422 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
423 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
424 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
425 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
426 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100427
428 def test_git_number_cherry_pick(self):
429 actual = self._test_git_number(
430 'Parent\n'
431 '\n'
432 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
433 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
434 dest_ref='refs/heads/branch',
435 child_msg='Child, which is cherry-pick from master\n'
436 '\n'
437 'Cr-Commit-Position: refs/heads/master@{#100}\n'
438 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
439 self.assertEqualByLine(
440 actual,
441 'Child, which is cherry-pick from master\n'
442 '\n'
443 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
444 '\n'
445 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
446 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
447 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
448
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000449
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100450class GitCookiesCheckerTest(unittest.TestCase):
451 def setUp(self):
452 super(GitCookiesCheckerTest, self).setUp()
453 self.c = git_cl._GitCookiesChecker()
454
455 def mock_hosts_creds(self, subhost_identity_pairs):
456 def ensure_googlesource(h):
457 if not h.endswith(self.c._GOOGLESOURCE):
458 assert not h.endswith('.')
459 return h + '.' + self.c._GOOGLESOURCE
460 return h
461 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
462 for h, i in subhost_identity_pairs]
463
464 def test_analysis_nothing(self):
465 self.c._all_hosts = []
466 self.assertFalse(self.c.has_generic_host())
467 self.assertEqual(set(), self.c.get_conflicting_hosts())
468 self.assertEqual(set(), self.c.get_duplicated_hosts())
469 self.assertEqual(set(), self.c.get_partially_configured_hosts())
470 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
471
472 def test_analysis(self):
473 self.mock_hosts_creds([
474 ('.googlesource.com', 'git-example.chromium.org'),
475
476 ('chromium', 'git-example.google.com'),
477 ('chromium-review', 'git-example.google.com'),
478 ('chrome-internal', 'git-example.chromium.org'),
479 ('chrome-internal-review', 'git-example.chromium.org'),
480 ('conflict', 'git-example.google.com'),
481 ('conflict-review', 'git-example.chromium.org'),
482 ('dup', 'git-example.google.com'),
483 ('dup', 'git-example.google.com'),
484 ('dup-review', 'git-example.google.com'),
485 ('partial', 'git-example.google.com'),
486 ])
487 self.assertTrue(self.c.has_generic_host())
488 self.assertEqual(set(['conflict.googlesource.com']),
489 self.c.get_conflicting_hosts())
490 self.assertEqual(set(['dup.googlesource.com']),
491 self.c.get_duplicated_hosts())
492 self.assertEqual(set(['partial.googlesource.com']),
493 self.c.get_partially_configured_hosts())
494 self.assertEqual(set(['chromium.googlesource.com',
495 'chrome-internal.googlesource.com']),
496 self.c.get_hosts_with_wrong_identities())
497
498
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000499class TestGitCl(TestCase):
500 def setUp(self):
501 super(TestGitCl, self).setUp()
502 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700503 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000504 self.mock(subprocess2, 'call', self._mocked_call)
505 self.mock(subprocess2, 'check_call', self._mocked_call)
506 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700507 self.mock(subprocess2, 'communicate',
508 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000509 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000510 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000511 self.mock(git_common, 'get_or_create_merge_base',
512 lambda *a: (
513 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000514 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000515 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100516 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
517 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700518 self.mock(git_cl, 'write_json', lambda path, contents:
519 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000520 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000521 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000522 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700523 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
524 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000525 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000526 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000527 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100528 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
529 lambda *args, **kwargs: self._mocked_call(
530 'GetChangeDetail', *args, **kwargs))
531 self.mock(git_cl.gerrit_util, 'AddReviewers',
532 lambda h, i, add, is_reviewer, notify: self._mocked_call(
533 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000534 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
535 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700536 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100537 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000538 # It's important to reset settings to not have inter-tests interference.
539 git_cl.settings = None
540
541 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000542 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100543 self.assertEquals([], self.calls)
544 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000545 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100546 raise
547 # Sadly, has_failed() returns True if this OR any other tests before this
548 # one have failed.
549 git_cl.logging.exception(
550 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
551 'There are un-consumed self.calls after this test has finished.\n'
552 'If you don\'t know which test this is, run:\n'
Mark Mentovai57c47212017-03-09 11:14:09 -0500553 ' tests/git_cl_test.py -v\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100554 '\n'
555 'If you are already running just this single test, then **first** '
556 'fix the problem whose exception is emitted below by unittest '
557 'runner.\n'
558 '\n'
559 'Else, to be sure what\'s going on, run this test **alone** with \n'
Mark Mentovai57c47212017-03-09 11:14:09 -0500560 ' tests/git_cl_test.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100561 'and follow instructions above.\n' +
562 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000563 finally:
564 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000565
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000566 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000567 self.assertTrue(
568 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700569 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000570 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000571 expected_args, result = top
572
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000573 # Also logs otherwise it could get caught in a try/finally and be hard to
574 # diagnose.
575 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700576 N = 5
577 prior_calls = '\n '.join(
578 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
579 for i, c in enumerate(self._calls_done[-N:]))
580 following_calls = '\n '.join(
581 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
582 for i, c in enumerate(self.calls[:N]))
583 extended_msg = (
584 'A few prior calls:\n %s\n\n'
585 'This (expected):\n @%d: %r\n'
586 'This (actual):\n @%d: %r\n\n'
587 'A few following expected calls:\n %s' %
588 (prior_calls, len(self._calls_done), expected_args,
589 len(self._calls_done), args, following_calls))
590 git_cl.logging.error(extended_msg)
591
tandrii99a72f22016-08-17 14:33:24 -0700592 self.fail('@%d\n'
593 ' Expected: %r\n'
594 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700595 len(self._calls_done), expected_args, args))
596
597 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700598 if isinstance(result, Exception):
599 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000600 return result
601
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100602 def test_ask_for_explicit_yes_true(self):
603 self.calls = [
604 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
605 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
606 ]
607 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
608
609 def test_ask_for_explicit_yes_true(self):
610 self.calls = [
611 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
612 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
613 ]
614 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
615
tandrii48df5812016-10-17 03:55:37 -0700616 def test_LoadCodereviewSettingsFromFile_gerrit(self):
617 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
618 self.calls = [
619 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
620 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
621 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
622 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
Mark Mentovai57c47212017-03-09 11:14:09 -0500623 ((['git', 'config', '--unset-all', 'rietveld.bug-line-format'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700624 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
625 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700626 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
627 CERR1),
628 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700629 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
630 CERR1),
631 ((['git', 'config', 'gerrit.host', 'true'],), ''),
632 ]
633 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
634
maruel@chromium.orga3353652011-11-30 14:26:57 +0000635 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000636 def _is_gerrit_calls(cls, gerrit=False):
637 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
638 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
639
640 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000641 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000642 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000643 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000644
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000645 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000646 def _upload_no_rev_calls(cls, similarity, find_copies):
647 return (cls._git_base_calls(similarity, find_copies) +
648 cls._git_upload_no_rev_calls())
649
650 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000651 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000652 if similarity is None:
653 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700654 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700655 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000656 else:
tandrii33a46ff2016-08-23 05:53:40 -0700657 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700658 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000659
660 if find_copies is None:
661 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700662 find_copies_call = ((['git', 'config', '--bool',
663 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000664 else:
tandrii5d48c322016-08-18 16:19:37 -0700665 val = str(find_copies).lower()
666 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000667 'branch.master.git-find-copies', val],), '')
668
669 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000670 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800671 '-l100000', '-C'+similarity,
672 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000673 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000674 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000675 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000676
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000677 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000678 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000679 similarity_call,
680 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
681 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000682 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000683 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700684 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
685 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000686 ((['git', 'config', 'rietveld.server'],),
687 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000688 ((['git', 'config', 'branch.master.merge'],), 'master'),
689 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000690 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000691 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000692 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000693 ((['git', 'rev-parse', '--show-cdup'],), ''),
694 ((['git', 'rev-parse', 'HEAD'],), '12345'),
695 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000696 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000697 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700698 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000699 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000700 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000701 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000702 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000703 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000704 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000705 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000706 'desc\n'),
Mark Mentovai57c47212017-03-09 11:14:09 -0500707 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
708 ((['git', 'config', 'rietveld.bug-line-format'],), CERR1),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000709 ]
710
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000711 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000712 def _git_upload_no_rev_calls(cls):
713 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000714 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000715 ]
716
717 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000718 def _git_upload_calls(cls, private):
719 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000720 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000721 private_call = []
722 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000723 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000724 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000725 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000726
maruel@chromium.orga3353652011-11-30 14:26:57 +0000727 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000728 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000729 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000730 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800731 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000732 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700733 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000734 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000735 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000736 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700737 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000738 ] + cls._git_post_upload_calls()
739
740 @classmethod
741 def _git_post_upload_calls(cls):
742 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000743 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
744 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
745 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000746 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000747 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000748 ]
749
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000750 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000751 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000752 fake_ancestor = 'fake_ancestor'
753 fake_cl = 'fake_cl_for_patch'
754 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000755 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000756 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000757 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000758 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000759 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000760 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000761 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000762 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700763 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000764 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000765 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000766 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000767 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000768 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000769 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000770 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000771 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000772 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000773 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000774 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000775
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000776 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700777 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000778 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000779 return [
780 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000781 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000782 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000783 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700784 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000785 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000786 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100787 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000788 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000789 ]
790
791 def _run_reviewer_test(
792 self,
793 upload_args,
794 expected_description,
795 returned_description,
796 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000797 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700798 private=False,
799 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000800 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000801 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000802 try:
803 similarity = upload_args[upload_args.index('--similarity')+1]
804 except ValueError:
805 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000806
807 if '--find-copies' in upload_args:
808 find_copies = True
809 elif '--no-find-copies' in upload_args:
810 find_copies = False
811 else:
812 find_copies = None
813
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000814 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700815 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000816
817 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000818
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000819 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000820 self.assertEquals(
821 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000822 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000823 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000824 '#--------------------This line is 72 characters long'
825 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000826 expected_description,
827 desc)
828 return returned_description
829 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000830
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000831 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000832 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700833 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000834 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000835 return 1, 2
836 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000837
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000838 git_cl.main(['upload'] + upload_args)
839
840 def test_no_reviewer(self):
841 self._run_reviewer_test(
842 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000843 'desc\n\nBUG=',
844 '# Blah blah comment.\ndesc\n\nBUG=',
845 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000846 [])
847
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000848 def test_keep_similarity(self):
849 self._run_reviewer_test(
850 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000851 'desc\n\nBUG=',
852 '# Blah blah comment.\ndesc\n\nBUG=',
853 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000854 [])
855
iannucci@chromium.org79540052012-10-19 23:15:26 +0000856 def test_keep_find_copies(self):
857 self._run_reviewer_test(
858 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000859 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000860 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000861 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000862 [])
863
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000864 def test_private(self):
865 self._run_reviewer_test(
866 ['--private'],
867 'desc\n\nBUG=',
868 '# Blah blah comment.\ndesc\n\nBUG=\n',
869 'desc\n\nBUG=',
870 [])
871
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000872 def test_reviewers_cmd_line(self):
873 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000874 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000875 self._run_reviewer_test(
876 ['-r' 'foo@example.com'],
877 description,
878 '\n%s\n' % description,
879 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000880 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000881
882 def test_reviewer_tbr_overriden(self):
883 # Reviewer is overriden with TBR
884 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000885 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000886 self._run_reviewer_test(
887 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000888 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000889 description.strip('\n'),
890 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000891 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000892
893 def test_reviewer_multiple(self):
894 # Handles multiple R= or TBR= lines.
895 description = (
bradnelsond975b302016-10-23 12:20:23 -0700896 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
897 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000898 self._run_reviewer_test(
899 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000900 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000901 description,
902 description,
bradnelsond975b302016-10-23 12:20:23 -0700903 ['--reviewers=another@example.com,reviewer@example.com'],
904 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000905
maruel@chromium.orga3353652011-11-30 14:26:57 +0000906 def test_reviewer_send_mail(self):
907 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000908 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000909 self._run_reviewer_test(
910 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000911 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000912 description.strip('\n'),
913 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000914 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000915
916 def test_reviewer_send_mail_no_rev(self):
917 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000918 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700919 self.calls = self._upload_no_rev_calls(None, None) + [
920 ((['DieWithError', 'Must specify reviewers to send email.'],),
921 SystemExitMock())
922 ]
923
924 def RunEditor(desc, _, **kwargs):
925 return desc
926 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
927 self.mock(sys, 'stdout', stdout)
928 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000929 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700930 self.assertEqual(
931 'Using 50% similarity for rename/copy detection. Override with '
932 '--similarity.\n',
933 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000934
tandriif9aefb72016-07-01 09:06:51 -0700935 def test_bug_on_cmd(self):
936 self._run_reviewer_test(
937 ['--bug=500658,proj:123'],
938 'desc\n\nBUG=500658\nBUG=proj:123',
939 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
940 'desc\n\nBUG=500658\nBUG=proj:1234',
941 [])
942
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100943 def _land_rietveld_common(self, debug=False):
944 if debug:
945 # Very useful due to finally clause in git cl land raising exceptions and
946 # shadowing real cause of failure.
947 self.mock(git_cl, '_IS_BEING_TESTED', True)
948 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100949 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100950
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100951 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
952 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100953 self.mock(RietveldMock, 'update_description', staticmethod(
954 lambda i, d: self._mocked_call(['update_description', i, d])))
955 self.mock(RietveldMock, 'add_comment', staticmethod(
956 lambda i, c: self._mocked_call(['add_comment', i, c])))
957 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100958 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
959 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
960 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
961 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
962 CERR1),
963 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
964 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800965 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100966 ((['git', 'config', 'rietveld.server'],),
967 'https://codereview.chromium.org'),
968 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
969 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
970 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
971 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100972 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
973 ''), # No commits to rebase, according to local view of origin.
974 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
975 'fake_ancestor_sha'),
976 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
977 ((['git', 'rev-parse', '--show-cdup'],), ''),
978 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
979 ((['git', 'diff', '--name-status', '--no-renames', '-r',
980 'fake_ancestor_sha...', '.'],),
981 'M\tfile1.cpp'),
982 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
983 ((['git', 'config', 'branch.feature.rietveldserver'],),
984 'https://codereview.chromium.org'),
985 ((['git', 'config', 'user.email'],), 'user@e.mail'),
986 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
987 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
988 'fake_ancestor_sha', 'feature'],),
989 # This command just prints smth like this:
990 # file1.cpp | 53 ++++++--
991 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
992 ''),
993 ((['git', 'show-ref', '--quiet', '--verify',
994 'refs/heads/git-cl-commit'],),
995 ''), # 0 return code means branch exists.
996 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
997 ((['git', 'show-ref', '--quiet', '--verify',
998 'refs/heads/git-cl-cherry-pick'],),
999 CERR1), # This means git-cl-cherry-pick branch does not exist.
1000 ((['git', 'rev-parse', '--show-cdup'],), ''),
1001 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1002 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1003 ((['git', 'commit', '-m',
1004 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001005 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001006 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1007 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1008 ((['git', 'config', '--get', 'remote.origin.url'],),
1009 'https://chromium.googlesource.com/infra/infra'),
1010 ]
1011
1012 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001013 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001014 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001015 ((['git', 'config', 'remote.origin.url'],),
1016 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001017 (('_is_git_numberer_enabled',
1018 'https://chromium.googlesource.com/infra/infra',
1019 'refs/heads/master'),
1020 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001021 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1022 ''),
1023 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1024 ((['git', 'checkout', '-q', 'feature'],), ''),
1025 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1026 ((['git', 'config', 'rietveld.viewvc-url'],),
1027 'https://chromium.googlesource.com/infra/infra/+/'),
1028 ((['update_description', 123,
1029 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
1030 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1031 ''),
1032 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1033 'fake_sha_rebased (presubmit successful).'],), ''),
1034 ]
1035 git_cl.main(['land'])
1036
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001037 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001038 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001039
1040 # Special mocks to check validity of timestamp.
1041 original_git_amend_head = git_cl._git_amend_head
1042 def _git_amend_head_mock(msg, tstamp):
1043 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1044 return original_git_amend_head(msg, tstamp)
1045 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1046
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001047 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001048 ((['git', 'config', 'remote.origin.url'],),
1049 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001050 (('_is_git_numberer_enabled',
1051 'https://chromium.googlesource.com/chromium/src',
1052 'refs/heads/master'),
1053 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001054 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1055 'This is parent commit.\n'
1056 '\n'
1057 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1058 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001059 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
1060 '1480022355'), # Committer's unix timestamp.
1061 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1062 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001063
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001064 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001065 ((['git', 'commit', '--amend', '-m',
1066 'Issue: 123\n\nR=john@chromium.org\n'
1067 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001068 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001069 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1070 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1071
1072 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1073 ''),
1074 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1075 ((['git', 'checkout', '-q', 'feature'],), ''),
1076 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1077 ((['git', 'config', 'rietveld.viewvc-url'],),
1078 'https://chromium.googlesource.com/infra/infra/+/'),
1079 ((['update_description', 123,
1080 'Issue: 123\n\nR=john@chromium.org\n'
1081 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001082 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001083 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1084 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1085 'Committed: '
1086 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1087 ''),
1088 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1089 'fake_sha_rebased (presubmit successful).'],), ''),
1090 ]
1091 git_cl.main(['land'])
1092
1093 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001094 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001095 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001096 ((['git', 'config', 'remote.origin.url'],),
1097 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001098 (('_is_git_numberer_enabled',
1099 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1100 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001101
1102 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1103 'This is parent commit with no footer.'),
1104
1105 ((['git', 'checkout', '-q', 'feature'],), ''),
1106 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1107 ]
1108 with self.assertRaises(ValueError) as cm:
1109 git_cl.main(['land'])
1110 self.assertEqual(cm.exception.message,
1111 'Unable to infer commit position from footers')
1112
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001113 def test_git_numberer_not_whitelisted_repo(self):
1114 self.calls = []
1115 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001116 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1117 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001118 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001119
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001120 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001121 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1122 self.calls = [
1123 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001124 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001125 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001126 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001127 remote_url='https://chromium.googlesource.com/chromium/src',
1128 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001129 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001130
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001131 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001132 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001133 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001134 def fake_temporary_directory(**kwargs):
1135 yield tempdir
1136 self.mock(git_cl.gclient_utils, 'temporary_directory',
1137 fake_temporary_directory)
1138 self._test_GitNumbererState_valid_configs_inner(tempdir)
1139
1140 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001141 self.calls = [
1142 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001143 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001144 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1145 '''
1146 [plugin "git-numberer"]
1147 validate-enabled-refglob = refs/else/*
1148 validate-enabled-refglob = refs/heads/*
1149 validate-disabled-refglob = refs/heads/disabled
1150 validate-disabled-refglob = refs/branch-heads/*
1151 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001152 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1153 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001154 'refs/else/*\n'
1155 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001156 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1157 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001158 'refs/heads/disabled\n'
1159 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001160 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001161
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001162 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001163 remote_url='https://chromium.googlesource.com/chromium/src',
1164 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001165 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001166
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001167 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001168 remote_url='https://chromium.googlesource.com/chromium/src',
1169 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001170 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001171
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001172 # Validator is disabled by default, even if it's not explicitely in disabled
1173 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001174 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001175 remote_url='https://chromium.googlesource.com/chromium/src',
1176 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001177 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001178
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001179 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001180 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001181 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001182 if skip_auth_check:
1183 return [((cmd, ), 'true')]
1184
tandrii5d48c322016-08-18 16:19:37 -07001185 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001186 if issue:
1187 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001188 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001189 ])
1190 calls.extend([
1191 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1192 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1193 ((['git', 'config', 'remote.origin.url'],),
1194 'https://chromium.googlesource.com/my/repo'),
1195 ((['git', 'config', 'remote.origin.url'],),
1196 'https://chromium.googlesource.com/my/repo'),
1197 ])
1198 return calls
1199
1200 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001201 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
1202 fetched_status=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001203 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001204 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001205 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001206 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001207 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001208 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1209 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001210 ]
1211 calls += cls._is_gerrit_calls(True)
1212 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001213 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001214 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1215 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001216 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001217 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001218 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001219 ((['get_or_create_merge_base', 'master',
1220 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001221 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001222 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001223 ]
1224 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1225
1226 if issue:
1227 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001228 (('GetChangeDetail', 'chromium-review.googlesource.com',
1229 '123456', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
1230 {
1231 'change_id': '123456789',
1232 'current_revision': 'sha1_of_current_revision',
1233 'revisions': { 'sha1_of_current_revision': {
1234 'commit': {'message': fetched_description},
1235 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001236 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001237 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001238 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001239 if fetched_status == 'ABANDONED':
1240 calls += [
1241 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1242 '123456 has been abandoned, new uploads are not '
1243 'allowed'), SystemExitMock()),
1244 ]
1245 return calls
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001246
1247 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1248 get_remote_branch=False)
1249 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001250 ((['git', 'rev-parse', '--show-cdup'],), ''),
1251 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001252
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001253 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001254 'diff', '--name-status', '--no-renames', '-r',
1255 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001256 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001257 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001258 ]
1259
1260 if not issue:
1261 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001262 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001263 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001264 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001265 ]
1266
1267 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001268 ((['git', 'config', 'user.email'],), 'me@example.com'),
1269 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001270 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1271 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001272 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001273 ]
1274 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001275
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001276 @classmethod
1277 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001278 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001279 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001280 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001281 post_amend_description=None, issue=None, cc=None,
1282 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001283 if post_amend_description is None:
1284 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001285 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001286 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001287
tandriia60502f2016-06-20 02:01:53 -07001288 if squash_mode == 'default':
1289 calls.extend([
1290 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1291 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1292 ])
1293 elif squash_mode in ('override_squash', 'override_nosquash'):
1294 calls.extend([
1295 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1296 'true' if squash_mode == 'override_squash' else 'false'),
1297 ])
1298 else:
1299 assert squash_mode in ('squash', 'nosquash')
1300
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001301 # If issue is given, then description is fetched from Gerrit instead.
1302 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001303 calls += [
1304 ((['git', 'log', '--pretty=format:%s\n\n%b',
1305 'fake_ancestor_sha..HEAD'],),
1306 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001307 if squash:
1308 title = 'Initial_upload'
1309 else:
1310 if not title:
1311 calls += [
1312 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001313 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001314 ]
1315 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001316 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001317 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001318 # DownloadGerritHook(False)
1319 ((False, ),
1320 ''),
1321 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001322 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001323 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001324 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001325 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001326 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001327 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001328 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001329 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001330 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001331 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001332 if not issue:
1333 # Prompting to edit description on first upload.
1334 calls += [
1335 ((['git', 'config', 'core.editor'],), ''),
1336 ((['RunEditor'],), description),
1337 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001338 ref_to_push = 'abcdef0123456789'
1339 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001340 ((['git', 'config', 'branch.master.merge'],),
1341 'refs/heads/master'),
1342 ((['git', 'config', 'branch.master.remote'],),
1343 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001344 ((['get_or_create_merge_base', 'master',
1345 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001346 'origin/master'),
1347 ((['git', 'rev-parse', 'HEAD:'],),
1348 '0123456789abcdef'),
1349 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001350 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001351 ref_to_push),
1352 ]
1353 else:
1354 ref_to_push = 'HEAD'
1355
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001356 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001357 ((['git', 'rev-list',
1358 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001359 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001360
Aaron Gable9b713dd2016-12-14 16:04:21 -08001361 if title:
1362 if ref_suffix:
1363 ref_suffix += ',m=' + title
1364 else:
1365 ref_suffix = '%m=' + title
1366
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001367 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1368 if ref_suffix:
1369 ref_suffix += ',' + notify_suffix
1370 else:
1371 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001372
ukai@chromium.orge8077812012-02-03 03:41:46 +00001373 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001374 ref_suffix += ',' + ','.join('r=%s' % email
1375 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001376
1377 if git_mirror is None:
1378 calls += [
1379 ((['git', 'config', 'remote.origin.url'],),
1380 'https://chromium.googlesource.com/yyy/zzz'),
1381 ]
1382 else:
1383 calls += [
1384 ((['git', 'config', 'remote.origin.url'],),
1385 '/cache/this-dir-exists'),
1386 (('os.path.isdir', '/cache/this-dir-exists'),
1387 True),
1388 # Runs in /cache/this-dir-exists.
1389 ((['git', 'config', 'remote.origin.url'],),
1390 'https://chromium.googlesource.com/yyy/zzz'),
1391 ]
1392
ukai@chromium.orge8077812012-02-03 03:41:46 +00001393 calls += [
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001394 ((['git', 'push',
1395 'https://chromium.googlesource.com/yyy/zzz',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001396 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001397 ('remote:\n'
1398 'remote: Processing changes: (\)\n'
1399 'remote: Processing changes: (|)\n'
1400 'remote: Processing changes: (/)\n'
1401 'remote: Processing changes: (-)\n'
1402 'remote: Processing changes: new: 1 (/)\n'
1403 'remote: Processing changes: new: 1, done\n'
1404 'remote:\n'
1405 'remote: New Changes:\n'
1406 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1407 'remote:\n'
1408 'To https://chromium.googlesource.com/yyy/zzz\n'
1409 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001410 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001411 if squash:
1412 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001413 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001414 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001415 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001416 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001417 ((['git', 'config', 'branch.master.gerritsquashhash',
1418 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001419 ]
tandrii88189772016-09-29 04:29:57 -07001420 calls += [
1421 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001422 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001423 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001424 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001425 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001426 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001427 return calls
1428
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001429 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001430 self,
1431 upload_args,
1432 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001433 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001434 squash=True,
1435 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001436 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001437 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001438 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001439 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001440 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001441 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001442 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001443 git_mirror=None,
1444 fetched_status=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001445 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001446 if squash_mode is None:
1447 if '--no-squash' in upload_args:
1448 squash_mode = 'nosquash'
1449 elif '--squash' in upload_args:
1450 squash_mode = 'squash'
1451 else:
1452 squash_mode = 'default'
1453
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001454 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001455 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001456 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001457 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001458 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001459 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1460 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001461 self.mock(git_cl.gclient_utils, 'RunEditor',
1462 lambda *_, **__: self._mocked_call(['RunEditor']))
1463 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1464
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001465 original_os_path_isdir = os.path.isdir
1466 def selective_os_path_isdir_mock(path):
1467 if path == '/cache/this-dir-exists':
1468 return self._mocked_call('os.path.isdir', path)
1469 return original_os_path_isdir(path)
1470 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1471
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001472 self.calls = self._gerrit_base_calls(
1473 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001474 fetched_description=description,
1475 fetched_status=fetched_status)
1476 if fetched_status != 'ABANDONED':
1477 self.calls += self._gerrit_upload_calls(
1478 description, reviewers, squash,
1479 squash_mode=squash_mode,
1480 expected_upstream_ref=expected_upstream_ref,
1481 ref_suffix=ref_suffix, title=title, notify=notify,
1482 post_amend_description=post_amend_description,
1483 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001484 # Uncomment when debugging.
1485 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001486 git_cl.main(['upload'] + upload_args)
1487
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001488 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001489 self._run_gerrit_upload_test(
1490 ['--no-squash'],
1491 'desc\n\nBUG=\n',
1492 [],
1493 squash=False,
1494 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1495
1496 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001497 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001498 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001499 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001500 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001501 [],
tandriia60502f2016-06-20 02:01:53 -07001502 squash=False,
1503 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001504 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001505
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001506 def test_gerrit_no_reviewer(self):
1507 self._run_gerrit_upload_test(
1508 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001509 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001510 [],
1511 squash=False,
1512 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001513
tandriieefe8322016-08-17 10:12:24 -07001514 def test_gerrit_patch_bad_chars(self):
1515 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001516 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001517 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001518 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001519 squash=False,
1520 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001521 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001522 self.assertIn(
1523 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001524 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1525 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001526 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001527
ukai@chromium.orge8077812012-02-03 03:41:46 +00001528 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001529 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001530 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001531 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001532 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001533 squash=False,
1534 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001535 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001536
1537 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001538 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001539 [],
bradnelsond975b302016-10-23 12:20:23 -07001540 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1541 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001542 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001543 ['reviewer@example.com', 'another@example.com'],
1544 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001545 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001546 ref_suffix='%l=Code-Review+1',
1547 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001548
1549 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001550 self._run_gerrit_upload_test(
1551 [],
1552 'desc\nBUG=\n\nChange-Id: 123456789',
1553 [],
1554 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001555
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001556 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001557 self._run_gerrit_upload_test(
1558 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001559 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001560 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001561 squash=True,
1562 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001563
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001564 def test_gerrit_upload_squash_first_with_mirror(self):
1565 self._run_gerrit_upload_test(
1566 ['--squash'],
1567 'desc\nBUG=\n\nChange-Id: 123456789',
1568 [],
1569 squash=True,
1570 expected_upstream_ref='origin/master',
1571 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1572
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001573 def test_gerrit_upload_squash_reupload(self):
1574 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001575 self._run_gerrit_upload_test(
1576 ['--squash'],
1577 description,
1578 [],
1579 squash=True,
1580 expected_upstream_ref='origin/master',
1581 issue=123456)
1582
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001583 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1584 self.mock(git_cl, 'DieWithError',
1585 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1586 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1587 with self.assertRaises(SystemExitMock):
1588 self._run_gerrit_upload_test(
1589 ['--squash'],
1590 description,
1591 [],
1592 squash=True,
1593 expected_upstream_ref='origin/master',
1594 issue=123456,
1595 fetched_status='ABANDONED')
1596
rmistry@google.com2dd99862015-06-22 12:22:18 +00001597 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001598 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001599 def mock_run_git(*args, **_kwargs):
1600 if args[0] == ['for-each-ref',
1601 '--format=%(refname:short) %(upstream:short)',
1602 'refs/heads']:
1603 # Create a local branch dependency tree that looks like this:
1604 # test1 -> test2 -> test3 -> test4 -> test5
1605 # -> test3.1
1606 # test6 -> test0
1607 branch_deps = [
1608 'test2 test1', # test1 -> test2
1609 'test3 test2', # test2 -> test3
1610 'test3.1 test2', # test2 -> test3.1
1611 'test4 test3', # test3 -> test4
1612 'test5 test4', # test4 -> test5
1613 'test6 test0', # test0 -> test6
1614 'test7', # test7
1615 ]
1616 return '\n'.join(branch_deps)
1617 self.mock(git_cl, 'RunGit', mock_run_git)
1618
1619 class RecordCalls:
1620 times_called = 0
1621 record_calls = RecordCalls()
1622 def mock_CMDupload(*args, **_kwargs):
1623 record_calls.times_called += 1
1624 return 0
1625 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1626
1627 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001628 (('ask_for_data', 'This command will checkout all dependent branches '
1629 'and run "git cl upload". Press Enter to continue, '
1630 'or Ctrl+C to abort'), ''),
1631 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001632
1633 class MockChangelist():
1634 def __init__(self):
1635 pass
1636 def GetBranch(self):
1637 return 'test1'
1638 def GetIssue(self):
1639 return '123'
1640 def GetPatchset(self):
1641 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001642 def IsGerrit(self):
1643 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001644
1645 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1646 # CMDupload should have been called 5 times because of 5 dependent branches.
1647 self.assertEquals(5, record_calls.times_called)
1648 self.assertEquals(0, ret)
1649
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001650 def test_gerrit_change_id(self):
1651 self.calls = [
1652 ((['git', 'write-tree'], ),
1653 'hashtree'),
1654 ((['git', 'rev-parse', 'HEAD~0'], ),
1655 'branch-parent'),
1656 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1657 'A B <a@b.org> 1456848326 +0100'),
1658 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1659 'C D <c@d.org> 1456858326 +0100'),
1660 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1661 'hashchange'),
1662 ]
1663 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1664 self.assertEqual(change_id, 'Ihashchange')
1665
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001666 def test_desecription_append_footer(self):
1667 for init_desc, footer_line, expected_desc in [
1668 # Use unique desc first lines for easy test failure identification.
1669 ('foo', 'R=one', 'foo\n\nR=one'),
1670 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1671 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1672 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1673 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1674 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1675 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1676 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1677 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1678 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1679 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1680 ]:
1681 desc = git_cl.ChangeDescription(init_desc)
1682 desc.append_footer(footer_line)
1683 self.assertEqual(desc.description, expected_desc)
1684
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001685 def test_update_reviewers(self):
1686 data = [
1687 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001688 ('foo\nR=xx', [], 'foo\nR=xx'),
1689 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001690 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001691 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1692 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1693 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001694 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001695 ('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 +00001696 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001697 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1698 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1699 # Same as the line before, but full of whitespaces.
1700 (
1701 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1702 'foo\nBar\n\nR=c@c\n BUG =',
1703 ),
1704 # Whitespaces aren't interpreted as new lines.
1705 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001706 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001707 expected = [i[2] for i in data]
1708 actual = []
1709 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001710 obj = git_cl.ChangeDescription(orig)
1711 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001712 actual.append(obj.description)
1713 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001714
wittman@chromium.org455dc922015-01-26 20:15:50 +00001715 def test_get_target_ref(self):
1716 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001717 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001718 self.assertEqual(None, git_cl.GetTargetRef(None,
1719 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001720 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001721
wittman@chromium.org455dc922015-01-26 20:15:50 +00001722 # Check default target refs for branches.
1723 self.assertEqual('refs/heads/master',
1724 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001725 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001726 self.assertEqual('refs/heads/master',
1727 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001728 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001729 self.assertEqual('refs/heads/master',
1730 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001731 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001732 self.assertEqual('refs/branch-heads/123',
1733 git_cl.GetTargetRef('origin',
1734 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001735 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001736 self.assertEqual('refs/diff/test',
1737 git_cl.GetTargetRef('origin',
1738 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001739 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001740 self.assertEqual('refs/heads/chrome/m42',
1741 git_cl.GetTargetRef('origin',
1742 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001743 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001744
1745 # Check target refs for user-specified target branch.
1746 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1747 'refs/remotes/branch-heads/123'):
1748 self.assertEqual('refs/branch-heads/123',
1749 git_cl.GetTargetRef('origin',
1750 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001751 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001752 for branch in ('origin/master', 'remotes/origin/master',
1753 'refs/remotes/origin/master'):
1754 self.assertEqual('refs/heads/master',
1755 git_cl.GetTargetRef('origin',
1756 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001757 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001758 for branch in ('master', 'heads/master', 'refs/heads/master'):
1759 self.assertEqual('refs/heads/master',
1760 git_cl.GetTargetRef('origin',
1761 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001762 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001763
wychen@chromium.orga872e752015-04-28 23:42:18 +00001764 def test_patch_when_dirty(self):
1765 # Patch when local tree is dirty
1766 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1767 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1768
1769 def test_diff_when_dirty(self):
1770 # Do 'git cl diff' when local tree is dirty
1771 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1772 self.assertNotEqual(git_cl.main(['diff']), 0)
1773
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001774 @staticmethod
1775 def _get_gerrit_codereview_server_calls(branch, value=None,
1776 git_short_host='host',
1777 detect_branch=True):
1778 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1779
1780 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1781 """
1782 calls = []
1783 if detect_branch:
1784 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1785 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1786 CERR1 if value is None else value))
1787 if value is None:
1788 calls += [
1789 ((['git', 'config', 'branch.' + branch + '.merge'],),
1790 'refs/heads' + branch),
1791 ((['git', 'config', 'branch.' + branch + '.remote'],),
1792 'origin'),
1793 ((['git', 'config', 'remote.origin.url'],),
1794 'https://%s.googlesource.com/my/repo' % git_short_host),
1795 ]
1796 return calls
1797
tandriidf09a462016-08-18 16:23:55 -07001798 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001799 new_branch=False, git_short_host='host',
1800 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001801 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001802 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1803 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001804 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001805 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001806 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1807
tandriidf09a462016-08-18 16:23:55 -07001808 if new_branch:
1809 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1810 else:
1811 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001812
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001813 if not force_codereview:
1814 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001815 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001816 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001817 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1818 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001819 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001820 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001821
1822 if is_gerrit:
1823 if not force_codereview:
1824 self.calls += [
1825 ((['git', 'config', 'gerrit.host'],), 'true'),
1826 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001827 if detect_gerrit_server:
1828 self.calls += self._get_gerrit_codereview_server_calls(
1829 'master', git_short_host=git_short_host,
1830 detect_branch=not new_branch and force_codereview)
1831
1832 self.calls += [
1833 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001834 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001835 {
1836 'current_revision': '7777777777',
1837 'revisions': {
1838 '1111111111': {
1839 '_number': 1,
1840 'fetch': {'http': {
1841 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1842 'ref': 'refs/changes/56/123456/1',
1843 }},
1844 },
1845 '7777777777': {
1846 '_number': 7,
1847 'fetch': {'http': {
1848 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1849 'ref': 'refs/changes/56/123456/7',
1850 }},
1851 },
1852 },
1853 }),
1854 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001855 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001856 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001857 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001858 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001859 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001860 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001861 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001862
tandriidf09a462016-08-18 16:23:55 -07001863 def _common_patch_successful(self, new_branch=False):
1864 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001865 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001866 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001867 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001868 ((['git', 'config', 'branch.master.rietveldserver',
1869 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001870 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001871 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001872 ((['git', 'commit', '-m',
1873 'Description\n\n' +
1874 'patch from issue 123456 at patchset 60001 ' +
1875 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001876 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001877
1878 def test_patch_successful(self):
1879 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001880 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1881
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001882 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001883 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001884 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1885
wychen@chromium.orga872e752015-04-28 23:42:18 +00001886 def test_patch_conflict(self):
1887 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001888 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001889 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001890
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001891 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001892 self._patch_common(is_gerrit=True, git_short_host='chromium',
1893 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001894 self.calls += [
1895 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1896 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001897 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001898 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001899 ((['git', 'config', 'branch.master.gerritserver',
1900 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001901 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001902 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001903 ]
1904 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1905
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001906 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001907 self._patch_common(is_gerrit=True, force_codereview=True,
1908 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001909 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001910 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001911 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001912 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001913 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001914 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001915 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001916 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001917 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001918 ]
1919 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1920
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001921 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001922 self._patch_common(is_gerrit=True, git_short_host='else',
1923 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001924 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001925 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001926 'refs/changes/56/123456/1'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001927 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001928 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001929 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001930 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001931 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001932 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001933 ]
1934 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001935 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001936
1937 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001938 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
1939 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001940 self.calls += [
1941 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1942 'refs/changes/56/123456/1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001943 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
1944 ''),
1945 ((['git', 'config', 'branch.master.gerritserver',
1946 'https://chromium-review.googlesource.com'],), ''),
1947 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001948 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1949 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1950 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001951 ]
1952 with self.assertRaises(SystemExitMock):
1953 git_cl.main(['patch',
1954 'https://chromium-review.googlesource.com/#/c/123456/1'])
1955
tandriic2405f52016-10-10 08:13:15 -07001956 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001957 def notExists(_issue, *_, **kwargs):
1958 self.assertFalse(kwargs['ignore_404'])
1959 raise git_cl.gerrit_util.GerritError(404, '')
1960 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1961
tandriic2405f52016-10-10 08:13:15 -07001962 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001963 self.calls = [
1964 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1965 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1966 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1967 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1968 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1969 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001970 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001971 'or you have no access to it'],), SystemExitMock()),
1972 ]
1973 with self.assertRaises(SystemExitMock):
1974 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1975
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001976 def _checkout_calls(self):
1977 return [
1978 ((['git', 'config', '--local', '--get-regexp',
1979 'branch\\..*\\.rietveldissue'], ),
1980 ('branch.retrying.rietveldissue 1111111111\n'
1981 'branch.some-fix.rietveldissue 2222222222\n')),
1982 ((['git', 'config', '--local', '--get-regexp',
1983 'branch\\..*\\.gerritissue'], ),
1984 ('branch.ger-branch.gerritissue 123456\n'
1985 'branch.gbranch654.gerritissue 654321\n')),
1986 ]
1987
1988 def test_checkout_gerrit(self):
1989 """Tests git cl checkout <issue>."""
1990 self.calls = self._checkout_calls()
1991 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1992 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1993
1994 def test_checkout_rietveld(self):
1995 """Tests git cl checkout <issue>."""
1996 self.calls = self._checkout_calls()
1997 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1998 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1999
2000 def test_checkout_not_found(self):
2001 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002002 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002003 self.calls = self._checkout_calls()
2004 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2005
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002006 def test_checkout_no_branch_issues(self):
2007 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002008 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002009 self.calls = [
2010 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002011 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002012 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002013 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002014 ]
2015 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2016
tandrii@chromium.org28253532016-04-14 13:46:56 +00002017 def _test_gerrit_ensure_authenticated_common(self, auth,
2018 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002019 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2020 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2021 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002022 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002023 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002024 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002025 cl.branch = 'master'
2026 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002027 cl.lookedup_issue = True
2028 return cl
2029
2030 def test_gerrit_ensure_authenticated_missing(self):
2031 cl = self._test_gerrit_ensure_authenticated_common(auth={
2032 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
2033 })
2034 self.calls.append(
2035 ((['DieWithError',
2036 'Credentials for the following hosts are required:\n'
2037 ' chromium-review.googlesource.com\n'
2038 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
2039 'You can (re)generate your credentails by visiting '
2040 'https://chromium-review.googlesource.com/new-password'],), ''),)
2041 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2042
2043 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002044 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002045 cl = self._test_gerrit_ensure_authenticated_common(auth={
2046 'chromium.googlesource.com': 'one',
2047 'chromium-review.googlesource.com': 'other',
2048 })
2049 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002050 (('ask_for_data', 'If you know what you are doing '
2051 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002052 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2053
2054 def test_gerrit_ensure_authenticated_ok(self):
2055 cl = self._test_gerrit_ensure_authenticated_common(auth={
2056 'chromium.googlesource.com': 'same',
2057 'chromium-review.googlesource.com': 'same',
2058 })
2059 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2060
tandrii@chromium.org28253532016-04-14 13:46:56 +00002061 def test_gerrit_ensure_authenticated_skipped(self):
2062 cl = self._test_gerrit_ensure_authenticated_common(
2063 auth={}, skip_auth_check=True)
2064 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2065
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002066 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002067 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2068 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002069 self.calls = [
2070 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002071 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002072 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2073 ((['git', 'config', 'rietveld.server'],), ''),
2074 ((['git', 'config', 'rietveld.server'],), ''),
2075 ((['git', 'config', 'branch.feature.rietveldserver'],),
2076 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002077 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002078 ]
2079 self.assertEqual(0, git_cl.main(['set-commit']))
2080
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002081 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002082 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002083 lambda h, i, labels, notify=None:
2084 self._mocked_call(['SetReview', h, i, labels, notify]))
2085
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002086 self.calls = [
2087 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002088 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2089 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002090 ((['git', 'config', 'branch.feature.gerritserver'],),
2091 'https://chromium-review.googlesource.com'),
2092 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002093 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002094 ]
tandriid9e5ce52016-07-13 02:32:59 -07002095
2096 def test_cmd_set_commit_gerrit_clear(self):
2097 self._cmd_set_commit_gerrit_common(0)
2098 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2099
2100 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002101 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002102 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2103
tandriid9e5ce52016-07-13 02:32:59 -07002104 def test_cmd_set_commit_gerrit(self):
2105 self._cmd_set_commit_gerrit_common(2)
2106 self.assertEqual(0, git_cl.main(['set-commit']))
2107
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002108 def test_description_display(self):
2109 out = StringIO.StringIO()
2110 self.mock(git_cl.sys, 'stdout', out)
2111
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002112 self.mock(git_cl, 'Changelist', ChangelistMock)
2113 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002114
2115 self.assertEqual(0, git_cl.main(['description', '-d']))
2116 self.assertEqual('foo\n', out.getvalue())
2117
2118 def test_description_rietveld(self):
2119 out = StringIO.StringIO()
2120 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002121 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002122
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002123 self.assertEqual(0, git_cl.main([
2124 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2125 self.assertEqual('foobar\n', out.getvalue())
2126
iannucci3c972b92016-08-17 13:24:10 -07002127 def test_StatusFieldOverrideIssueMissingArgs(self):
2128 out = StringIO.StringIO()
2129 self.mock(git_cl.sys, 'stderr', out)
2130
2131 try:
2132 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2133 except SystemExit as ex:
2134 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002135 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002136
2137 out = StringIO.StringIO()
2138 self.mock(git_cl.sys, 'stderr', out)
2139
2140 try:
2141 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2142 except SystemExit as ex:
2143 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002144 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002145
2146 def test_StatusFieldOverrideIssue(self):
2147 out = StringIO.StringIO()
2148 self.mock(git_cl.sys, 'stdout', out)
2149
2150 def assertIssue(cl_self, *_args):
2151 self.assertEquals(cl_self.issue, 1)
2152 return 'foobar'
2153
2154 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2155 self.calls = [
2156 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2157 ((['git', 'config', 'rietveld.server'],), ''),
2158 ((['git', 'config', 'rietveld.server'],), ''),
2159 ]
iannuccie53c9352016-08-17 14:40:40 -07002160 self.assertEqual(
2161 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2162 0)
iannucci3c972b92016-08-17 13:24:10 -07002163 self.assertEqual(out.getvalue(), 'foobar\n')
2164
iannuccie53c9352016-08-17 14:40:40 -07002165 def test_SetCloseOverrideIssue(self):
2166 def assertIssue(cl_self, *_args):
2167 self.assertEquals(cl_self.issue, 1)
2168 return 'foobar'
2169
2170 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2171 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2172 self.calls = [
2173 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2174 ((['git', 'config', 'rietveld.server'],), ''),
2175 ((['git', 'config', 'rietveld.server'],), ''),
2176 ]
2177 self.assertEqual(
2178 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2179
2180 def test_SetCommitOverrideIssue(self):
2181 def assertIssue(cl_self, *_args):
2182 self.assertEquals(cl_self.issue, 1)
2183 return 'foobar'
2184
2185 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2186 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2187 self.calls = [
2188 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2189 ((['git', 'config', 'rietveld.server'],), ''),
2190 ((['git', 'config', 'rietveld.server'],), ''),
2191 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2192 ((['git', 'config', 'rietveld.server'],), ''),
2193 ((['git', 'config', 'rietveld.server'],), ''),
2194 ]
2195 self.assertEqual(
2196 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2197
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002198 def test_description_gerrit(self):
2199 out = StringIO.StringIO()
2200 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002201 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002202 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002203 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2204 {
2205 'current_revision': 'sha1',
2206 'revisions': {'sha1': {
2207 'commit': {'message': 'foobar'},
2208 }},
2209 }),
2210 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002211 self.assertEqual(0, git_cl.main([
2212 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2213 self.assertEqual('foobar\n', out.getvalue())
2214
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002215 def test_description_set_raw(self):
2216 out = StringIO.StringIO()
2217 self.mock(git_cl.sys, 'stdout', out)
2218
2219 self.mock(git_cl, 'Changelist', ChangelistMock)
2220 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2221
2222 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2223 self.assertEqual('hihi', ChangelistMock.desc)
2224
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002225 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002226 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002227
2228 def RunEditor(desc, _, **kwargs):
2229 self.assertEquals(
2230 '# Enter a description of the change.\n'
2231 '# This will be displayed on the codereview site.\n'
2232 '# The first line will also be used as the subject of the review.\n'
2233 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002234 '--------------------\n'
2235 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002236 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002237 # Simulate user changing something.
2238 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002239
dsansomee2d6fd92016-09-08 00:10:47 -07002240 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002241 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002242
2243 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2244 self.mock(git_cl.Changelist, 'GetDescription',
2245 lambda *args: current_desc)
2246 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2247 UpdateDescriptionRemote)
2248 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2249
2250 self.calls = [
2251 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002252 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002253 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2254 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
Mark Mentovai57c47212017-03-09 11:14:09 -05002255 ((['git', 'config', 'rietveld.bug-line-format'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002256 ((['git', 'config', 'core.editor'],), 'vi'),
2257 ]
2258 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2259
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002260 def test_description_set_stdin(self):
2261 out = StringIO.StringIO()
2262 self.mock(git_cl.sys, 'stdout', out)
2263
2264 self.mock(git_cl, 'Changelist', ChangelistMock)
2265 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2266
2267 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2268 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2269
kmarshall3bff56b2016-06-06 18:31:47 -07002270 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002271 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2272
kmarshall3bff56b2016-06-06 18:31:47 -07002273 self.calls = \
2274 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2275 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002276 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002277 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2278 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002279 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2280 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2281 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002282 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2283 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2284 ((['git', 'branch', '-D', 'foo'],), '')]
2285
kmarshall3bff56b2016-06-06 18:31:47 -07002286 self.mock(git_cl, 'get_cl_statuses',
2287 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002288 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2289 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2290 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002291
2292 self.assertEqual(0, git_cl.main(['archive', '-f']))
2293
2294 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002295 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002296 self.calls = \
2297 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2298 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002299 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002300 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2301 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002302 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2303
kmarshall9249e012016-08-23 12:02:16 -07002304 self.mock(git_cl, 'get_cl_statuses',
2305 lambda branches, fine_grained, max_processes:
2306 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2307
2308 self.assertEqual(1, git_cl.main(['archive', '-f']))
2309
2310 def test_archive_dry_run(self):
2311 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2312
2313 self.calls = \
2314 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2315 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2316 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2317 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2318 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2319 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2320 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2321 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2322 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002323
2324 self.mock(git_cl, 'get_cl_statuses',
2325 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002326 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2327 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2328 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002329
kmarshall9249e012016-08-23 12:02:16 -07002330 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2331
2332 def test_archive_no_tags(self):
2333 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2334
2335 self.calls = \
2336 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2337 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2338 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2339 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2340 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2341 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2342 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2343 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2344 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2345 ((['git', 'branch', '-D', 'foo'],), '')]
2346
2347 self.mock(git_cl, 'get_cl_statuses',
2348 lambda branches, fine_grained, max_processes:
2349 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2350 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2351 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2352
2353 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002354
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002355 def test_cmd_issue_erase_existing(self):
2356 out = StringIO.StringIO()
2357 self.mock(git_cl.sys, 'stdout', out)
2358 self.calls = [
2359 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002360 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2361 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002362 # Let this command raise exception (retcode=1) - it should be ignored.
2363 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002364 CERR1),
2365 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2366 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002367 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2368 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2369 ''),
2370 ]
2371 self.assertEqual(0, git_cl.main(['issue', '0']))
2372
phajdan.jre328cf92016-08-22 04:12:17 -07002373 def test_cmd_issue_json(self):
2374 out = StringIO.StringIO()
2375 self.mock(git_cl.sys, 'stdout', out)
2376 self.calls = [
2377 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002378 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002379 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2380 ((['git', 'config', 'rietveld.server'],),
2381 'https://codereview.chromium.org'),
2382 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2383 (('write_json', 'output.json',
2384 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2385 ''),
2386 ]
2387 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2388
tandriide281ae2016-10-12 06:02:30 -07002389 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002390 self.mock(git_cl.Changelist, 'GetChange',
2391 lambda _, *a: (
2392 self._mocked_call(['GetChange']+list(a))))
2393 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2394 lambda *_, **__: (
2395 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002396 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2397 lambda _, s: self._mocked_call(['SetCQState', s]))
2398 self.calls = [
2399 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002400 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002401 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2402 ((['git', 'config', 'rietveld.server'],),
2403 'https://codereview.chromium.org'),
2404 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2405 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2406 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2407 ((['get_or_create_merge_base', 'feature', 'feature'],),
2408 'fake_ancestor_sha'),
2409 ((['GetChange', 'fake_ancestor_sha', None], ),
2410 git_cl.presubmit_support.GitChange(
2411 '', '', '', '', '', '', '', '')),
2412 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2413 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002414 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2415 ]
2416 out = StringIO.StringIO()
2417 self.mock(git_cl.sys, 'stdout', out)
2418 self.assertEqual(0, git_cl.main(['try']))
2419 self.assertEqual(
2420 out.getvalue(),
2421 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2422
tandrii8c5a3532016-11-04 07:52:02 -07002423 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2424 self.mock(git_cl.Changelist, 'GetChange',
2425 lambda _, *a: (
2426 self._mocked_call(['GetChange']+list(a))))
2427 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2428 lambda *_, **__: (
2429 self._mocked_call(['DoGetTryMasters'])))
2430 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2431 lambda _, s: self._mocked_call(['SetCQState', s]))
2432
tandrii8c5a3532016-11-04 07:52:02 -07002433 self.calls = [
2434 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2435 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2436 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2437 ((['git', 'config', 'branch.feature.gerritserver'],),
2438 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002439 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2440 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2441 'project': 'depot_tools',
2442 'status': 'OPEN',
2443 'owner': {'email': 'owner@e.mail'},
2444 'revisions': {
2445 'deadbeaf': {
2446 '_number': 6,
2447 },
2448 'beeeeeef': {
2449 '_number': 7,
2450 'fetch': {'http': {
2451 'url': 'https://chromium.googlesource.com/depot_tools',
2452 'ref': 'refs/changes/56/123456/7'
2453 }},
2454 },
2455 },
2456 }),
tandrii8c5a3532016-11-04 07:52:02 -07002457 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2458 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2459 ((['get_or_create_merge_base', 'feature', 'feature'],),
2460 'fake_ancestor_sha'),
2461 ((['GetChange', 'fake_ancestor_sha', None], ),
2462 git_cl.presubmit_support.GitChange(
2463 '', '', '', '', '', '', '', '')),
2464 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2465 ((['DoGetTryMasters'], ), None),
2466 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2467 ]
2468 out = StringIO.StringIO()
2469 self.mock(git_cl.sys, 'stdout', out)
2470 self.assertEqual(0, git_cl.main(['try']))
2471 self.assertEqual(
2472 out.getvalue(),
2473 'scheduled CQ Dry Run on '
2474 'https://chromium-review.googlesource.com/123456\n')
2475
2476 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2477 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2478 lambda _: {
2479 'owner_email': 'owner@e.mail',
2480 'private': False,
2481 'closed': False,
2482 'project': 'depot_tools',
2483 'patchsets': [20001],
2484 })
tandriide281ae2016-10-12 06:02:30 -07002485 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2486 self.calls = [
2487 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2488 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2489 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2490 ((['git', 'config', 'rietveld.server'],),
2491 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002492 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002493 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002494 ]
2495
2496 def _buildbucket_retry(*_, **kw):
2497 # self.maxDiff = 10000
2498 body = json.loads(kw['body'])
2499 self.assertEqual(len(body['builds']), 1)
2500 build = body['builds'][0]
2501 params = json.loads(build.pop('parameters_json'))
2502 self.assertEqual(params, {
2503 u'builder_name': u'win',
2504 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2505 u'revision': None}],
2506 u'properties': {
2507 u'category': u'git_cl_try',
2508 u'issue': 123,
2509 u'key': u'val',
2510 u'json': [{u'a': 1}, None],
2511 u'master': u'tryserver.chromium',
2512 u'patch_project': u'depot_tools',
2513 u'patch_storage': u'rietveld',
2514 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002515 u'rietveld': u'https://codereview.chromium.org',
2516 }
2517 })
2518 self.assertEqual(build, {
2519 u'bucket': u'master.tryserver.chromium',
2520 u'client_operation_id': u'uuid4',
2521 u'tags': [u'builder:win',
2522 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002523 u'user_agent:git_cl_try',
2524 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002525 })
2526
2527 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2528
2529 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2530 self.assertEqual(0, git_cl.main([
2531 'try', '-m', 'tryserver.chromium', '-b', 'win',
2532 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2533 self.assertRegexpMatches(
2534 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002535 'Tried jobs on:\nBucket: master.tryserver.chromium')
2536
tandrii8c5a3532016-11-04 07:52:02 -07002537 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2538 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2539 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2540
tandrii8c5a3532016-11-04 07:52:02 -07002541 self.calls = [
2542 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2543 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2544 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2545 ((['git', 'config', 'branch.feature.gerritserver'],),
2546 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002547 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002548 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002549 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002550 'status': 'OPEN',
2551 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002552 'revisions': {
2553 'deadbeaf': {
2554 '_number': 6,
2555 },
2556 'beeeeeef': {
2557 '_number': 7,
2558 'fetch': {'http': {
2559 'url': 'https://chromium.googlesource.com/depot_tools',
2560 'ref': 'refs/changes/56/123456/7'
2561 }},
2562 },
2563 },
2564 }),
2565 ]
2566
2567 def _buildbucket_retry(*_, **kw):
2568 # self.maxDiff = 10000
2569 body = json.loads(kw['body'])
2570 self.assertEqual(len(body['builds']), 1)
2571 build = body['builds'][0]
2572 params = json.loads(build.pop('parameters_json'))
2573 self.assertEqual(params, {
2574 u'builder_name': u'win',
2575 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2576 u'revision': None}],
2577 u'properties': {
2578 u'category': u'git_cl_try',
2579 u'key': u'val',
2580 u'json': [{u'a': 1}, None],
2581 u'master': u'tryserver.chromium',
2582
2583 u'patch_gerrit_url':
2584 u'https://chromium-review.googlesource.com',
2585 u'patch_issue': 123456,
2586 u'patch_project': u'depot_tools',
2587 u'patch_ref': u'refs/changes/56/123456/7',
2588 u'patch_repository_url':
2589 u'https://chromium.googlesource.com/depot_tools',
2590 u'patch_set': 7,
2591 u'patch_storage': u'gerrit',
2592 }
2593 })
2594 self.assertEqual(build, {
2595 u'bucket': u'master.tryserver.chromium',
2596 u'client_operation_id': u'uuid4',
2597 u'tags': [
2598 u'builder:win',
2599 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2600 u'user_agent:git_cl_try',
2601 u'master:tryserver.chromium'],
2602 })
2603
2604 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2605
2606 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2607 self.assertEqual(0, git_cl.main([
2608 'try', '-m', 'tryserver.chromium', '-b', 'win',
2609 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2610 self.assertRegexpMatches(
2611 git_cl.sys.stdout.getvalue(),
2612 'Tried jobs on:\nBucket: master.tryserver.chromium')
2613
borenet6c0efe62016-10-19 08:13:29 -07002614 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002615 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2616 lambda _: {
2617 'owner_email': 'owner@e.mail',
2618 'private': False,
2619 'closed': False,
2620 'project': 'depot_tools',
2621 'patchsets': [20001],
2622 })
borenet6c0efe62016-10-19 08:13:29 -07002623 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2624 self.calls = [
2625 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2626 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2627 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2628 ((['git', 'config', 'rietveld.server'],),
2629 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002630 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002631 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002632 ]
2633
2634 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002635 body = json.loads(kw['body'])
2636 self.assertEqual(len(body['builds']), 1)
2637 build = body['builds'][0]
2638 params = json.loads(build.pop('parameters_json'))
2639 self.assertEqual(params, {
2640 u'builder_name': u'win',
2641 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2642 u'revision': None}],
2643 u'properties': {
2644 u'category': u'git_cl_try',
2645 u'issue': 123,
2646 u'patch_project': u'depot_tools',
2647 u'patch_storage': u'rietveld',
2648 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002649 u'rietveld': u'https://codereview.chromium.org',
2650 }
2651 })
2652 self.assertEqual(build, {
2653 u'bucket': u'test.bucket',
2654 u'client_operation_id': u'uuid4',
2655 u'tags': [u'builder:win',
2656 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2657 u'user_agent:git_cl_try'],
2658 })
2659
2660 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2661
2662 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2663 self.assertEqual(0, git_cl.main([
2664 'try', '-B', 'test.bucket', '-b', 'win']))
2665 self.assertRegexpMatches(
2666 git_cl.sys.stdout.getvalue(),
2667 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002668
qyearsley123a4682016-10-26 09:12:17 -07002669 def test_git_cl_try_bots_on_multiple_masters(self):
2670 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
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'],),
tandrii8c5a3532016-11-04 07:52:02 -07002676 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002677 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2678 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2679 ]
2680
2681 def _buildbucket_retry(*_, **kw):
2682 body = json.loads(kw['body'])
2683 self.assertEqual(len(body['builds']), 2)
2684
2685 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2686 self.assertEqual(first_build_params['builder_name'], 'builder1')
2687 self.assertEqual(first_build_params['properties']['master'], 'master1')
2688
2689 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2690 self.assertEqual(first_build_params['builder_name'], 'builder2')
2691 self.assertEqual(first_build_params['properties']['master'], 'master2')
2692
2693 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2694
2695 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2696 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2697
2698 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2699 self.assertEqual(
2700 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2701 self.assertEqual(
2702 git_cl.sys.stdout.getvalue(),
2703 'Tried jobs on:\n'
2704 'Bucket: master.master1\n'
2705 ' builder1: []\n'
2706 'Bucket: master.master2\n'
2707 ' builder2: []\n'
2708 'To see results here, run: git cl try-results\n'
2709 'To see results in browser, run: git cl web\n')
2710
tandrii16e0b4e2016-06-07 10:34:28 -07002711 def _common_GerritCommitMsgHookCheck(self):
2712 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2713 self.mock(git_cl.os.path, 'abspath',
2714 lambda path: self._mocked_call(['abspath', path]))
2715 self.mock(git_cl.os.path, 'exists',
2716 lambda path: self._mocked_call(['exists', path]))
2717 self.mock(git_cl.gclient_utils, 'FileRead',
2718 lambda path: self._mocked_call(['FileRead', path]))
2719 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2720 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2721 self.calls = [
2722 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2723 ((['abspath', '../'],), '/abs/git_repo_root'),
2724 ]
2725 return git_cl.Changelist(codereview='gerrit', issue=123)
2726
2727 def test_GerritCommitMsgHookCheck_custom_hook(self):
2728 cl = self._common_GerritCommitMsgHookCheck()
2729 self.calls += [
2730 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2731 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2732 '#!/bin/sh\necho "custom hook"')
2733 ]
2734 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2735
2736 def test_GerritCommitMsgHookCheck_not_exists(self):
2737 cl = self._common_GerritCommitMsgHookCheck()
2738 self.calls += [
2739 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2740 ]
2741 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2742
2743 def test_GerritCommitMsgHookCheck(self):
2744 cl = self._common_GerritCommitMsgHookCheck()
2745 self.calls += [
2746 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2747 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2748 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002749 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002750 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2751 ''),
2752 ]
2753 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2754
tandriic4344b52016-08-29 06:04:54 -07002755 def test_GerritCmdLand(self):
2756 self.calls += [
2757 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2758 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2759 'deadbeaf'),
2760 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2761 ((['git', 'config', 'branch.feature.gerritserver'],),
2762 'chromium-review.googlesource.com'),
2763 ]
2764 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2765 cl._codereview_impl._GetChangeDetail = lambda _: {
2766 'labels': {},
2767 'current_revision': 'deadbeaf',
2768 }
agable32978d92016-11-01 12:55:02 -07002769 cl._codereview_impl._GetChangeCommit = lambda: {
2770 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002771 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002772 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2773 }
tandriic4344b52016-08-29 06:04:54 -07002774 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002775 out = StringIO.StringIO()
2776 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002777 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002778 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002779 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002780
tandrii221ab252016-10-06 08:12:04 -07002781 BUILDBUCKET_BUILDS_MAP = {
2782 '9000': {
2783 'id': '9000',
2784 'status': 'STARTED',
2785 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2786 'result_details_json': '{"properties": {}}',
2787 'bucket': 'master.x.y',
2788 'created_by': 'user:someone@chromium.org',
2789 'created_ts': '147200002222000',
2790 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2791 },
2792 '8000': {
2793 'id': '8000',
2794 'status': 'COMPLETED',
2795 'result': 'FAILURE',
2796 'failure_reason': 'BUILD_FAILURE',
2797 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2798 'result_details_json': '{"properties": {}}',
2799 'bucket': 'master.x.y',
2800 'created_by': 'user:someone@chromium.org',
2801 'created_ts': '147200001111000',
2802 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2803 },
2804 }
2805
2806 def test_write_try_results_json(self):
2807 expected_output = [
2808 {
2809 'buildbucket_id': '8000',
2810 'bucket': 'master.x.y',
2811 'builder_name': 'my-builder',
2812 'status': 'COMPLETED',
2813 'result': 'FAILURE',
2814 'failure_reason': 'BUILD_FAILURE',
2815 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2816 },
2817 {
2818 'buildbucket_id': '9000',
2819 'bucket': 'master.x.y',
2820 'builder_name': 'my-builder',
2821 'status': 'STARTED',
2822 'result': None,
2823 'failure_reason': None,
2824 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2825 }
2826 ]
2827 self.calls = [(('write_json', 'output.json', expected_output), '')]
2828 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2829
tandrii45b2a582016-10-11 03:14:16 -07002830 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002831 out = StringIO.StringIO()
2832 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002833 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2834 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002835 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2836 self._mocked_call(['get_authenticator_for_host', host]))
2837 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2838 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002839
2840 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2841 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002842 self.calls += [
2843 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2844 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2845 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2846 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2847 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2848 ((['git', 'config', 'branch.feature.rietveldserver'],),
2849 'codereview.example.com'),
2850 ((['get_authenticator_for_host', 'codereview.example.com'],),
2851 AuthenticatorMock()),
2852 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2853
2854 def test_fetch_try_jobs_none_rietveld(self):
2855 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002856 # Simulate that user isn't logged in.
2857 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002858 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002859 self.assertRegexpMatches(sys.stdout.getvalue(),
2860 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002861 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2862
2863 def test_fetch_try_jobs_some_rietveld(self):
2864 self._setup_fetch_try_jobs_rietveld({
2865 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2866 })
2867 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002868 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2869 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2870 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2871
2872 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2873 self._setup_fetch_try_jobs(most_recent_patchset=13)
2874 self.calls += [
2875 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2876 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2877 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002878 # TODO(tandrii): Uncomment the below if we decide to support checking
2879 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002880 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002881 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002882 ((['git', 'config', 'branch.feature.gerritserver'],),
2883 'https://x-review.googlesource.com'),
2884 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2885 AuthenticatorMock()),
2886 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2887
2888 def test_fetch_try_jobs_none_gerrit(self):
2889 self._setup_fetch_try_jobs_gerrit({})
2890 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002891 # TODO(tandrii): Uncomment the below if we decide to support checking
2892 # patchsets for Gerrit.
2893 # self.assertRegexpMatches(
2894 # sys.stdout.getvalue(),
2895 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002896 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2897
2898 def test_fetch_try_jobs_some_gerrit(self):
2899 self._setup_fetch_try_jobs_gerrit({
2900 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2901 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002902 # TODO(tandrii): Uncomment the below if we decide to support checking
2903 # patchsets for Gerrit.
2904 # self.calls.remove(
2905 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002906 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2907
2908 # ... and doesn't result in warning.
2909 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2910 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002911 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2912 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2913
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002914 def _mock_gerrit_changes_for_detail_cache(self):
2915 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002916
2917 def test_gerrit_change_detail_cache_normalize(self):
2918 self._mock_gerrit_changes_for_detail_cache()
2919 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002920 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002921 ]
2922 cl = git_cl.Changelist(codereview='gerrit')
2923 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2924 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2925 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2926 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2927
2928 def test_gerrit_change_detail_cache_simple(self):
2929 self._mock_gerrit_changes_for_detail_cache()
2930 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002931 (('GetChangeDetail', 'host', '1', []), 'a'),
2932 (('GetChangeDetail', 'host', '2', []), 'b'),
2933 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002934 ]
2935 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2936 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2937 self.assertEqual(cl._GetChangeDetail(), 'a')
2938 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002939 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002940 self.assertEqual(cl._GetChangeDetail(), 'a')
2941 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2942
2943 def test_gerrit_change_detail_cache_options(self):
2944 self._mock_gerrit_changes_for_detail_cache()
2945 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002946 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
2947 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
2948 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
2949 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002950 ]
2951 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2952 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2953 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2954 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2955 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2956 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2957 self.assertEqual(cl._GetChangeDetail(), 'cab')
2958
2959 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2960 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2961 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2962 self.assertEqual(cl._GetChangeDetail(), 'cab')
2963
2964 # Finally, no_cache should invalidate all caches for given change.
2965 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2966 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2967
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002968 def test_gerrit_description_caching(self):
2969 def gen_detail(rev, desc):
2970 return {
2971 'current_revision': rev,
2972 'revisions': {rev: {'commit': {'message': desc}}}
2973 }
2974 self.calls = [
2975 (('GetChangeDetail', 'host', '1',
2976 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2977 gen_detail('rev1', 'desc1')),
2978 (('GetChangeDetail', 'host', '1',
2979 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2980 gen_detail('rev2', 'desc2')),
2981 ]
2982
2983 self._mock_gerrit_changes_for_detail_cache()
2984 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2985 self.assertEqual(cl.GetDescription(), 'desc1')
2986 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
2987 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002988
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002989 def test_print_current_creds(self):
2990 class CookiesAuthenticatorMock(object):
2991 def __init__(self):
2992 self.gitcookies = {
2993 'host.googlesource.com': ('user', 'pass'),
2994 'host-review.googlesource.com': ('user', 'pass'),
2995 }
2996 self.netrc = self
2997 self.netrc.hosts = {
2998 'github.com': ('user2', None, 'pass2'),
2999 'host2.googlesource.com': ('user3', None, 'pass'),
3000 }
3001 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3002 CookiesAuthenticatorMock)
3003 self.mock(sys, 'stdout', StringIO.StringIO())
3004 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3005 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3006 ' Host\t User\t Which file',
3007 '============================\t=====\t===========',
3008 'host-review.googlesource.com\t user\t.gitcookies',
3009 ' host.googlesource.com\t user\t.gitcookies',
3010 ' host2.googlesource.com\tuser3\t .netrc',
3011 ])
3012 sys.stdout.buf = ''
3013 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3014 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3015 ' Host\tUser\t Which file',
3016 '============================\t====\t===========',
3017 'host-review.googlesource.com\tuser\t.gitcookies',
3018 ' host.googlesource.com\tuser\t.gitcookies',
3019 ])
3020
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003021 def _common_creds_check_mocks(self):
3022 def exists_mock(path):
3023 dirname = os.path.dirname(path)
3024 if dirname == os.path.expanduser('~'):
3025 dirname = '~'
3026 base = os.path.basename(path)
3027 if base in ('.netrc', '.gitcookies'):
3028 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3029 # git cl also checks for existence other files not relevant to this test.
3030 return None
3031 self.mock(os.path, 'exists', exists_mock)
3032 self.mock(sys, 'stdout', StringIO.StringIO())
3033
3034 def test_creds_check_gitcookies_not_configured(self):
3035 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003036 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
3037 lambda _, include_netrc: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003038 self.calls = [
3039 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3040 (('os.path.exists', '~/.netrc'), True),
3041 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3042 'or Ctrl+C to abort'), ''),
3043 ((['git', 'config', '--global', 'http.cookiefile',
3044 os.path.expanduser('~/.gitcookies')], ), ''),
3045 ]
3046 self.assertEqual(0, git_cl.main(['creds-check']))
3047 self.assertRegexpMatches(
3048 sys.stdout.getvalue(),
3049 '^You seem to be using outdated .netrc for git credentials:')
3050 self.assertRegexpMatches(
3051 sys.stdout.getvalue(),
3052 '\nConfigured git to use .gitcookies from')
3053
3054 def test_creds_check_gitcookies_configured_custom_broken(self):
3055 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003056 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
3057 lambda _, include_netrc: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003058 self.calls = [
3059 ((['git', 'config', '--global', 'http.cookiefile'],),
3060 '/custom/.gitcookies'),
3061 (('os.path.exists', '/custom/.gitcookies'), False),
3062 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3063 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3064 ((['git', 'config', '--global', 'http.cookiefile',
3065 os.path.expanduser('~/.gitcookies')], ), ''),
3066 ]
3067 self.assertEqual(0, git_cl.main(['creds-check']))
3068 self.assertRegexpMatches(
3069 sys.stdout.getvalue(),
3070 'WARNING: you have configured custom path to .gitcookies: ')
3071 self.assertRegexpMatches(
3072 sys.stdout.getvalue(),
3073 'However, your configured .gitcookies file is missing.')
3074
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003075
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003076if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003077 logging.basicConfig(
3078 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003079 unittest.main()