blob: 7ed3b28876e46030aafe5f35e12216b52f207916 [file] [log] [blame]
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001#!/usr/bin/env python
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5
6"""Unit tests for git_cl.py."""
7
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01009import datetime
tandriide281ae2016-10-12 06:02:30 -070010import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010011import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000012import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000013import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000014import sys
15import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000016import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000017
18sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
19
20from testing_support.auto_stub import TestCase
21
22import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000023import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000024import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026
tandrii5d48c322016-08-18 16:19:37 -070027def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
28 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
29
30
31CERR1 = callError(1)
32
33
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000034class ChangelistMock(object):
35 # A class variable so we can access it when we don't have access to the
36 # instance that's being set.
37 desc = ""
38 def __init__(self, **kwargs):
39 pass
40 def GetIssue(self):
41 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080042 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000043 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070044 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000045 ChangelistMock.desc = desc
46
tandrii5d48c322016-08-18 16:19:37 -070047
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000048class PresubmitMock(object):
49 def __init__(self, *args, **kwargs):
50 self.reviewers = []
51 @staticmethod
52 def should_continue():
53 return True
54
55
56class RietveldMock(object):
57 def __init__(self, *args, **kwargs):
58 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000059
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000060 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080061 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000062 return 'Issue: %d' % issue
63
maruel@chromium.org78936cb2013-04-11 00:17:52 +000064 @staticmethod
65 def get_issue_properties(_issue, _messages):
66 return {
67 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
68 'messages': [
69 {
70 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -070071 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +000072 'sender': 'john@chromium.org',
73 },
74 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010075 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000076 }
77
iannuccie53c9352016-08-17 14:40:40 -070078 @staticmethod
79 def close_issue(_issue):
80 return 'Closed'
81
skobes6468b902016-10-24 08:45:10 -070082 @staticmethod
83 def get_patch(issue, patchset):
84 return 'patch set from issue %s patchset %s' % (issue, patchset)
85
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010086 @staticmethod
87 def update_description(_issue, _description):
88 return 'Updated'
89
90 @staticmethod
91 def add_comment(_issue, _comment):
92 return 'Commented'
93
94
95
skobes6468b902016-10-24 08:45:10 -070096
97class GitCheckoutMock(object):
98 def __init__(self, *args, **kwargs):
99 pass
100
101 @staticmethod
102 def reset():
103 GitCheckoutMock.conflict = False
104
105 def apply_patch(self, p):
106 if GitCheckoutMock.conflict:
107 raise Exception('failed')
108
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000109
110class WatchlistsMock(object):
111 def __init__(self, _):
112 pass
113 @staticmethod
114 def GetWatchersForPaths(_):
115 return ['joe@example.com']
116
117
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000118class CodereviewSettingsFileMock(object):
119 def __init__(self):
120 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800121 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000122 def read(self):
123 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000124 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000125
126
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000127class AuthenticatorMock(object):
128 def __init__(self, *_args):
129 pass
130 def has_cached_credentials(self):
131 return True
tandrii221ab252016-10-06 08:12:04 -0700132 def authorize(self, http):
133 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000134
135
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100136def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000137 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
138
139 Usage:
140 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100141 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000142
143 OR
144 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100145 CookiesAuthenticatorMockFactory(
146 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 """
148 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800149 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000150 # Intentionally not calling super() because it reads actual cookie files.
151 pass
152 @classmethod
153 def get_gitcookies_path(cls):
154 return '~/.gitcookies'
155 @classmethod
156 def get_netrc_path(cls):
157 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100158 def _get_auth_for_host(self, host):
159 if same_auth:
160 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000161 return (hosts_with_creds or {}).get(host)
162 return CookiesAuthenticatorMock
163
kmarshall9249e012016-08-23 12:02:16 -0700164class MockChangelistWithBranchAndIssue():
165 def __init__(self, branch, issue):
166 self.branch = branch
167 self.issue = issue
168 def GetBranch(self):
169 return self.branch
170 def GetIssue(self):
171 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000172
tandriic2405f52016-10-10 08:13:15 -0700173
174class SystemExitMock(Exception):
175 pass
176
177
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000178class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100179 def test_get_description(self):
180 cl = git_cl.Changelist(issue=1, codereview='rietveld',
181 codereview_host='host')
182 cl.description = 'x'
183 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800184 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100185 self.assertEquals(cl.GetDescription(), 'x')
186 self.assertEquals(cl.GetDescription(force=True), 'y')
187 self.assertEquals(cl.GetDescription(), 'y')
188
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700189 def test_description_footers(self):
190 cl = git_cl.Changelist(issue=1, codereview='gerrit',
191 codereview_host='host')
192 cl.description = '\n'.join([
193 'This is some message',
194 '',
195 'It has some lines',
196 'and, also',
197 '',
198 'Some: Really',
199 'Awesome: Footers',
200 ])
201 cl.has_description = True
202 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
203 msg, footers = cl.GetDescriptionFooters()
204 self.assertEquals(
205 msg, ['This is some message', '', 'It has some lines', 'and, also'])
206 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
207
208 msg.append('wut')
209 footers.append(('gnarly-dude', 'beans'))
210 cl.UpdateDescriptionFooters(msg, footers)
211 self.assertEquals(cl.GetDescription().splitlines(), [
212 'This is some message',
213 '',
214 'It has some lines',
215 'and, also',
216 'wut'
217 '',
218 'Some: Really',
219 'Awesome: Footers',
220 'Gnarly-Dude: beans',
221 ])
222
tandriif9aefb72016-07-01 09:06:51 -0700223 def test_get_bug_line_values(self):
224 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
225 self.assertEqual(f('', ''), [])
226 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
227 self.assertEqual(f('v8', '456'), ['v8:456'])
228 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
229 # Not nice, but not worth carying.
230 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
231 ['v8:456', 'chromium:123', 'v8:123'])
232
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100233 def _test_git_number(self, parent_msg, dest_ref, child_msg,
234 parent_hash='parenthash'):
235 desc = git_cl.ChangeDescription(child_msg)
236 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
237 return desc.description
238
239 def assertEqualByLine(self, actual, expected):
240 self.assertEqual(actual.splitlines(), expected.splitlines())
241
242 def test_git_number_bad_parent(self):
243 with self.assertRaises(ValueError):
244 self._test_git_number('Parent', 'refs/heads/master', 'Child')
245
246 def test_git_number_bad_parent_footer(self):
247 with self.assertRaises(AssertionError):
248 self._test_git_number(
249 'Parent\n'
250 '\n'
251 'Cr-Commit-Position: wrong',
252 'refs/heads/master', 'Child')
253
254 def test_git_number_bad_lineage_ignored(self):
255 actual = self._test_git_number(
256 'Parent\n'
257 '\n'
258 'Cr-Commit-Position: refs/heads/master@{#1}\n'
259 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
260 'refs/heads/master', 'Child')
261 self.assertEqualByLine(
262 actual,
263 'Child\n'
264 '\n'
265 'Cr-Commit-Position: refs/heads/master@{#2}\n'
266 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
267
268 def test_git_number_same_branch(self):
269 actual = self._test_git_number(
270 'Parent\n'
271 '\n'
272 'Cr-Commit-Position: refs/heads/master@{#12}',
273 dest_ref='refs/heads/master',
274 child_msg='Child')
275 self.assertEqualByLine(
276 actual,
277 'Child\n'
278 '\n'
279 'Cr-Commit-Position: refs/heads/master@{#13}')
280
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200281 def test_git_number_same_branch_mixed_footers(self):
282 actual = self._test_git_number(
283 'Parent\n'
284 '\n'
285 'Cr-Commit-Position: refs/heads/master@{#12}',
286 dest_ref='refs/heads/master',
287 child_msg='Child\n'
288 '\n'
289 'Broken-by: design\n'
290 'BUG=123')
291 self.assertEqualByLine(
292 actual,
293 'Child\n'
294 '\n'
295 'Broken-by: design\n'
296 'BUG=123\n'
297 'Cr-Commit-Position: refs/heads/master@{#13}')
298
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100299 def test_git_number_same_branch_with_originals(self):
300 actual = self._test_git_number(
301 'Parent\n'
302 '\n'
303 'Cr-Commit-Position: refs/heads/master@{#12}',
304 dest_ref='refs/heads/master',
305 child_msg='Child\n'
306 '\n'
307 'Some users are smart and insert their own footers\n'
308 '\n'
309 'Cr-Whatever: value\n'
310 'Cr-Commit-Position: refs/copy/paste@{#22}')
311 self.assertEqualByLine(
312 actual,
313 'Child\n'
314 '\n'
315 'Some users are smart and insert their own footers\n'
316 '\n'
317 'Cr-Original-Whatever: value\n'
318 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
319 'Cr-Commit-Position: refs/heads/master@{#13}')
320
321 def test_git_number_new_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/branch',
327 child_msg='Child')
328 self.assertEqualByLine(
329 actual,
330 'Child\n'
331 '\n'
332 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
333 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
334
335 def test_git_number_lineage(self):
336 actual = self._test_git_number(
337 'Parent\n'
338 '\n'
339 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
340 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
341 dest_ref='refs/heads/branch',
342 child_msg='Child')
343 self.assertEqualByLine(
344 actual,
345 'Child\n'
346 '\n'
347 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
348 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
349
350 def test_git_number_moooooooore_lineage(self):
351 actual = self._test_git_number(
352 'Parent\n'
353 '\n'
354 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
355 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
356 dest_ref='refs/heads/mooore',
357 child_msg='Child')
358 self.assertEqualByLine(
359 actual,
360 'Child\n'
361 '\n'
362 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
363 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
364 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
365
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100366 def test_git_number_ever_moooooooore_lineage(self):
367 self.maxDiff = 10000
368 actual = self._test_git_number(
369 'CQ commit on fresh new branch + numbering.\n'
370 '\n'
371 'NOTRY=True\n'
372 'NOPRESUBMIT=True\n'
373 'BUG=\n'
374 '\n'
375 'Review-Url: https://codereview.chromium.org/2577703003\n'
376 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
377 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
378 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
379 dest_ref='refs/heads/gnumb-test/cl',
380 child_msg='git cl on fresh new branch + numbering.\n'
381 '\n'
382 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
383 self.assertEqualByLine(
384 actual,
385 'git cl on fresh new branch + numbering.\n'
386 '\n'
387 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
388 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
389 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
390 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
391 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100392
393 def test_git_number_cherry_pick(self):
394 actual = self._test_git_number(
395 'Parent\n'
396 '\n'
397 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
398 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
399 dest_ref='refs/heads/branch',
400 child_msg='Child, which is cherry-pick from master\n'
401 '\n'
402 'Cr-Commit-Position: refs/heads/master@{#100}\n'
403 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
404 self.assertEqualByLine(
405 actual,
406 'Child, which is cherry-pick from master\n'
407 '\n'
408 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
409 '\n'
410 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
411 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
412 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
413
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000414
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200415class TestParseIssueURL(unittest.TestCase):
416 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
417 codereview=None, fail=False):
418 self.assertIsNotNone(parsed)
419 if fail:
420 self.assertFalse(parsed.valid)
421 return
422 self.assertTrue(parsed.valid)
423 self.assertEqual(parsed.issue, issue)
424 self.assertEqual(parsed.patchset, patchset)
425 self.assertEqual(parsed.hostname, hostname)
426 self.assertEqual(parsed.codereview, codereview)
427
428 def _run_and_validate(self, func, url, *args, **kwargs):
429 result = func(urlparse.urlparse(url))
430 if kwargs.pop('fail', False):
431 self.assertIsNone(result)
432 return None
433 self._validate(result, *args, fail=False, **kwargs)
434
435 def test_rietveld(self):
436 def test(url, *args, **kwargs):
437 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
438 *args, codereview='rietveld', **kwargs)
439
440 test('http://codereview.chromium.org/123',
441 123, None, 'codereview.chromium.org')
442 test('https://codereview.chromium.org/123',
443 123, None, 'codereview.chromium.org')
444 test('https://codereview.chromium.org/123/',
445 123, None, 'codereview.chromium.org')
446 test('https://codereview.chromium.org/123/whatever',
447 123, None, 'codereview.chromium.org')
448 test('https://codereview.chromium.org/123/#ps20001',
449 123, 20001, 'codereview.chromium.org')
450 test('http://codereview.chromium.org/download/issue123_4.diff',
451 123, 4, 'codereview.chromium.org')
452 # This looks like bad Gerrit, but is actually valid Rietveld, too.
453 test('https://chrome-review.source.com/123/4/',
454 123, None, 'chrome-review.source.com')
455
456 test('https://codereview.chromium.org/deadbeaf', fail=True)
457 test('https://codereview.chromium.org/api/123', fail=True)
458 test('bad://codereview.chromium.org/123', fail=True)
459 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
460
461 def test_gerrit(self):
462 def test(url, issue=None, patchset=None, hostname=None, fail=None):
463 self._test_ParseIssueUrl(
464 git_cl._GerritChangelistImpl.ParseIssueURL,
465 url, issue, patchset, hostname, fail)
466 def test(url, *args, **kwargs):
467 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
468 *args, codereview='gerrit', **kwargs)
469
470 test('http://chrome-review.source.com/c/123',
471 123, None, 'chrome-review.source.com')
472 test('https://chrome-review.source.com/c/123/',
473 123, None, 'chrome-review.source.com')
474 test('https://chrome-review.source.com/c/123/4',
475 123, 4, 'chrome-review.source.com')
476 test('https://chrome-review.source.com/#/c/123/4',
477 123, 4, 'chrome-review.source.com')
478 test('https://chrome-review.source.com/c/123/4',
479 123, 4, 'chrome-review.source.com')
480 test('https://chrome-review.source.com/123',
481 123, None, 'chrome-review.source.com')
482 test('https://chrome-review.source.com/123/4',
483 123, 4, 'chrome-review.source.com')
484
485 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
486 test('https://chrome-review.source.com/c/abc/', fail=True)
487 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
488
489 def test_ParseIssueNumberArgument(self):
490 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200491 codereview_hint = kwargs.pop('hint', None)
492 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
493 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200494
495 test('123', 123)
496 test('', fail=True)
497 test('abc', fail=True)
498 test('123/1', fail=True)
499 test('123a', fail=True)
500 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
501 # Rietveld.
502 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200503 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200504 test('https://codereview.source.com/123',
505 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200506 # Matches both, but we take Gerrit if specifically requested.
507 test('https://codereview.source.com/123',
508 123, None, 'codereview.source.com', 'gerrit',
509 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200510 # Gerrrit.
511 test('https://chrome-review.source.com/c/123/4',
512 123, 4, 'chrome-review.source.com', 'gerrit')
513 test('https://chrome-review.source.com/bad/123/4', fail=True)
514
515
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100516class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100517 def setUp(self):
518 super(GitCookiesCheckerTest, self).setUp()
519 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100520 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100521
522 def mock_hosts_creds(self, subhost_identity_pairs):
523 def ensure_googlesource(h):
524 if not h.endswith(self.c._GOOGLESOURCE):
525 assert not h.endswith('.')
526 return h + '.' + self.c._GOOGLESOURCE
527 return h
528 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
529 for h, i in subhost_identity_pairs]
530
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200531 def test_identity_parsing(self):
532 self.assertEqual(self.c._parse_identity('ldap.google.com'),
533 ('ldap', 'google.com'))
534 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
535 ('ldap', 'example.com'))
536 # Specical case because we know there are no subdomains in chromium.org.
537 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
538 ('note.period', 'chromium.org'))
539 # Pathological: .period. can be either ldap OR domain, more likely domain.
540 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
541 ('note', 'period.example.com'))
542
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100543 def test_analysis_nothing(self):
544 self.c._all_hosts = []
545 self.assertFalse(self.c.has_generic_host())
546 self.assertEqual(set(), self.c.get_conflicting_hosts())
547 self.assertEqual(set(), self.c.get_duplicated_hosts())
548 self.assertEqual(set(), self.c.get_partially_configured_hosts())
549 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
550
551 def test_analysis(self):
552 self.mock_hosts_creds([
553 ('.googlesource.com', 'git-example.chromium.org'),
554
555 ('chromium', 'git-example.google.com'),
556 ('chromium-review', 'git-example.google.com'),
557 ('chrome-internal', 'git-example.chromium.org'),
558 ('chrome-internal-review', 'git-example.chromium.org'),
559 ('conflict', 'git-example.google.com'),
560 ('conflict-review', 'git-example.chromium.org'),
561 ('dup', 'git-example.google.com'),
562 ('dup', 'git-example.google.com'),
563 ('dup-review', 'git-example.google.com'),
564 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200565 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100566 ])
567 self.assertTrue(self.c.has_generic_host())
568 self.assertEqual(set(['conflict.googlesource.com']),
569 self.c.get_conflicting_hosts())
570 self.assertEqual(set(['dup.googlesource.com']),
571 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200572 self.assertEqual(set(['partial.googlesource.com',
573 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100574 self.c.get_partially_configured_hosts())
575 self.assertEqual(set(['chromium.googlesource.com',
576 'chrome-internal.googlesource.com']),
577 self.c.get_hosts_with_wrong_identities())
578
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100579 def test_report_no_problems(self):
580 self.test_analysis_nothing()
581 self.mock(sys, 'stdout', StringIO.StringIO())
582 self.assertFalse(self.c.find_and_report_problems())
583 self.assertEqual(sys.stdout.getvalue(), '')
584
585 def test_report(self):
586 self.test_analysis()
587 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200588 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
589 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100590 self.assertTrue(self.c.find_and_report_problems())
591 with open(os.path.join(os.path.dirname(__file__),
592 'git_cl_creds_check_report.txt')) as f:
593 expected = f.read()
594 def by_line(text):
595 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200596 self.maxDiff = 10000
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200597 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100598
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000599class TestGitCl(TestCase):
600 def setUp(self):
601 super(TestGitCl, self).setUp()
602 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700603 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000604 self.mock(subprocess2, 'call', self._mocked_call)
605 self.mock(subprocess2, 'check_call', self._mocked_call)
606 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700607 self.mock(subprocess2, 'communicate',
608 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000609 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000610 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000611 self.mock(git_common, 'get_or_create_merge_base',
612 lambda *a: (
613 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000614 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000615 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100616 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
617 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700618 self.mock(git_cl, 'write_json', lambda path, contents:
619 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000620 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000621 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000622 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700623 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
624 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000625 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000626 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000627 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100628 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
629 lambda *args, **kwargs: self._mocked_call(
630 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700631 self.mock(git_cl.gerrit_util, 'GetChangeComments',
632 lambda *args, **kwargs: self._mocked_call(
633 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100634 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700635 lambda h, i, reviewers, ccs, notify: self._mocked_call(
636 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700637 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700638 lambda h, i, msg=None, labels=None, notify=None:
639 self._mocked_call('SetReview', h, i, msg, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000640 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
641 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700642 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100643 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000644 # It's important to reset settings to not have inter-tests interference.
645 git_cl.settings = None
646
647 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000648 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100649 self.assertEquals([], self.calls)
650 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000651 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100652 raise
653 # Sadly, has_failed() returns True if this OR any other tests before this
654 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200655 git_cl.logging.error(
656 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100657 'There are un-consumed self.calls after this test has finished.\n'
658 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700659 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200660 'If you are already running only this test, then **first** fix the '
661 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100662 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700663 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100664 'and follow instructions above.\n' +
665 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000666 finally:
667 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000668
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000669 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000670 self.assertTrue(
671 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700672 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000673 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000674 expected_args, result = top
675
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000676 # Also logs otherwise it could get caught in a try/finally and be hard to
677 # diagnose.
678 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700679 N = 5
680 prior_calls = '\n '.join(
681 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
682 for i, c in enumerate(self._calls_done[-N:]))
683 following_calls = '\n '.join(
684 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
685 for i, c in enumerate(self.calls[:N]))
686 extended_msg = (
687 'A few prior calls:\n %s\n\n'
688 'This (expected):\n @%d: %r\n'
689 'This (actual):\n @%d: %r\n\n'
690 'A few following expected calls:\n %s' %
691 (prior_calls, len(self._calls_done), expected_args,
692 len(self._calls_done), args, following_calls))
693 git_cl.logging.error(extended_msg)
694
tandrii99a72f22016-08-17 14:33:24 -0700695 self.fail('@%d\n'
696 ' Expected: %r\n'
697 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700698 len(self._calls_done), expected_args, args))
699
700 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700701 if isinstance(result, Exception):
702 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000703 return result
704
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100705 def test_ask_for_explicit_yes_true(self):
706 self.calls = [
707 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
708 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
709 ]
710 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
711
712 def test_ask_for_explicit_yes_true(self):
713 self.calls = [
714 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
715 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
716 ]
717 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
718
tandrii48df5812016-10-17 03:55:37 -0700719 def test_LoadCodereviewSettingsFromFile_gerrit(self):
720 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
721 self.calls = [
722 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
723 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
724 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
725 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
726 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
727 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700728 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
729 CERR1),
730 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700731 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
732 CERR1),
733 ((['git', 'config', 'gerrit.host', 'true'],), ''),
734 ]
735 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
736
maruel@chromium.orga3353652011-11-30 14:26:57 +0000737 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000738 def _is_gerrit_calls(cls, gerrit=False):
739 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
740 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
741
742 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000743 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200744 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000745 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000746
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000747 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200748 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
749 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
750 ((['git', 'config', 'core.editor'],), ''),
751 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000752
753 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200754 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000755 if similarity is None:
756 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700757 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700758 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000759 else:
tandrii33a46ff2016-08-23 05:53:40 -0700760 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700761 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000762
763 if find_copies is None:
764 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700765 find_copies_call = ((['git', 'config', '--bool',
766 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000767 else:
tandrii5d48c322016-08-18 16:19:37 -0700768 val = str(find_copies).lower()
769 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000770 'branch.master.git-find-copies', val],), '')
771
772 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000773 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800774 '-l100000', '-C'+similarity,
775 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000776 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000777 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000778 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000779
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000780 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000781 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000782 similarity_call,
783 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
784 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000785 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000786 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700787 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
788 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000789 ((['git', 'config', 'rietveld.server'],),
790 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000791 ((['git', 'config', 'branch.master.merge'],), 'master'),
792 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000793 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000794 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000795 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000796 ((['git', 'rev-parse', '--show-cdup'],), ''),
797 ((['git', 'rev-parse', 'HEAD'],), '12345'),
798 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000799 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000800 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700801 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000802 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000803 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000804 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000805 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000806 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000807 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000808 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000809 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700810 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000811 ]
812
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000813 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000814 def _git_upload_calls(cls, private):
815 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000816 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000817 private_call = []
818 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000819 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000820 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000821 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000822
maruel@chromium.orga3353652011-11-30 14:26:57 +0000823 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000825 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000826 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800827 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000828 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700829 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000830 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000831 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000832 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700833 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000834 ] + cls._git_post_upload_calls()
835
836 @classmethod
837 def _git_post_upload_calls(cls):
838 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000839 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
840 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
841 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000842 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000843 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000844 ]
845
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000846 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000847 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000848 fake_ancestor = 'fake_ancestor'
849 fake_cl = 'fake_cl_for_patch'
850 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000851 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000852 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000853 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000854 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000855 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000856 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000857 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000858 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700859 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000860 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000861 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000862 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000863 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000864 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000865 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000866 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000867 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000868 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000869 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000870 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000871
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000872 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700873 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000874 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000875 return [
876 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000877 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000878 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000879 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700880 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000881 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000882 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100883 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000884 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000885 ]
886
887 def _run_reviewer_test(
888 self,
889 upload_args,
890 expected_description,
891 returned_description,
892 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000893 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700894 private=False,
895 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000896 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000897 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000898 try:
899 similarity = upload_args[upload_args.index('--similarity')+1]
900 except ValueError:
901 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000902
903 if '--find-copies' in upload_args:
904 find_copies = True
905 elif '--no-find-copies' in upload_args:
906 find_copies = False
907 else:
908 find_copies = None
909
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000910 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700911 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000912
913 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000914
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000915 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000916 self.assertEquals(
917 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000918 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000919 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000920 '#--------------------This line is 72 characters long'
921 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000922 expected_description,
923 desc)
924 return returned_description
925 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000926
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000927 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000928 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700929 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000930 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000931 return 1, 2
932 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000933
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000934 git_cl.main(['upload'] + upload_args)
935
936 def test_no_reviewer(self):
937 self._run_reviewer_test(
938 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000939 'desc\n\nBUG=',
940 '# Blah blah comment.\ndesc\n\nBUG=',
941 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000942 [])
943
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000944 def test_keep_similarity(self):
945 self._run_reviewer_test(
946 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000947 'desc\n\nBUG=',
948 '# Blah blah comment.\ndesc\n\nBUG=',
949 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000950 [])
951
iannucci@chromium.org79540052012-10-19 23:15:26 +0000952 def test_keep_find_copies(self):
953 self._run_reviewer_test(
954 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000955 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000956 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000957 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000958 [])
959
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000960 def test_private(self):
961 self._run_reviewer_test(
962 ['--private'],
963 'desc\n\nBUG=',
964 '# Blah blah comment.\ndesc\n\nBUG=\n',
965 'desc\n\nBUG=',
966 [])
967
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000968 def test_reviewers_cmd_line(self):
969 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000970 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000971 self._run_reviewer_test(
972 ['-r' 'foo@example.com'],
973 description,
974 '\n%s\n' % description,
975 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000976 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000977
978 def test_reviewer_tbr_overriden(self):
979 # Reviewer is overriden with TBR
980 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000981 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000982 self._run_reviewer_test(
983 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000984 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000985 description.strip('\n'),
986 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000987 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000988
989 def test_reviewer_multiple(self):
990 # Handles multiple R= or TBR= lines.
991 description = (
bradnelsond975b302016-10-23 12:20:23 -0700992 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
993 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000994 self._run_reviewer_test(
995 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000996 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000997 description,
998 description,
bradnelsond975b302016-10-23 12:20:23 -0700999 ['--reviewers=another@example.com,reviewer@example.com'],
1000 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001001
maruel@chromium.orga3353652011-11-30 14:26:57 +00001002 def test_reviewer_send_mail(self):
1003 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001004 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +00001005 self._run_reviewer_test(
1006 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001007 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +00001008 description.strip('\n'),
1009 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001010 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +00001011
1012 def test_reviewer_send_mail_no_rev(self):
1013 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00001014 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +02001015 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -07001016 ((['DieWithError', 'Must specify reviewers to send email.'],),
1017 SystemExitMock())
1018 ]
1019
1020 def RunEditor(desc, _, **kwargs):
1021 return desc
1022 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1023 self.mock(sys, 'stdout', stdout)
1024 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001025 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001026 self.assertEqual(
1027 '=====================================\n'
1028 'NOTICE: Rietveld is being deprecated. '
1029 'You can upload changes to Gerrit with\n'
1030 ' git cl upload --gerrit\n'
1031 'or set Gerrit to be your default code review tool with\n'
1032 ' git config gerrit.host true\n'
1033 '=====================================\n',
1034 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001035
tandriif9aefb72016-07-01 09:06:51 -07001036 def test_bug_on_cmd(self):
1037 self._run_reviewer_test(
1038 ['--bug=500658,proj:123'],
1039 'desc\n\nBUG=500658\nBUG=proj:123',
1040 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1041 'desc\n\nBUG=500658\nBUG=proj:1234',
1042 [])
1043
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001044 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1045 parent_msg=None,
1046 new_msg=None,
1047 fail_after_parent_msg=False,
1048 fail_cherry_pick=False,
1049 fail_push_count=0,
1050 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001051 if debug:
1052 # Very useful due to finally clause in git cl land raising exceptions and
1053 # shadowing real cause of failure.
1054 self.mock(git_cl, '_IS_BEING_TESTED', True)
1055 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001056 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001057
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001058 if git_numberer_enabled:
1059 # Special mocks to check validity of timestamp.
1060 original_git_amend_head = git_cl._git_amend_head
1061 def _git_amend_head_mock(msg, tstamp):
1062 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1063 return original_git_amend_head(msg, tstamp)
1064 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1065
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001066 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1067 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001068 self.mock(RietveldMock, 'update_description', staticmethod(
1069 lambda i, d: self._mocked_call(['update_description', i, d])))
1070 self.mock(RietveldMock, 'add_comment', staticmethod(
1071 lambda i, c: self._mocked_call(['add_comment', i, c])))
1072 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001073 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1074 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1075 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1076 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1077 CERR1),
1078 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1079 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001080 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001081 ((['git', 'config', 'rietveld.server'],),
1082 'https://codereview.chromium.org'),
1083 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1084 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1085 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1086 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001087 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1088 ''), # No commits to rebase, according to local view of origin.
1089 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1090 'fake_ancestor_sha'),
1091 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1092 ((['git', 'rev-parse', '--show-cdup'],), ''),
1093 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1094 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1095 'fake_ancestor_sha...', '.'],),
1096 'M\tfile1.cpp'),
1097 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1098 ((['git', 'config', 'branch.feature.rietveldserver'],),
1099 'https://codereview.chromium.org'),
1100 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1101 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1102 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1103 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001104 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001105 # file1.cpp | 53 ++++++--
1106 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1107 ''),
1108 ((['git', 'show-ref', '--quiet', '--verify',
1109 'refs/heads/git-cl-commit'],),
1110 ''), # 0 return code means branch exists.
1111 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1112 ((['git', 'show-ref', '--quiet', '--verify',
1113 'refs/heads/git-cl-cherry-pick'],),
1114 CERR1), # This means git-cl-cherry-pick branch does not exist.
1115 ((['git', 'rev-parse', '--show-cdup'],), ''),
1116 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1117 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1118 ((['git', 'commit', '-m',
1119 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001120 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001121 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1122 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1123 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001124 repo_url),
1125
1126 ((['git', 'config', 'remote.origin.url'],), repo_url),
1127 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1128 git_numberer_enabled),
1129
1130 # Auto-rebase init.
1131 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1132 ]
1133 # Auto-rebase loops.
1134 for attempt in xrange(fail_push_count + 1):
1135 self.calls += [
1136 # Auto-rebase loop start.
1137 ((['git', 'retry', 'fetch', 'origin',
1138 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1139 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1140 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1141 # different in each loop iteration for truly realistic test.
1142 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1143 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1144 callError(1, 'failed to cherry pick') if fail_cherry_pick
1145 else ''),
1146 ]
1147 if fail_cherry_pick:
1148 return
1149
1150 if git_numberer_enabled:
1151 assert parent_msg
1152 self.calls += [
1153 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1154 parent_msg),
1155 ]
1156 if fail_after_parent_msg:
1157 return
1158 assert new_msg
1159 self.calls += [
1160 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1161 '1480022355'), # Committer's unix timestamp.
1162 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1163 '1480024000'),
1164 ((['git_amend_head committer timestamp', 1480024000],), ''),
1165 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1166 ]
1167 self.calls += [
1168 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1169 CERR1 if attempt < fail_push_count else ''),
1170 ]
1171 # End of autorebase + push.
1172
1173 self.calls += [
1174 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1175 ]
1176 if git_numberer_enabled:
1177 self.calls += [
1178 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1179 ]
1180
1181 # Cleanup calls.
1182 self.calls += [
1183 ((['git', 'checkout', '-q', 'feature'],), ''),
1184 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1185 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001186 ]
1187
1188 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001189 self._land_rietveld_calls(
1190 repo_url='https://chromium.googlesource.com/infra/infra',
1191 git_numberer_enabled=False,
1192 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001193 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001194 ((['git', 'config', 'rietveld.viewvc-url'],),
1195 'https://chromium.googlesource.com/infra/infra/+/'),
1196 ((['update_description', 123,
1197 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001198 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001199 ''),
1200 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001201 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001202 ]
1203 git_cl.main(['land'])
1204
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001205 def test_land_rietveld_fail_cherry_pick(self):
1206 self._land_rietveld_calls(
1207 repo_url='https://chromium.googlesource.com/infra/infra',
1208 git_numberer_enabled=False,
1209 fail_cherry_pick=True,
1210 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001211 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001212 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1213 'U path/file1\n'
1214 'U file2.cpp\n'),
1215 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001216 ((['git', 'checkout', '-q', 'feature'],), ''),
1217 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001218 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1219 ]
1220 git_cl.main(['land'])
1221
1222 def test_land_rietveld_git_numberer_fail_1_push(self):
1223 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1224
1225 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1226 self._land_rietveld_calls(
1227 repo_url='https://chromium.googlesource.com/chromium/src',
1228 git_numberer_enabled=True,
1229 parent_msg=('This is parent commit.\n'
1230 '\n'
1231 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1232 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1233 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1234 '\n'
1235 'Review-Url: https://codereview.chromium.org/123 .\n'
1236 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1237 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1238 fail_push_count=fail_push_count,
1239 debug=False)
1240
1241 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001242 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001243 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001244 ((['update_description', 123,
1245 'Issue: 123\n\nR=john@chromium.org\n'
1246 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001247 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001248 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1249 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1250 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001251 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001252 ''),
1253 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001254 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001255 ]
1256 git_cl.main(['land'])
1257
1258 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001259 self._land_rietveld_calls(
1260 repo_url='https://chromium.googlesource.com/v8/v8',
1261 git_numberer_enabled=True,
1262 parent_msg='This is parent commit with no footer.',
1263 fail_after_parent_msg=True,
1264 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001265 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001266 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001267 ((['git', 'checkout', '-q', 'feature'],), ''),
1268 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001269 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001270 ]
1271 with self.assertRaises(ValueError) as cm:
1272 git_cl.main(['land'])
1273 self.assertEqual(cm.exception.message,
1274 'Unable to infer commit position from footers')
1275
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001276 def test_git_numberer_not_whitelisted_repo(self):
1277 self.calls = []
1278 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001279 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1280 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001281 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001282
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001283 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001284 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1285 self.calls = [
1286 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001287 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001288 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001289 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001290 remote_url='https://chromium.googlesource.com/chromium/src',
1291 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001292 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001293
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001294 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001295 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001296 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001297 def fake_temporary_directory(**kwargs):
1298 yield tempdir
1299 self.mock(git_cl.gclient_utils, 'temporary_directory',
1300 fake_temporary_directory)
1301 self._test_GitNumbererState_valid_configs_inner(tempdir)
1302
1303 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001304 self.calls = [
1305 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001306 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001307 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1308 '''
1309 [plugin "git-numberer"]
1310 validate-enabled-refglob = refs/else/*
1311 validate-enabled-refglob = refs/heads/*
1312 validate-disabled-refglob = refs/heads/disabled
1313 validate-disabled-refglob = refs/branch-heads/*
1314 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001315 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1316 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001317 'refs/else/*\n'
1318 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001319 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1320 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001321 'refs/heads/disabled\n'
1322 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001323 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001324
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001325 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001326 remote_url='https://chromium.googlesource.com/chromium/src',
1327 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001328 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001329
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001330 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001331 remote_url='https://chromium.googlesource.com/chromium/src',
1332 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001333 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001334
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001335 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001336 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001337 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001338 remote_url='https://chromium.googlesource.com/chromium/src',
1339 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001340 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001341
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001342 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001343 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001344 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001345 if skip_auth_check:
1346 return [((cmd, ), 'true')]
1347
tandrii5d48c322016-08-18 16:19:37 -07001348 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001349 if issue:
1350 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001351 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001352 ])
1353 calls.extend([
1354 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1355 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1356 ((['git', 'config', 'remote.origin.url'],),
1357 'https://chromium.googlesource.com/my/repo'),
1358 ((['git', 'config', 'remote.origin.url'],),
1359 'https://chromium.googlesource.com/my/repo'),
1360 ])
1361 return calls
1362
1363 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001364 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001365 fetched_status=None, other_cl_owner=None,
1366 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001367 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001368 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1369 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1370 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1371 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001372 ]
1373 calls += cls._is_gerrit_calls(True)
1374 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001375 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1376 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1377 ((['git', 'config', 'branch.master.gerritissue'],),
1378 CERR1 if issue is None else str(issue)),
1379 ]
1380
1381 if custom_cl_base:
1382 ancestor_revision = custom_cl_base
1383 else:
1384 # Determine ancestor_revision to be merge base.
1385 ancestor_revision = 'fake_ancestor_sha'
1386 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001387 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001388 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001389 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001390 'refs/remotes/origin/master'],), ancestor_revision),
1391 ]
1392
1393 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001394 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1395
1396 if issue:
1397 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001398 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001399 '123456',
1400 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001401 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001402 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001403 'change_id': '123456789',
1404 'current_revision': 'sha1_of_current_revision',
1405 'revisions': { 'sha1_of_current_revision': {
1406 'commit': {'message': fetched_description},
1407 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001408 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001409 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001410 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001411 if fetched_status == 'ABANDONED':
1412 calls += [
1413 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1414 '123456 has been abandoned, new uploads are not '
1415 'allowed'), SystemExitMock()),
1416 ]
1417 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001418 if other_cl_owner:
1419 calls += [
1420 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1421 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001422
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001423 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1424 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001425 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001426 ((['git', 'rev-parse', '--show-cdup'],), ''),
1427 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001428
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001429 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1430 ancestor_revision + '...', '.'],),
1431 'M\t.gitignore\n'),
1432 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001433 ]
1434
1435 if not issue:
1436 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001437 ((['git', 'log', '--pretty=format:%s%n%n%b',
1438 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001439 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001440 ]
1441
1442 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001443 ((['git', 'config', 'user.email'],), 'me@example.com'),
1444 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1445 ([custom_cl_base] if custom_cl_base else
1446 [ancestor_revision, 'HEAD']),),
1447 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001448 ]
1449 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001450
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001451 @classmethod
1452 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001453 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001454 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001455 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001456 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001457 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001458 if post_amend_description is None:
1459 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001460 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001461 # Determined in `_gerrit_base_calls`.
1462 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1463
1464 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001465
tandriia60502f2016-06-20 02:01:53 -07001466 if squash_mode == 'default':
1467 calls.extend([
1468 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1469 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1470 ])
1471 elif squash_mode in ('override_squash', 'override_nosquash'):
1472 calls.extend([
1473 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1474 'true' if squash_mode == 'override_squash' else 'false'),
1475 ])
1476 else:
1477 assert squash_mode in ('squash', 'nosquash')
1478
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001479 # If issue is given, then description is fetched from Gerrit instead.
1480 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001481 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001482 ((['git', 'log', '--pretty=format:%s\n\n%b',
1483 ((custom_cl_base + '..') if custom_cl_base else
1484 'fake_ancestor_sha..HEAD')],),
1485 description),
1486 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001487 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001488 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001489 else:
1490 if not title:
1491 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001492 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1493 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001494 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001495 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001496 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001497 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001498 (('DownloadGerritHook', False), ''),
1499 # Amending of commit message to get the Change-Id.
1500 ((['git', 'log', '--pretty=format:%s\n\n%b',
1501 determined_ancestor_revision + '..HEAD'],),
1502 description),
1503 ((['git', 'commit', '--amend', '-m', description],), ''),
1504 ((['git', 'log', '--pretty=format:%s\n\n%b',
1505 determined_ancestor_revision + '..HEAD'],),
1506 post_amend_description)
1507 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001508 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001509 if not issue:
1510 # Prompting to edit description on first upload.
1511 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001512 ((['git', 'config', 'core.editor'],), ''),
1513 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001514 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001515 ref_to_push = 'abcdef0123456789'
1516 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001517 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1518 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1519 ]
1520
1521 if custom_cl_base is None:
1522 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001523 ((['get_or_create_merge_base', 'master',
1524 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001525 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001526 ]
1527 parent = 'origin/master'
1528 else:
1529 calls += [
1530 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1531 'refs/remotes/origin/master'],),
1532 callError(1)), # Means not ancenstor.
1533 (('ask_for_data',
1534 'Do you take responsibility for cleaning up potential mess '
1535 'resulting from proceeding with upload? Press Enter to upload, '
1536 'or Ctrl+C to abort'), ''),
1537 ]
1538 parent = custom_cl_base
1539
1540 calls += [
1541 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1542 '0123456789abcdef'),
1543 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
1544 '-m', description],),
1545 ref_to_push),
1546 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001547 else:
1548 ref_to_push = 'HEAD'
1549
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001550 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001551 ((['git', 'rev-list',
1552 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1553 ref_to_push],),
1554 '1hashPerLine\n'),
1555 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001556
Aaron Gableafd52772017-06-27 16:40:10 -07001557 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001558 ref_suffix = '%ready,notify=ALL'
1559 else:
1560 if not issue:
1561 ref_suffix = '%wip'
1562 else:
1563 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001564
Aaron Gable70f4e242017-06-26 10:45:59 -07001565 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001566 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001567
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001568 if git_mirror is None:
1569 calls += [
1570 ((['git', 'config', 'remote.origin.url'],),
1571 'https://chromium.googlesource.com/yyy/zzz'),
1572 ]
1573 else:
1574 calls += [
1575 ((['git', 'config', 'remote.origin.url'],),
1576 '/cache/this-dir-exists'),
1577 (('os.path.isdir', '/cache/this-dir-exists'),
1578 True),
1579 # Runs in /cache/this-dir-exists.
1580 ((['git', 'config', 'remote.origin.url'],),
1581 'https://chromium.googlesource.com/yyy/zzz'),
1582 ]
1583
ukai@chromium.orge8077812012-02-03 03:41:46 +00001584 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001585 ((['git', 'push',
1586 'https://chromium.googlesource.com/yyy/zzz',
1587 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001588 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001589 'remote: Processing changes: (\)\n'
1590 'remote: Processing changes: (|)\n'
1591 'remote: Processing changes: (/)\n'
1592 'remote: Processing changes: (-)\n'
1593 'remote: Processing changes: new: 1 (/)\n'
1594 'remote: Processing changes: new: 1, done\n'
1595 'remote:\n'
1596 'remote: New Changes:\n'
1597 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1598 'remote:\n'
1599 'To https://chromium.googlesource.com/yyy/zzz\n'
1600 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001601 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001602 if squash:
1603 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001604 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001605 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001606 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001607 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001608 ((['git', 'config', 'branch.master.gerritsquashhash',
1609 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001610 ]
tandrii88189772016-09-29 04:29:57 -07001611 calls += [
1612 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001613 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001614 123456 if squash else None, sorted(reviewers),
1615 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001616 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001617 if tbr:
1618 calls += [
1619 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001620 123456 if squash else None, 'Self-approving for TBR',
1621 {'Code-Review': 1}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001622 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001623 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001624 return calls
1625
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001626 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001627 self,
1628 upload_args,
1629 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001630 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001631 squash=True,
1632 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001633 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001634 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001635 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001636 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001637 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001638 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001639 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001640 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001641 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001642 custom_cl_base=None,
1643 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001644 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001645 if squash_mode is None:
1646 if '--no-squash' in upload_args:
1647 squash_mode = 'nosquash'
1648 elif '--squash' in upload_args:
1649 squash_mode = 'squash'
1650 else:
1651 squash_mode = 'default'
1652
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001653 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001654 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001655 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001656 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001657 CookiesAuthenticatorMockFactory(
1658 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001659 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1660 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001661 self.mock(git_cl.gclient_utils, 'RunEditor',
1662 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001663 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1664 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001665
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001666 original_os_path_isdir = os.path.isdir
1667 def selective_os_path_isdir_mock(path):
1668 if path == '/cache/this-dir-exists':
1669 return self._mocked_call('os.path.isdir', path)
1670 return original_os_path_isdir(path)
1671 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1672
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001673 self.calls = self._gerrit_base_calls(
1674 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001675 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001676 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001677 other_cl_owner=other_cl_owner,
1678 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001679 if fetched_status != 'ABANDONED':
1680 self.calls += self._gerrit_upload_calls(
1681 description, reviewers, squash,
1682 squash_mode=squash_mode,
1683 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001684 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001685 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001686 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001687 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001688 # Uncomment when debugging.
1689 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001690 git_cl.main(['upload'] + upload_args)
1691
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001692 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001693 self._run_gerrit_upload_test(
1694 ['--no-squash'],
1695 'desc\n\nBUG=\n',
1696 [],
1697 squash=False,
1698 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1699
1700 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001701 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001702 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001703 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001704 [],
tandriia60502f2016-06-20 02:01:53 -07001705 squash=False,
1706 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001707 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001708
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001709 def test_gerrit_no_reviewer(self):
1710 self._run_gerrit_upload_test(
1711 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001712 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001713 [],
1714 squash=False,
1715 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001716
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001717 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001718 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1719 self._run_gerrit_upload_test(
1720 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1721 'desc\n\nBUG=\n\nChange-Id: I123456789',
1722 squash=False,
1723 squash_mode='override_nosquash',
1724 title='Dont_put_bad_chars')
1725 self.assertIn(
1726 'WARNING: Patchset title may only contain alphanumeric chars '
1727 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1728 'Cleaned up title: Dont put bad chars\n',
1729 git_cl.sys.stdout.getvalue())
1730
ukai@chromium.orge8077812012-02-03 03:41:46 +00001731 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001732 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001733 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001734 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001735 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001736 squash=False,
1737 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001738 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001739
1740 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001741 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001742 [],
bradnelsond975b302016-10-23 12:20:23 -07001743 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1744 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001745 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001746 ['reviewer@example.com', 'another@example.com'],
1747 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001748 squash_mode='override_nosquash',
Aaron Gablefd238082017-06-07 13:42:34 -07001749 cc=['more@example.com', 'people@example.com'],
1750 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001751
1752 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001753 self._run_gerrit_upload_test(
1754 [],
1755 'desc\nBUG=\n\nChange-Id: 123456789',
1756 [],
1757 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001758
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001759 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001760 self._run_gerrit_upload_test(
1761 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001762 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001763 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001764 squash=True,
1765 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001766
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001767 def test_gerrit_upload_squash_first_against_rev(self):
1768 custom_cl_base = 'custom_cl_base_rev_or_branch'
1769 self._run_gerrit_upload_test(
1770 ['--squash', custom_cl_base],
1771 'desc\nBUG=\n\nChange-Id: 123456789',
1772 [],
1773 squash=True,
1774 expected_upstream_ref='origin/master',
1775 custom_cl_base=custom_cl_base)
1776 self.assertIn(
1777 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1778 sys.stdout.getvalue())
1779
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001780 def test_gerrit_upload_squash_first_with_mirror(self):
1781 self._run_gerrit_upload_test(
1782 ['--squash'],
1783 'desc\nBUG=\n\nChange-Id: 123456789',
1784 [],
1785 squash=True,
1786 expected_upstream_ref='origin/master',
1787 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1788
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001789 def test_gerrit_upload_squash_reupload(self):
1790 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001791 self._run_gerrit_upload_test(
1792 ['--squash'],
1793 description,
1794 [],
1795 squash=True,
1796 expected_upstream_ref='origin/master',
1797 issue=123456)
1798
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001799 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1800 self.mock(git_cl, 'DieWithError',
1801 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1802 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1803 with self.assertRaises(SystemExitMock):
1804 self._run_gerrit_upload_test(
1805 ['--squash'],
1806 description,
1807 [],
1808 squash=True,
1809 expected_upstream_ref='origin/master',
1810 issue=123456,
1811 fetched_status='ABANDONED')
1812
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001813 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1814 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1815 lambda *_, **__: {'email': 'yet-another@example.com'})
1816 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1817 self._run_gerrit_upload_test(
1818 ['--squash'],
1819 description,
1820 [],
1821 squash=True,
1822 expected_upstream_ref='origin/master',
1823 issue=123456,
1824 other_cl_owner='other@example.com')
1825 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001826 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001827 'authenticate to Gerrit as yet-another@example.com.\n'
1828 'Uploading may fail due to lack of permissions',
1829 git_cl.sys.stdout.getvalue())
1830
rmistry@google.com2dd99862015-06-22 12:22:18 +00001831 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001832 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001833 def mock_run_git(*args, **_kwargs):
1834 if args[0] == ['for-each-ref',
1835 '--format=%(refname:short) %(upstream:short)',
1836 'refs/heads']:
1837 # Create a local branch dependency tree that looks like this:
1838 # test1 -> test2 -> test3 -> test4 -> test5
1839 # -> test3.1
1840 # test6 -> test0
1841 branch_deps = [
1842 'test2 test1', # test1 -> test2
1843 'test3 test2', # test2 -> test3
1844 'test3.1 test2', # test2 -> test3.1
1845 'test4 test3', # test3 -> test4
1846 'test5 test4', # test4 -> test5
1847 'test6 test0', # test0 -> test6
1848 'test7', # test7
1849 ]
1850 return '\n'.join(branch_deps)
1851 self.mock(git_cl, 'RunGit', mock_run_git)
1852
1853 class RecordCalls:
1854 times_called = 0
1855 record_calls = RecordCalls()
1856 def mock_CMDupload(*args, **_kwargs):
1857 record_calls.times_called += 1
1858 return 0
1859 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1860
1861 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001862 (('ask_for_data', 'This command will checkout all dependent branches '
1863 'and run "git cl upload". Press Enter to continue, '
1864 'or Ctrl+C to abort'), ''),
1865 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001866
1867 class MockChangelist():
1868 def __init__(self):
1869 pass
1870 def GetBranch(self):
1871 return 'test1'
1872 def GetIssue(self):
1873 return '123'
1874 def GetPatchset(self):
1875 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001876 def IsGerrit(self):
1877 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001878
1879 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1880 # CMDupload should have been called 5 times because of 5 dependent branches.
1881 self.assertEquals(5, record_calls.times_called)
1882 self.assertEquals(0, ret)
1883
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001884 def test_gerrit_change_id(self):
1885 self.calls = [
1886 ((['git', 'write-tree'], ),
1887 'hashtree'),
1888 ((['git', 'rev-parse', 'HEAD~0'], ),
1889 'branch-parent'),
1890 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1891 'A B <a@b.org> 1456848326 +0100'),
1892 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1893 'C D <c@d.org> 1456858326 +0100'),
1894 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1895 'hashchange'),
1896 ]
1897 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1898 self.assertEqual(change_id, 'Ihashchange')
1899
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001900 def test_desecription_append_footer(self):
1901 for init_desc, footer_line, expected_desc in [
1902 # Use unique desc first lines for easy test failure identification.
1903 ('foo', 'R=one', 'foo\n\nR=one'),
1904 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1905 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1906 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1907 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1908 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1909 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1910 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1911 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1912 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1913 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1914 ]:
1915 desc = git_cl.ChangeDescription(init_desc)
1916 desc.append_footer(footer_line)
1917 self.assertEqual(desc.description, expected_desc)
1918
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001919 def test_update_reviewers(self):
1920 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001921 ('foo', [], [],
1922 'foo'),
1923 ('foo\nR=xx', [], [],
1924 'foo\nR=xx'),
1925 ('foo\nTBR=xx', [], [],
1926 'foo\nTBR=xx'),
1927 ('foo', ['a@c'], [],
1928 'foo\n\nR=a@c'),
1929 ('foo\nR=xx', ['a@c'], [],
1930 'foo\n\nR=a@c, xx'),
1931 ('foo\nTBR=xx', ['a@c'], [],
1932 'foo\n\nR=a@c\nTBR=xx'),
1933 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1934 'foo\n\nR=a@c, yy\nTBR=xx'),
1935 ('foo\nBUG=', ['a@c'], [],
1936 'foo\nBUG=\nR=a@c'),
1937 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1938 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1939 ('foo', ['a@c', 'b@c'], [],
1940 'foo\n\nR=a@c, b@c'),
1941 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1942 'foo\nBar\n\nR=c@c\nBUG='),
1943 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1944 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001945 # Same as the line before, but full of whitespaces.
1946 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001947 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001948 'foo\nBar\n\nR=c@c\n BUG =',
1949 ),
1950 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001951 ('foo BUG=allo R=joe ', ['c@c'], [],
1952 'foo BUG=allo R=joe\n\nR=c@c'),
1953 # Redundant TBRs get promoted to Rs
1954 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1955 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001956 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001957 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001958 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001959 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001960 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001961 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001962 actual.append(obj.description)
1963 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001964
wittman@chromium.org455dc922015-01-26 20:15:50 +00001965 def test_get_target_ref(self):
1966 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001967 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001968 self.assertEqual(None, git_cl.GetTargetRef(None,
1969 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001970 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001971
wittman@chromium.org455dc922015-01-26 20:15:50 +00001972 # Check default target refs for branches.
1973 self.assertEqual('refs/heads/master',
1974 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001975 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001976 self.assertEqual('refs/heads/master',
1977 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001978 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001979 self.assertEqual('refs/heads/master',
1980 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001981 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001982 self.assertEqual('refs/branch-heads/123',
1983 git_cl.GetTargetRef('origin',
1984 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001985 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001986 self.assertEqual('refs/diff/test',
1987 git_cl.GetTargetRef('origin',
1988 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001989 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001990 self.assertEqual('refs/heads/chrome/m42',
1991 git_cl.GetTargetRef('origin',
1992 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001993 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001994
1995 # Check target refs for user-specified target branch.
1996 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1997 'refs/remotes/branch-heads/123'):
1998 self.assertEqual('refs/branch-heads/123',
1999 git_cl.GetTargetRef('origin',
2000 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002001 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002002 for branch in ('origin/master', 'remotes/origin/master',
2003 'refs/remotes/origin/master'):
2004 self.assertEqual('refs/heads/master',
2005 git_cl.GetTargetRef('origin',
2006 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002007 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002008 for branch in ('master', 'heads/master', 'refs/heads/master'):
2009 self.assertEqual('refs/heads/master',
2010 git_cl.GetTargetRef('origin',
2011 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002012 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002013
wychen@chromium.orga872e752015-04-28 23:42:18 +00002014 def test_patch_when_dirty(self):
2015 # Patch when local tree is dirty
2016 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2017 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
2018
2019 def test_diff_when_dirty(self):
2020 # Do 'git cl diff' when local tree is dirty
2021 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2022 self.assertNotEqual(git_cl.main(['diff']), 0)
2023
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002024 @staticmethod
2025 def _get_gerrit_codereview_server_calls(branch, value=None,
2026 git_short_host='host',
2027 detect_branch=True):
2028 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
2029
2030 If value is given, branch.<BRANCH>.gerritcodereview is already set.
2031 """
2032 calls = []
2033 if detect_branch:
2034 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
2035 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2036 CERR1 if value is None else value))
2037 if value is None:
2038 calls += [
2039 ((['git', 'config', 'branch.' + branch + '.merge'],),
2040 'refs/heads' + branch),
2041 ((['git', 'config', 'branch.' + branch + '.remote'],),
2042 'origin'),
2043 ((['git', 'config', 'remote.origin.url'],),
2044 'https://%s.googlesource.com/my/repo' % git_short_host),
2045 ]
2046 return calls
2047
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002048 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002049 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002050 detect_gerrit_server=True,
2051 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002052 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002053 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2054 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002055 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002056 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002057 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2058
tandriidf09a462016-08-18 16:23:55 -07002059 if new_branch:
2060 self.calls = [((['git', 'new-branch', 'master'],), ''),]
2061 else:
2062 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002063
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002064 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002065 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002066 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002067 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002068 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2069 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2070 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2071 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002072 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002073 if default_codereview == 'gerrit':
2074 if not force_codereview:
2075 self.calls += [
2076 ((['git', 'config', 'gerrit.host'],), 'true'),
2077 ]
2078 if detect_gerrit_server:
2079 self.calls += self._get_gerrit_codereview_server_calls(
2080 'master', git_short_host=git_short_host,
2081 detect_branch=not new_branch and force_codereview)
2082 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002083
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002084 elif default_codereview == 'rietveld':
2085 self.calls += [
2086 ((['git', 'config', 'gerrit.host'],), CERR1),
2087 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2088 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2089 ]
2090 actual_codereview = 'rietveld'
2091
2092 if actual_codereview == 'rietveld':
2093 self.calls += [
2094 ((['git', 'rev-parse', '--show-cdup'],), ''),
2095 ]
2096 if not default_codereview:
2097 self.calls += [
2098 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2099 ]
2100 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002101 self.calls += [
2102 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002103 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002104 {
2105 'current_revision': '7777777777',
2106 'revisions': {
2107 '1111111111': {
2108 '_number': 1,
2109 'fetch': {'http': {
2110 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2111 'ref': 'refs/changes/56/123456/1',
2112 }},
2113 },
2114 '7777777777': {
2115 '_number': 7,
2116 'fetch': {'http': {
2117 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2118 'ref': 'refs/changes/56/123456/7',
2119 }},
2120 },
2121 },
2122 }),
2123 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002124
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002125 def _common_patch_rietveld_successful(self, **kwargs):
2126 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002127 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002128 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002129 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002130 ((['git', 'config', 'branch.master.rietveldserver',
2131 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002132 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002133 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002134 ((['git', 'commit', '-m',
2135 'Description\n\n' +
2136 'patch from issue 123456 at patchset 60001 ' +
2137 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002138 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002139
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002140 def test_patch_rietveld_default(self):
2141 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002142 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2143
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002144 def test_patch_rietveld_successful_new_branch(self):
2145 self._common_patch_rietveld_successful(default_codereview='rietveld',
2146 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002147 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2148
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002149 def test_patch_rietveld_guess_by_url(self):
2150 self._common_patch_rietveld_successful(
2151 default_codereview=None, # It doesn't matter.
2152 actual_codereview='rietveld')
2153 self.assertEqual(git_cl.main(
2154 ['patch', 'https://codereview.example.com/123456']), 0)
2155
2156 def test_patch_rietveld_conflict(self):
2157 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002158 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002159 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002160
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002161 def test_patch_gerrit_default(self):
2162 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002163 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002164 self.calls += [
2165 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2166 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002167 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002168 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002169 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002170 ((['git', 'config', 'branch.master.gerritserver',
2171 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002172 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002173 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2174 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2175 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002176 ]
2177 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2178
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002179 def test_patch_gerrit_force(self):
2180 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002181 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002182 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002183 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002184 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002185 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002186 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002187 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002188 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002189 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002190 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002191 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2192 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2193 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002194 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002195 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002196
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002197 def test_patch_gerrit_guess_by_url(self):
2198 self._patch_common(
2199 default_codereview=None, # It doesn't matter what's default.
2200 actual_codereview='gerrit',
2201 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002202 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002203 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002204 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002205 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002206 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002207 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002208 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002209 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002210 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002211 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002212 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2213 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2214 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002215 ]
2216 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002217 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002218
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002219 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2220 self._patch_common(
2221 default_codereview=None, # It doesn't matter what's default.
2222 actual_codereview='gerrit',
2223 git_short_host='else', detect_gerrit_server=False)
2224 self.calls += [
2225 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2226 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002227 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002228 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2229 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2230 ''),
2231 ((['git', 'config', 'branch.master.gerritserver',
2232 'https://else-review.googlesource.com'],), ''),
2233 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002234 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2235 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2236 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002237 ]
2238 self.assertEqual(git_cl.main(
2239 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2240
2241 def test_patch_gerrit_conflict(self):
2242 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002243 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002244 self.calls += [
2245 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002246 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002247 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2248 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2249 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002250 ]
2251 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002252 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002253
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002254 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002255 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002256 raise git_cl.gerrit_util.GerritError(404, '')
2257 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2258
tandriic2405f52016-10-10 08:13:15 -07002259 self.calls = [
2260 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2261 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2262 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2263 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2264 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2265 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002266 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2267 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2268 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2269 ((['git', 'config', 'remote.origin.url'],),
2270 'https://chromium.googlesource.com/my/repo'),
2271 ((['DieWithError',
2272 'change 123456 at https://chromium-review.googlesource.com does not '
2273 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002274 ]
2275 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002276 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002277
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002278 def _checkout_calls(self):
2279 return [
2280 ((['git', 'config', '--local', '--get-regexp',
2281 'branch\\..*\\.rietveldissue'], ),
2282 ('branch.retrying.rietveldissue 1111111111\n'
2283 'branch.some-fix.rietveldissue 2222222222\n')),
2284 ((['git', 'config', '--local', '--get-regexp',
2285 'branch\\..*\\.gerritissue'], ),
2286 ('branch.ger-branch.gerritissue 123456\n'
2287 'branch.gbranch654.gerritissue 654321\n')),
2288 ]
2289
2290 def test_checkout_gerrit(self):
2291 """Tests git cl checkout <issue>."""
2292 self.calls = self._checkout_calls()
2293 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2294 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2295
2296 def test_checkout_rietveld(self):
2297 """Tests git cl checkout <issue>."""
2298 self.calls = self._checkout_calls()
2299 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2300 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2301
2302 def test_checkout_not_found(self):
2303 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002304 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002305 self.calls = self._checkout_calls()
2306 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2307
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002308 def test_checkout_no_branch_issues(self):
2309 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002310 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002311 self.calls = [
2312 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002313 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002314 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002315 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002316 ]
2317 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2318
tandrii@chromium.org28253532016-04-14 13:46:56 +00002319 def _test_gerrit_ensure_authenticated_common(self, auth,
2320 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002321 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2322 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2323 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002324 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002325 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002326 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002327 cl.branch = 'master'
2328 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002329 cl.lookedup_issue = True
2330 return cl
2331
2332 def test_gerrit_ensure_authenticated_missing(self):
2333 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002334 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002335 })
2336 self.calls.append(
2337 ((['DieWithError',
2338 'Credentials for the following hosts are required:\n'
2339 ' chromium-review.googlesource.com\n'
2340 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002341 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002342 'https://chromium-review.googlesource.com/new-password'],), ''),)
2343 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2344
2345 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002346 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002347 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002348 'chromium.googlesource.com':
2349 ('git-one.example.com', None, 'secret1'),
2350 'chromium-review.googlesource.com':
2351 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002352 })
2353 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002354 (('ask_for_data', 'If you know what you are doing '
2355 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002356 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2357
2358 def test_gerrit_ensure_authenticated_ok(self):
2359 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002360 'chromium.googlesource.com':
2361 ('git-same.example.com', None, 'secret'),
2362 'chromium-review.googlesource.com':
2363 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002364 })
2365 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2366
tandrii@chromium.org28253532016-04-14 13:46:56 +00002367 def test_gerrit_ensure_authenticated_skipped(self):
2368 cl = self._test_gerrit_ensure_authenticated_common(
2369 auth={}, skip_auth_check=True)
2370 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2371
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002372 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002373 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2374 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002375 self.calls = [
2376 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002377 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002378 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2379 ((['git', 'config', 'rietveld.server'],), ''),
2380 ((['git', 'config', 'rietveld.server'],), ''),
2381 ((['git', 'config', 'branch.feature.rietveldserver'],),
2382 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002383 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002384 ]
2385 self.assertEqual(0, git_cl.main(['set-commit']))
2386
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002387 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002388 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002389 lambda h, i, labels, notify=None:
2390 self._mocked_call(['SetReview', h, i, labels, notify]))
2391
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002392 self.calls = [
2393 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002394 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2395 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002396 ((['git', 'config', 'branch.feature.gerritserver'],),
2397 'https://chromium-review.googlesource.com'),
2398 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002399 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002400 ]
tandriid9e5ce52016-07-13 02:32:59 -07002401
2402 def test_cmd_set_commit_gerrit_clear(self):
2403 self._cmd_set_commit_gerrit_common(0)
2404 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2405
2406 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002407 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002408 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2409
tandriid9e5ce52016-07-13 02:32:59 -07002410 def test_cmd_set_commit_gerrit(self):
2411 self._cmd_set_commit_gerrit_common(2)
2412 self.assertEqual(0, git_cl.main(['set-commit']))
2413
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002414 def test_description_display(self):
2415 out = StringIO.StringIO()
2416 self.mock(git_cl.sys, 'stdout', out)
2417
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002418 self.mock(git_cl, 'Changelist', ChangelistMock)
2419 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002420
2421 self.assertEqual(0, git_cl.main(['description', '-d']))
2422 self.assertEqual('foo\n', out.getvalue())
2423
2424 def test_description_rietveld(self):
2425 out = StringIO.StringIO()
2426 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002427 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002428
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002429 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002430 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002431 self.assertEqual('foobar\n', out.getvalue())
2432
iannucci3c972b92016-08-17 13:24:10 -07002433 def test_StatusFieldOverrideIssueMissingArgs(self):
2434 out = StringIO.StringIO()
2435 self.mock(git_cl.sys, 'stderr', out)
2436
2437 try:
2438 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2439 except SystemExit as ex:
2440 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002441 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002442
2443 out = StringIO.StringIO()
2444 self.mock(git_cl.sys, 'stderr', out)
2445
2446 try:
2447 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2448 except SystemExit as ex:
2449 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002450 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002451
2452 def test_StatusFieldOverrideIssue(self):
2453 out = StringIO.StringIO()
2454 self.mock(git_cl.sys, 'stdout', out)
2455
2456 def assertIssue(cl_self, *_args):
2457 self.assertEquals(cl_self.issue, 1)
2458 return 'foobar'
2459
2460 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2461 self.calls = [
2462 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2463 ((['git', 'config', 'rietveld.server'],), ''),
2464 ((['git', 'config', 'rietveld.server'],), ''),
2465 ]
iannuccie53c9352016-08-17 14:40:40 -07002466 self.assertEqual(
2467 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2468 0)
iannucci3c972b92016-08-17 13:24:10 -07002469 self.assertEqual(out.getvalue(), 'foobar\n')
2470
iannuccie53c9352016-08-17 14:40:40 -07002471 def test_SetCloseOverrideIssue(self):
2472 def assertIssue(cl_self, *_args):
2473 self.assertEquals(cl_self.issue, 1)
2474 return 'foobar'
2475
2476 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2477 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2478 self.calls = [
2479 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2480 ((['git', 'config', 'rietveld.server'],), ''),
2481 ((['git', 'config', 'rietveld.server'],), ''),
2482 ]
2483 self.assertEqual(
2484 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2485
2486 def test_SetCommitOverrideIssue(self):
2487 def assertIssue(cl_self, *_args):
2488 self.assertEquals(cl_self.issue, 1)
2489 return 'foobar'
2490
2491 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2492 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2493 self.calls = [
2494 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2495 ((['git', 'config', 'rietveld.server'],), ''),
2496 ((['git', 'config', 'rietveld.server'],), ''),
2497 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2498 ((['git', 'config', 'rietveld.server'],), ''),
2499 ((['git', 'config', 'rietveld.server'],), ''),
2500 ]
2501 self.assertEqual(
2502 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2503
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002504 def test_description_gerrit(self):
2505 out = StringIO.StringIO()
2506 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002507 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002508 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002509 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2510 {
2511 'current_revision': 'sha1',
2512 'revisions': {'sha1': {
2513 'commit': {'message': 'foobar'},
2514 }},
2515 }),
2516 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002517 self.assertEqual(0, git_cl.main([
2518 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2519 self.assertEqual('foobar\n', out.getvalue())
2520
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002521 def test_description_set_raw(self):
2522 out = StringIO.StringIO()
2523 self.mock(git_cl.sys, 'stdout', out)
2524
2525 self.mock(git_cl, 'Changelist', ChangelistMock)
2526 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2527
2528 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2529 self.assertEqual('hihi', ChangelistMock.desc)
2530
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002531 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002532 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002533
2534 def RunEditor(desc, _, **kwargs):
2535 self.assertEquals(
2536 '# Enter a description of the change.\n'
2537 '# This will be displayed on the codereview site.\n'
2538 '# The first line will also be used as the subject of the review.\n'
2539 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002540 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002541 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002542 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002543 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002544 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002545
dsansomee2d6fd92016-09-08 00:10:47 -07002546 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002547 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002548
2549 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2550 self.mock(git_cl.Changelist, 'GetDescription',
2551 lambda *args: current_desc)
2552 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2553 UpdateDescriptionRemote)
2554 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2555
2556 self.calls = [
2557 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002558 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002559 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2560 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002561 ((['git', 'config', 'core.editor'],), 'vi'),
2562 ]
2563 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2564
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002565 def test_description_set_stdin(self):
2566 out = StringIO.StringIO()
2567 self.mock(git_cl.sys, 'stdout', out)
2568
2569 self.mock(git_cl, 'Changelist', ChangelistMock)
2570 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2571
2572 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2573 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2574
kmarshall3bff56b2016-06-06 18:31:47 -07002575 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002576 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2577
kmarshall3bff56b2016-06-06 18:31:47 -07002578 self.calls = \
2579 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2580 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002581 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002582 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2583 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002584 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2585 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2586 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002587 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2588 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2589 ((['git', 'branch', '-D', 'foo'],), '')]
2590
kmarshall3bff56b2016-06-06 18:31:47 -07002591 self.mock(git_cl, 'get_cl_statuses',
2592 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002593 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2594 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2595 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002596
2597 self.assertEqual(0, git_cl.main(['archive', '-f']))
2598
2599 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002600 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002601 self.calls = \
2602 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2603 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002604 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002605 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2606 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002607 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2608
kmarshall9249e012016-08-23 12:02:16 -07002609 self.mock(git_cl, 'get_cl_statuses',
2610 lambda branches, fine_grained, max_processes:
2611 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2612
2613 self.assertEqual(1, git_cl.main(['archive', '-f']))
2614
2615 def test_archive_dry_run(self):
2616 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2617
2618 self.calls = \
2619 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2620 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2621 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2622 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2623 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2624 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2625 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2626 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2627 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002628
2629 self.mock(git_cl, 'get_cl_statuses',
2630 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002631 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2632 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2633 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002634
kmarshall9249e012016-08-23 12:02:16 -07002635 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2636
2637 def test_archive_no_tags(self):
2638 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2639
2640 self.calls = \
2641 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2642 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2643 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2644 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2645 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2646 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2647 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2648 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2649 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2650 ((['git', 'branch', '-D', 'foo'],), '')]
2651
2652 self.mock(git_cl, 'get_cl_statuses',
2653 lambda branches, fine_grained, max_processes:
2654 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2655 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2656 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2657
2658 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002659
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002660 def test_cmd_issue_erase_existing(self):
2661 out = StringIO.StringIO()
2662 self.mock(git_cl.sys, 'stdout', out)
2663 self.calls = [
2664 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002665 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2666 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002667 # Let this command raise exception (retcode=1) - it should be ignored.
2668 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002669 CERR1),
2670 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2671 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002672 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2673 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2674 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002675 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002676 ]
2677 self.assertEqual(0, git_cl.main(['issue', '0']))
2678
Aaron Gable400e9892017-07-12 15:31:21 -07002679 def test_cmd_issue_erase_existing_with_change_id(self):
2680 out = StringIO.StringIO()
2681 self.mock(git_cl.sys, 'stdout', out)
2682 self.mock(git_cl.Changelist, 'GetDescription',
2683 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2684 self.calls = [
2685 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2686 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2687 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002688 # Let this command raise exception (retcode=1) - it should be ignored.
2689 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2690 CERR1),
2691 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2692 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2693 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2694 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2695 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002696 ((['git', 'log', '-1', '--format=%B'],),
2697 'This is a description\n\nChange-Id: Ideadbeef'),
2698 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002699 ]
2700 self.assertEqual(0, git_cl.main(['issue', '0']))
2701
phajdan.jre328cf92016-08-22 04:12:17 -07002702 def test_cmd_issue_json(self):
2703 out = StringIO.StringIO()
2704 self.mock(git_cl.sys, 'stdout', out)
2705 self.calls = [
2706 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002707 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002708 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2709 ((['git', 'config', 'rietveld.server'],),
2710 'https://codereview.chromium.org'),
2711 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2712 (('write_json', 'output.json',
2713 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2714 ''),
2715 ]
2716 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2717
tandriide281ae2016-10-12 06:02:30 -07002718 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002719 self.mock(git_cl.Changelist, 'GetChange',
2720 lambda _, *a: (
2721 self._mocked_call(['GetChange']+list(a))))
2722 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2723 lambda *_, **__: (
2724 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002725 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2726 lambda _, s: self._mocked_call(['SetCQState', s]))
2727 self.calls = [
2728 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002729 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002730 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2731 ((['git', 'config', 'rietveld.server'],),
2732 'https://codereview.chromium.org'),
2733 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2734 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2735 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2736 ((['get_or_create_merge_base', 'feature', 'feature'],),
2737 'fake_ancestor_sha'),
2738 ((['GetChange', 'fake_ancestor_sha', None], ),
2739 git_cl.presubmit_support.GitChange(
2740 '', '', '', '', '', '', '', '')),
2741 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2742 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002743 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2744 ]
2745 out = StringIO.StringIO()
2746 self.mock(git_cl.sys, 'stdout', out)
2747 self.assertEqual(0, git_cl.main(['try']))
2748 self.assertEqual(
2749 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002750 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002751
tandrii8c5a3532016-11-04 07:52:02 -07002752 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2753 self.mock(git_cl.Changelist, 'GetChange',
2754 lambda _, *a: (
2755 self._mocked_call(['GetChange']+list(a))))
2756 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2757 lambda *_, **__: (
2758 self._mocked_call(['DoGetTryMasters'])))
2759 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2760 lambda _, s: self._mocked_call(['SetCQState', s]))
2761
tandrii8c5a3532016-11-04 07:52:02 -07002762 self.calls = [
2763 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2764 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2765 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2766 ((['git', 'config', 'branch.feature.gerritserver'],),
2767 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002768 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2769 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2770 'project': 'depot_tools',
2771 'status': 'OPEN',
2772 'owner': {'email': 'owner@e.mail'},
2773 'revisions': {
2774 'deadbeaf': {
2775 '_number': 6,
2776 },
2777 'beeeeeef': {
2778 '_number': 7,
2779 'fetch': {'http': {
2780 'url': 'https://chromium.googlesource.com/depot_tools',
2781 'ref': 'refs/changes/56/123456/7'
2782 }},
2783 },
2784 },
2785 }),
tandrii8c5a3532016-11-04 07:52:02 -07002786 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2787 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2788 ((['get_or_create_merge_base', 'feature', 'feature'],),
2789 'fake_ancestor_sha'),
2790 ((['GetChange', 'fake_ancestor_sha', None], ),
2791 git_cl.presubmit_support.GitChange(
2792 '', '', '', '', '', '', '', '')),
2793 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2794 ((['DoGetTryMasters'], ), None),
2795 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2796 ]
2797 out = StringIO.StringIO()
2798 self.mock(git_cl.sys, 'stdout', out)
2799 self.assertEqual(0, git_cl.main(['try']))
2800 self.assertEqual(
2801 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002802 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002803 'https://chromium-review.googlesource.com/123456\n')
2804
2805 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2806 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2807 lambda _: {
2808 'owner_email': 'owner@e.mail',
2809 'private': False,
2810 'closed': False,
2811 'project': 'depot_tools',
2812 'patchsets': [20001],
2813 })
tandriide281ae2016-10-12 06:02:30 -07002814 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2815 self.calls = [
2816 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2817 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2818 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2819 ((['git', 'config', 'rietveld.server'],),
2820 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002821 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002822 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002823 ]
2824
2825 def _buildbucket_retry(*_, **kw):
2826 # self.maxDiff = 10000
2827 body = json.loads(kw['body'])
2828 self.assertEqual(len(body['builds']), 1)
2829 build = body['builds'][0]
2830 params = json.loads(build.pop('parameters_json'))
2831 self.assertEqual(params, {
2832 u'builder_name': u'win',
2833 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2834 u'revision': None}],
2835 u'properties': {
2836 u'category': u'git_cl_try',
2837 u'issue': 123,
2838 u'key': u'val',
2839 u'json': [{u'a': 1}, None],
2840 u'master': u'tryserver.chromium',
2841 u'patch_project': u'depot_tools',
2842 u'patch_storage': u'rietveld',
2843 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002844 u'rietveld': u'https://codereview.chromium.org',
2845 }
2846 })
2847 self.assertEqual(build, {
2848 u'bucket': u'master.tryserver.chromium',
2849 u'client_operation_id': u'uuid4',
2850 u'tags': [u'builder:win',
2851 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002852 u'user_agent:git_cl_try',
2853 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002854 })
2855
2856 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2857
2858 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2859 self.assertEqual(0, git_cl.main([
2860 'try', '-m', 'tryserver.chromium', '-b', 'win',
2861 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2862 self.assertRegexpMatches(
2863 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002864 'Tried jobs on:\nBucket: master.tryserver.chromium')
2865
tandrii8c5a3532016-11-04 07:52:02 -07002866 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2867 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2868 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2869
tandrii8c5a3532016-11-04 07:52:02 -07002870 self.calls = [
2871 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2872 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2873 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2874 ((['git', 'config', 'branch.feature.gerritserver'],),
2875 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002876 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002877 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002878 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002879 'status': 'OPEN',
2880 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002881 'revisions': {
2882 'deadbeaf': {
2883 '_number': 6,
2884 },
2885 'beeeeeef': {
2886 '_number': 7,
2887 'fetch': {'http': {
2888 'url': 'https://chromium.googlesource.com/depot_tools',
2889 'ref': 'refs/changes/56/123456/7'
2890 }},
2891 },
2892 },
2893 }),
2894 ]
2895
2896 def _buildbucket_retry(*_, **kw):
2897 # self.maxDiff = 10000
2898 body = json.loads(kw['body'])
2899 self.assertEqual(len(body['builds']), 1)
2900 build = body['builds'][0]
2901 params = json.loads(build.pop('parameters_json'))
2902 self.assertEqual(params, {
2903 u'builder_name': u'win',
2904 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2905 u'revision': None}],
2906 u'properties': {
2907 u'category': u'git_cl_try',
2908 u'key': u'val',
2909 u'json': [{u'a': 1}, None],
2910 u'master': u'tryserver.chromium',
2911
2912 u'patch_gerrit_url':
2913 u'https://chromium-review.googlesource.com',
2914 u'patch_issue': 123456,
2915 u'patch_project': u'depot_tools',
2916 u'patch_ref': u'refs/changes/56/123456/7',
2917 u'patch_repository_url':
2918 u'https://chromium.googlesource.com/depot_tools',
2919 u'patch_set': 7,
2920 u'patch_storage': u'gerrit',
2921 }
2922 })
2923 self.assertEqual(build, {
2924 u'bucket': u'master.tryserver.chromium',
2925 u'client_operation_id': u'uuid4',
2926 u'tags': [
2927 u'builder:win',
2928 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2929 u'user_agent:git_cl_try',
2930 u'master:tryserver.chromium'],
2931 })
2932
2933 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2934
2935 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2936 self.assertEqual(0, git_cl.main([
2937 'try', '-m', 'tryserver.chromium', '-b', 'win',
2938 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2939 self.assertRegexpMatches(
2940 git_cl.sys.stdout.getvalue(),
2941 'Tried jobs on:\nBucket: master.tryserver.chromium')
2942
borenet6c0efe62016-10-19 08:13:29 -07002943 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002944 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2945 lambda _: {
2946 'owner_email': 'owner@e.mail',
2947 'private': False,
2948 'closed': False,
2949 'project': 'depot_tools',
2950 'patchsets': [20001],
2951 })
borenet6c0efe62016-10-19 08:13:29 -07002952 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2953 self.calls = [
2954 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2955 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2956 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2957 ((['git', 'config', 'rietveld.server'],),
2958 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002959 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002960 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002961 ]
2962
2963 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002964 body = json.loads(kw['body'])
2965 self.assertEqual(len(body['builds']), 1)
2966 build = body['builds'][0]
2967 params = json.loads(build.pop('parameters_json'))
2968 self.assertEqual(params, {
2969 u'builder_name': u'win',
2970 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2971 u'revision': None}],
2972 u'properties': {
2973 u'category': u'git_cl_try',
2974 u'issue': 123,
2975 u'patch_project': u'depot_tools',
2976 u'patch_storage': u'rietveld',
2977 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002978 u'rietveld': u'https://codereview.chromium.org',
2979 }
2980 })
2981 self.assertEqual(build, {
2982 u'bucket': u'test.bucket',
2983 u'client_operation_id': u'uuid4',
2984 u'tags': [u'builder:win',
2985 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2986 u'user_agent:git_cl_try'],
2987 })
2988
2989 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2990
2991 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2992 self.assertEqual(0, git_cl.main([
2993 'try', '-B', 'test.bucket', '-b', 'win']))
2994 self.assertRegexpMatches(
2995 git_cl.sys.stdout.getvalue(),
2996 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002997
qyearsley123a4682016-10-26 09:12:17 -07002998 def test_git_cl_try_bots_on_multiple_masters(self):
2999 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
3000 self.calls = [
3001 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3002 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3003 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3004 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07003005 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07003006 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
3007 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3008 ]
3009
3010 def _buildbucket_retry(*_, **kw):
3011 body = json.loads(kw['body'])
3012 self.assertEqual(len(body['builds']), 2)
3013
3014 first_build_params = json.loads(body['builds'][0]['parameters_json'])
3015 self.assertEqual(first_build_params['builder_name'], 'builder1')
3016 self.assertEqual(first_build_params['properties']['master'], 'master1')
3017
3018 first_build_params = json.loads(body['builds'][1]['parameters_json'])
3019 self.assertEqual(first_build_params['builder_name'], 'builder2')
3020 self.assertEqual(first_build_params['properties']['master'], 'master2')
3021
3022 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3023
3024 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
3025 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
3026
3027 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3028 self.assertEqual(
3029 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
3030 self.assertEqual(
3031 git_cl.sys.stdout.getvalue(),
3032 'Tried jobs on:\n'
3033 'Bucket: master.master1\n'
3034 ' builder1: []\n'
3035 'Bucket: master.master2\n'
3036 ' builder2: []\n'
3037 'To see results here, run: git cl try-results\n'
3038 'To see results in browser, run: git cl web\n')
3039
tandrii16e0b4e2016-06-07 10:34:28 -07003040 def _common_GerritCommitMsgHookCheck(self):
3041 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3042 self.mock(git_cl.os.path, 'abspath',
3043 lambda path: self._mocked_call(['abspath', path]))
3044 self.mock(git_cl.os.path, 'exists',
3045 lambda path: self._mocked_call(['exists', path]))
3046 self.mock(git_cl.gclient_utils, 'FileRead',
3047 lambda path: self._mocked_call(['FileRead', path]))
3048 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3049 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3050 self.calls = [
3051 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3052 ((['abspath', '../'],), '/abs/git_repo_root'),
3053 ]
3054 return git_cl.Changelist(codereview='gerrit', issue=123)
3055
3056 def test_GerritCommitMsgHookCheck_custom_hook(self):
3057 cl = self._common_GerritCommitMsgHookCheck()
3058 self.calls += [
3059 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3060 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3061 '#!/bin/sh\necho "custom hook"')
3062 ]
3063 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3064
3065 def test_GerritCommitMsgHookCheck_not_exists(self):
3066 cl = self._common_GerritCommitMsgHookCheck()
3067 self.calls += [
3068 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3069 ]
3070 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3071
3072 def test_GerritCommitMsgHookCheck(self):
3073 cl = self._common_GerritCommitMsgHookCheck()
3074 self.calls += [
3075 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3076 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3077 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003078 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003079 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3080 ''),
3081 ]
3082 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3083
tandriic4344b52016-08-29 06:04:54 -07003084 def test_GerritCmdLand(self):
3085 self.calls += [
3086 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3087 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3088 'deadbeaf'),
3089 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3090 ((['git', 'config', 'branch.feature.gerritserver'],),
3091 'chromium-review.googlesource.com'),
3092 ]
3093 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3094 cl._codereview_impl._GetChangeDetail = lambda _: {
3095 'labels': {},
3096 'current_revision': 'deadbeaf',
3097 }
agable32978d92016-11-01 12:55:02 -07003098 cl._codereview_impl._GetChangeCommit = lambda: {
3099 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003100 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003101 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3102 }
tandriic4344b52016-08-29 06:04:54 -07003103 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003104 out = StringIO.StringIO()
3105 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003106 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003107 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003108 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003109
tandrii221ab252016-10-06 08:12:04 -07003110 BUILDBUCKET_BUILDS_MAP = {
3111 '9000': {
3112 'id': '9000',
3113 'status': 'STARTED',
3114 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3115 'result_details_json': '{"properties": {}}',
3116 'bucket': 'master.x.y',
3117 'created_by': 'user:someone@chromium.org',
3118 'created_ts': '147200002222000',
3119 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3120 },
3121 '8000': {
3122 'id': '8000',
3123 'status': 'COMPLETED',
3124 'result': 'FAILURE',
3125 'failure_reason': 'BUILD_FAILURE',
3126 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3127 'result_details_json': '{"properties": {}}',
3128 'bucket': 'master.x.y',
3129 'created_by': 'user:someone@chromium.org',
3130 'created_ts': '147200001111000',
3131 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3132 },
3133 }
3134
3135 def test_write_try_results_json(self):
3136 expected_output = [
3137 {
3138 'buildbucket_id': '8000',
3139 'bucket': 'master.x.y',
3140 'builder_name': 'my-builder',
3141 'status': 'COMPLETED',
3142 'result': 'FAILURE',
3143 'failure_reason': 'BUILD_FAILURE',
3144 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3145 },
3146 {
3147 'buildbucket_id': '9000',
3148 'bucket': 'master.x.y',
3149 'builder_name': 'my-builder',
3150 'status': 'STARTED',
3151 'result': None,
3152 'failure_reason': None,
3153 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3154 }
3155 ]
3156 self.calls = [(('write_json', 'output.json', expected_output), '')]
3157 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3158
tandrii45b2a582016-10-11 03:14:16 -07003159 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003160 out = StringIO.StringIO()
3161 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003162 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3163 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003164 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3165 self._mocked_call(['get_authenticator_for_host', host]))
3166 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3167 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003168
3169 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3170 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003171 self.calls += [
3172 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3173 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3174 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3175 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3176 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3177 ((['git', 'config', 'branch.feature.rietveldserver'],),
3178 'codereview.example.com'),
3179 ((['get_authenticator_for_host', 'codereview.example.com'],),
3180 AuthenticatorMock()),
3181 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3182
3183 def test_fetch_try_jobs_none_rietveld(self):
3184 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003185 # Simulate that user isn't logged in.
3186 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003187 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003188 self.assertRegexpMatches(sys.stdout.getvalue(),
3189 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003190 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3191
3192 def test_fetch_try_jobs_some_rietveld(self):
3193 self._setup_fetch_try_jobs_rietveld({
3194 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3195 })
3196 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003197 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3198 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3199 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3200
3201 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3202 self._setup_fetch_try_jobs(most_recent_patchset=13)
3203 self.calls += [
3204 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3205 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3206 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003207 # TODO(tandrii): Uncomment the below if we decide to support checking
3208 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003209 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003210 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003211 ((['git', 'config', 'branch.feature.gerritserver'],),
3212 'https://x-review.googlesource.com'),
3213 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3214 AuthenticatorMock()),
3215 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3216
3217 def test_fetch_try_jobs_none_gerrit(self):
3218 self._setup_fetch_try_jobs_gerrit({})
3219 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003220 # TODO(tandrii): Uncomment the below if we decide to support checking
3221 # patchsets for Gerrit.
3222 # self.assertRegexpMatches(
3223 # sys.stdout.getvalue(),
3224 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003225 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3226
3227 def test_fetch_try_jobs_some_gerrit(self):
3228 self._setup_fetch_try_jobs_gerrit({
3229 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3230 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003231 # TODO(tandrii): Uncomment the below if we decide to support checking
3232 # patchsets for Gerrit.
3233 # self.calls.remove(
3234 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003235 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3236
3237 # ... and doesn't result in warning.
3238 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3239 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003240 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3241 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3242
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003243 def _mock_gerrit_changes_for_detail_cache(self):
3244 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003245
3246 def test_gerrit_change_detail_cache_normalize(self):
3247 self._mock_gerrit_changes_for_detail_cache()
3248 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003249 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003250 ]
3251 cl = git_cl.Changelist(codereview='gerrit')
3252 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3253 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3254 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3255 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3256
3257 def test_gerrit_change_detail_cache_simple(self):
3258 self._mock_gerrit_changes_for_detail_cache()
3259 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003260 (('GetChangeDetail', 'host', '1', []), 'a'),
3261 (('GetChangeDetail', 'host', '2', []), 'b'),
3262 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003263 ]
3264 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3265 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3266 self.assertEqual(cl._GetChangeDetail(), 'a')
3267 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003268 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003269 self.assertEqual(cl._GetChangeDetail(), 'a')
3270 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3271
3272 def test_gerrit_change_detail_cache_options(self):
3273 self._mock_gerrit_changes_for_detail_cache()
3274 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003275 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3276 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3277 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3278 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003279 ]
3280 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3281 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3282 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3283 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3284 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3285 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3286 self.assertEqual(cl._GetChangeDetail(), 'cab')
3287
3288 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3289 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3290 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3291 self.assertEqual(cl._GetChangeDetail(), 'cab')
3292
3293 # Finally, no_cache should invalidate all caches for given change.
3294 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3295 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3296
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003297 def test_gerrit_description_caching(self):
3298 def gen_detail(rev, desc):
3299 return {
3300 'current_revision': rev,
3301 'revisions': {rev: {'commit': {'message': desc}}}
3302 }
3303 self.calls = [
3304 (('GetChangeDetail', 'host', '1',
3305 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3306 gen_detail('rev1', 'desc1')),
3307 (('GetChangeDetail', 'host', '1',
3308 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3309 gen_detail('rev2', 'desc2')),
3310 ]
3311
3312 self._mock_gerrit_changes_for_detail_cache()
3313 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3314 self.assertEqual(cl.GetDescription(), 'desc1')
3315 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3316 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003317
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003318 def test_print_current_creds(self):
3319 class CookiesAuthenticatorMock(object):
3320 def __init__(self):
3321 self.gitcookies = {
3322 'host.googlesource.com': ('user', 'pass'),
3323 'host-review.googlesource.com': ('user', 'pass'),
3324 }
3325 self.netrc = self
3326 self.netrc.hosts = {
3327 'github.com': ('user2', None, 'pass2'),
3328 'host2.googlesource.com': ('user3', None, 'pass'),
3329 }
3330 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3331 CookiesAuthenticatorMock)
3332 self.mock(sys, 'stdout', StringIO.StringIO())
3333 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3334 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3335 ' Host\t User\t Which file',
3336 '============================\t=====\t===========',
3337 'host-review.googlesource.com\t user\t.gitcookies',
3338 ' host.googlesource.com\t user\t.gitcookies',
3339 ' host2.googlesource.com\tuser3\t .netrc',
3340 ])
3341 sys.stdout.buf = ''
3342 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3343 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3344 ' Host\tUser\t Which file',
3345 '============================\t====\t===========',
3346 'host-review.googlesource.com\tuser\t.gitcookies',
3347 ' host.googlesource.com\tuser\t.gitcookies',
3348 ])
3349
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003350 def _common_creds_check_mocks(self):
3351 def exists_mock(path):
3352 dirname = os.path.dirname(path)
3353 if dirname == os.path.expanduser('~'):
3354 dirname = '~'
3355 base = os.path.basename(path)
3356 if base in ('.netrc', '.gitcookies'):
3357 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3358 # git cl also checks for existence other files not relevant to this test.
3359 return None
3360 self.mock(os.path, 'exists', exists_mock)
3361 self.mock(sys, 'stdout', StringIO.StringIO())
3362
3363 def test_creds_check_gitcookies_not_configured(self):
3364 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003365 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003366 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003367 self.calls = [
3368 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3369 (('os.path.exists', '~/.netrc'), True),
3370 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3371 'or Ctrl+C to abort'), ''),
3372 ((['git', 'config', '--global', 'http.cookiefile',
3373 os.path.expanduser('~/.gitcookies')], ), ''),
3374 ]
3375 self.assertEqual(0, git_cl.main(['creds-check']))
3376 self.assertRegexpMatches(
3377 sys.stdout.getvalue(),
3378 '^You seem to be using outdated .netrc for git credentials:')
3379 self.assertRegexpMatches(
3380 sys.stdout.getvalue(),
3381 '\nConfigured git to use .gitcookies from')
3382
3383 def test_creds_check_gitcookies_configured_custom_broken(self):
3384 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003385 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003386 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003387 self.calls = [
3388 ((['git', 'config', '--global', 'http.cookiefile'],),
3389 '/custom/.gitcookies'),
3390 (('os.path.exists', '/custom/.gitcookies'), False),
3391 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3392 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3393 ((['git', 'config', '--global', 'http.cookiefile',
3394 os.path.expanduser('~/.gitcookies')], ), ''),
3395 ]
3396 self.assertEqual(0, git_cl.main(['creds-check']))
3397 self.assertRegexpMatches(
3398 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003399 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003400 self.assertRegexpMatches(
3401 sys.stdout.getvalue(),
3402 'However, your configured .gitcookies file is missing.')
3403
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003404 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003405 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003406 lambda _, message, publish: self._mocked_call(
3407 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003408 self.calls = [
3409 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3410 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003411 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003412 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003413 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3414 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003415
3416 def test_git_cl_comment_add_gerrit(self):
3417 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003418 lambda host, change, msg, ready:
3419 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003420 self.calls = [
3421 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3422 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3423 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3424 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3425 'origin/master'),
3426 ((['git', 'config', 'remote.origin.url'],),
3427 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003428 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3429 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003430 ]
3431 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3432 '-a', 'msg']))
3433
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003434 def test_git_cl_comments_fetch_rietveld(self):
3435 self.mock(sys, 'stdout', StringIO.StringIO())
3436 self.calls = [
3437 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3438 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3439 ] * 2
3440 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3441 'messages': [
3442 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3443 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3444 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3445 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3446 # Intentionally wrong order here.
3447 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3448 'disapproval': False, 'approval': False,
3449 'sender': 'owner@example.com'},
3450 ],
3451 'owner_email': 'owner@example.com',
3452 })
3453 expected_comments_summary = [
3454 git_cl._CommentSummary(
3455 message='lgtm',
3456 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3457 disapproval=False, approval=True, sender='r@example.com'),
3458 git_cl._CommentSummary(
3459 message='not lgtm',
3460 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3461 disapproval=True, approval=False, sender='r2@example.com'),
3462 # Note: same order as in whatever Rietveld returns.
3463 git_cl._CommentSummary(
3464 message='PTAL',
3465 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3466 disapproval=False, approval=False, sender='owner@example.com'),
3467 ]
3468 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3469 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3470
3471 with git_cl.gclient_utils.temporary_directory() as tempdir:
3472 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3473 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3474 '-j', out_file]))
3475 with open(out_file) as f:
3476 read = json.load(f)
3477 self.assertEqual(len(read), 3)
3478 self.assertEqual(read[0], {
3479 'date': '2000-03-13 20:49:34.515270',
3480 'message': 'PTAL',
3481 'approval': False,
3482 'disapproval': False,
3483 'sender': 'owner@example.com'})
3484 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3485 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3486
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003487 def test_git_cl_comments_fetch_gerrit(self):
3488 self.mock(sys, 'stdout', StringIO.StringIO())
3489 self.calls = [
3490 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3491 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3492 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3493 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3494 'origin/master'),
3495 ((['git', 'config', 'remote.origin.url'],),
3496 'https://chromium.googlesource.com/infra/infra'),
3497 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3498 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003499 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003500 'messages': [
3501 {
3502 u'_revision_number': 1,
3503 u'author': {
3504 u'_account_id': 1111084,
3505 u'email': u'commit-bot@chromium.org',
3506 u'name': u'Commit Bot'
3507 },
3508 u'date': u'2017-03-15 20:08:45.000000000',
3509 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3510 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3511 u'tag': u'autogenerated:cq:dry-run'
3512 },
3513 {
3514 u'_revision_number': 2,
3515 u'author': {
3516 u'_account_id': 11151243,
3517 u'email': u'owner@example.com',
3518 u'name': u'owner'
3519 },
3520 u'date': u'2017-03-16 20:00:41.000000000',
3521 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3522 u'message': u'PTAL',
3523 },
3524 {
3525 u'_revision_number': 2,
3526 u'author': {
3527 u'_account_id': 148512 ,
3528 u'email': u'reviewer@example.com',
3529 u'name': u'reviewer'
3530 },
3531 u'date': u'2017-03-17 05:19:37.500000000',
3532 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3533 u'message': u'Patch Set 2: Code-Review+1',
3534 },
3535 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003536 }),
3537 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3538 '/COMMIT_MSG': [
3539 {
3540 'author': {'email': u'reviewer@example.com'},
3541 'updated': u'2017-03-17 05:19:37.500000000',
3542 'patch_set': 2,
3543 'side': 'REVISION',
3544 'message': 'Please include a bug link',
3545 },
3546 ],
3547 'codereview.settings': [
3548 {
3549 'author': {'email': u'owner@example.com'},
3550 'updated': u'2017-03-16 20:00:41.000000000',
3551 'patch_set': 2,
3552 'side': 'PARENT',
3553 'line': 42,
3554 'message': 'I removed this because it is bad',
3555 },
3556 ]
3557 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003558 ] * 2
3559 expected_comments_summary = [
3560 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003561 message=(
3562 u'PTAL\n' +
3563 u'\n' +
3564 u'codereview.settings\n' +
3565 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3566 u'c/1/2/codereview.settings#b42\n' +
3567 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003568 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3569 disapproval=False, approval=False, sender=u'owner@example.com'),
3570 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003571 message=(
3572 u'Patch Set 2: Code-Review+1\n' +
3573 u'\n' +
3574 u'/COMMIT_MSG\n' +
3575 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3576 u'c/1/2//COMMIT_MSG#\n' +
3577 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003578 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3579 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3580 ]
3581 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3582 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3583
3584 with git_cl.gclient_utils.temporary_directory() as tempdir:
3585 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3586 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3587 '-j', out_file]))
3588 with open(out_file) as f:
3589 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003590 self.assertEqual(len(read), 2)
3591 self.assertEqual(read[0], {
3592 u'date': u'2017-03-16 20:00:41.000000',
3593 u'message': (
3594 u'PTAL\n' +
3595 u'\n' +
3596 u'codereview.settings\n' +
3597 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3598 u'c/1/2/codereview.settings#b42\n' +
3599 u' I removed this because it is bad\n'),
3600 u'approval': False,
3601 u'disapproval': False,
3602 u'sender': u'owner@example.com'})
3603 self.assertEqual(read[1], {
3604 u'date': u'2017-03-17 05:19:37.500000',
3605 u'message': (
3606 u'Patch Set 2: Code-Review+1\n' +
3607 u'\n' +
3608 u'/COMMIT_MSG\n' +
3609 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3610 u'c/1/2//COMMIT_MSG#\n' +
3611 u' Please include a bug link\n'),
3612 u'approval': False,
3613 u'disapproval': False,
3614 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003615
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003616
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003617if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003618 logging.basicConfig(
3619 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003620 unittest.main()