blob: c9e28f2834abfb926477127109c33e4e760e6893 [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
Aaron Gable9a03ae02017-11-03 11:31:07 -070015import tempfile
maruel@chromium.orgddd59412011-11-30 14:20:38 +000016import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000017import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000018
19sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
20
21from testing_support.auto_stub import TestCase
22
23import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000024import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000025import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000027
tandrii5d48c322016-08-18 16:19:37 -070028def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
29 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
30
31
32CERR1 = callError(1)
33
34
Aaron Gable9a03ae02017-11-03 11:31:07 -070035def MakeNamedTemporaryFileMock(expected_content):
36 class NamedTemporaryFileMock(object):
37 def __init__(self, *args, **kwargs):
38 self.name = '/tmp/named'
39 self.expected_content = expected_content
40
41 def __enter__(self):
42 return self
43
44 def __exit__(self, _type, _value, _tb):
45 pass
46
47 def write(self, content):
48 if self.expected_content:
49 assert content == self.expected_content
50
51 def close(self):
52 pass
53
54 return NamedTemporaryFileMock
55
56
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000057class ChangelistMock(object):
58 # A class variable so we can access it when we don't have access to the
59 # instance that's being set.
60 desc = ""
61 def __init__(self, **kwargs):
62 pass
63 def GetIssue(self):
64 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080065 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000066 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070067 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000068 ChangelistMock.desc = desc
69
tandrii5d48c322016-08-18 16:19:37 -070070
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000071class PresubmitMock(object):
72 def __init__(self, *args, **kwargs):
73 self.reviewers = []
74 @staticmethod
75 def should_continue():
76 return True
77
78
79class RietveldMock(object):
80 def __init__(self, *args, **kwargs):
81 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000082
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000083 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080084 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000085 return 'Issue: %d' % issue
86
maruel@chromium.org78936cb2013-04-11 00:17:52 +000087 @staticmethod
88 def get_issue_properties(_issue, _messages):
89 return {
90 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
91 'messages': [
92 {
93 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -070094 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +000095 'sender': 'john@chromium.org',
96 },
97 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010098 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000099 }
100
iannuccie53c9352016-08-17 14:40:40 -0700101 @staticmethod
102 def close_issue(_issue):
103 return 'Closed'
104
skobes6468b902016-10-24 08:45:10 -0700105 @staticmethod
106 def get_patch(issue, patchset):
107 return 'patch set from issue %s patchset %s' % (issue, patchset)
108
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100109 @staticmethod
110 def update_description(_issue, _description):
111 return 'Updated'
112
113 @staticmethod
114 def add_comment(_issue, _comment):
115 return 'Commented'
116
117
skobes6468b902016-10-24 08:45:10 -0700118class GitCheckoutMock(object):
119 def __init__(self, *args, **kwargs):
120 pass
121
122 @staticmethod
123 def reset():
124 GitCheckoutMock.conflict = False
125
126 def apply_patch(self, p):
127 if GitCheckoutMock.conflict:
128 raise Exception('failed')
129
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000130
131class WatchlistsMock(object):
132 def __init__(self, _):
133 pass
134 @staticmethod
135 def GetWatchersForPaths(_):
136 return ['joe@example.com']
137
138
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000139class CodereviewSettingsFileMock(object):
140 def __init__(self):
141 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800142 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000143 def read(self):
144 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000145 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000146
147
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000148class AuthenticatorMock(object):
149 def __init__(self, *_args):
150 pass
151 def has_cached_credentials(self):
152 return True
tandrii221ab252016-10-06 08:12:04 -0700153 def authorize(self, http):
154 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000155
156
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100157def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000158 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
159
160 Usage:
161 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100162 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000163
164 OR
165 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100166 CookiesAuthenticatorMockFactory(
167 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000168 """
169 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800170 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000171 # Intentionally not calling super() because it reads actual cookie files.
172 pass
173 @classmethod
174 def get_gitcookies_path(cls):
175 return '~/.gitcookies'
176 @classmethod
177 def get_netrc_path(cls):
178 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100179 def _get_auth_for_host(self, host):
180 if same_auth:
181 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000182 return (hosts_with_creds or {}).get(host)
183 return CookiesAuthenticatorMock
184
Aaron Gable9a03ae02017-11-03 11:31:07 -0700185
kmarshall9249e012016-08-23 12:02:16 -0700186class MockChangelistWithBranchAndIssue():
187 def __init__(self, branch, issue):
188 self.branch = branch
189 self.issue = issue
190 def GetBranch(self):
191 return self.branch
192 def GetIssue(self):
193 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000194
tandriic2405f52016-10-10 08:13:15 -0700195
196class SystemExitMock(Exception):
197 pass
198
199
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000200class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100201 def test_get_description(self):
202 cl = git_cl.Changelist(issue=1, codereview='rietveld',
203 codereview_host='host')
204 cl.description = 'x'
205 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800206 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100207 self.assertEquals(cl.GetDescription(), 'x')
208 self.assertEquals(cl.GetDescription(force=True), 'y')
209 self.assertEquals(cl.GetDescription(), 'y')
210
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700211 def test_description_footers(self):
212 cl = git_cl.Changelist(issue=1, codereview='gerrit',
213 codereview_host='host')
214 cl.description = '\n'.join([
215 'This is some message',
216 '',
217 'It has some lines',
218 'and, also',
219 '',
220 'Some: Really',
221 'Awesome: Footers',
222 ])
223 cl.has_description = True
224 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
225 msg, footers = cl.GetDescriptionFooters()
226 self.assertEquals(
227 msg, ['This is some message', '', 'It has some lines', 'and, also'])
228 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
229
230 msg.append('wut')
231 footers.append(('gnarly-dude', 'beans'))
232 cl.UpdateDescriptionFooters(msg, footers)
233 self.assertEquals(cl.GetDescription().splitlines(), [
234 'This is some message',
235 '',
236 'It has some lines',
237 'and, also',
238 'wut'
239 '',
240 'Some: Really',
241 'Awesome: Footers',
242 'Gnarly-Dude: beans',
243 ])
244
tandriif9aefb72016-07-01 09:06:51 -0700245 def test_get_bug_line_values(self):
246 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
247 self.assertEqual(f('', ''), [])
248 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
249 self.assertEqual(f('v8', '456'), ['v8:456'])
250 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
251 # Not nice, but not worth carying.
252 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
253 ['v8:456', 'chromium:123', 'v8:123'])
254
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100255 def _test_git_number(self, parent_msg, dest_ref, child_msg,
256 parent_hash='parenthash'):
257 desc = git_cl.ChangeDescription(child_msg)
258 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
259 return desc.description
260
261 def assertEqualByLine(self, actual, expected):
262 self.assertEqual(actual.splitlines(), expected.splitlines())
263
264 def test_git_number_bad_parent(self):
265 with self.assertRaises(ValueError):
266 self._test_git_number('Parent', 'refs/heads/master', 'Child')
267
268 def test_git_number_bad_parent_footer(self):
269 with self.assertRaises(AssertionError):
270 self._test_git_number(
271 'Parent\n'
272 '\n'
273 'Cr-Commit-Position: wrong',
274 'refs/heads/master', 'Child')
275
276 def test_git_number_bad_lineage_ignored(self):
277 actual = self._test_git_number(
278 'Parent\n'
279 '\n'
280 'Cr-Commit-Position: refs/heads/master@{#1}\n'
281 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
282 'refs/heads/master', 'Child')
283 self.assertEqualByLine(
284 actual,
285 'Child\n'
286 '\n'
287 'Cr-Commit-Position: refs/heads/master@{#2}\n'
288 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
289
290 def test_git_number_same_branch(self):
291 actual = self._test_git_number(
292 'Parent\n'
293 '\n'
294 'Cr-Commit-Position: refs/heads/master@{#12}',
295 dest_ref='refs/heads/master',
296 child_msg='Child')
297 self.assertEqualByLine(
298 actual,
299 'Child\n'
300 '\n'
301 'Cr-Commit-Position: refs/heads/master@{#13}')
302
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200303 def test_git_number_same_branch_mixed_footers(self):
304 actual = self._test_git_number(
305 'Parent\n'
306 '\n'
307 'Cr-Commit-Position: refs/heads/master@{#12}',
308 dest_ref='refs/heads/master',
309 child_msg='Child\n'
310 '\n'
311 'Broken-by: design\n'
312 'BUG=123')
313 self.assertEqualByLine(
314 actual,
315 'Child\n'
316 '\n'
317 'Broken-by: design\n'
318 'BUG=123\n'
319 'Cr-Commit-Position: refs/heads/master@{#13}')
320
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100321 def test_git_number_same_branch_with_originals(self):
322 actual = self._test_git_number(
323 'Parent\n'
324 '\n'
325 'Cr-Commit-Position: refs/heads/master@{#12}',
326 dest_ref='refs/heads/master',
327 child_msg='Child\n'
328 '\n'
329 'Some users are smart and insert their own footers\n'
330 '\n'
331 'Cr-Whatever: value\n'
332 'Cr-Commit-Position: refs/copy/paste@{#22}')
333 self.assertEqualByLine(
334 actual,
335 'Child\n'
336 '\n'
337 'Some users are smart and insert their own footers\n'
338 '\n'
339 'Cr-Original-Whatever: value\n'
340 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
341 'Cr-Commit-Position: refs/heads/master@{#13}')
342
343 def test_git_number_new_branch(self):
344 actual = self._test_git_number(
345 'Parent\n'
346 '\n'
347 'Cr-Commit-Position: refs/heads/master@{#12}',
348 dest_ref='refs/heads/branch',
349 child_msg='Child')
350 self.assertEqualByLine(
351 actual,
352 'Child\n'
353 '\n'
354 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
355 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
356
357 def test_git_number_lineage(self):
358 actual = self._test_git_number(
359 'Parent\n'
360 '\n'
361 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
362 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
363 dest_ref='refs/heads/branch',
364 child_msg='Child')
365 self.assertEqualByLine(
366 actual,
367 'Child\n'
368 '\n'
369 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
370 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
371
372 def test_git_number_moooooooore_lineage(self):
373 actual = self._test_git_number(
374 'Parent\n'
375 '\n'
376 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
377 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
378 dest_ref='refs/heads/mooore',
379 child_msg='Child')
380 self.assertEqualByLine(
381 actual,
382 'Child\n'
383 '\n'
384 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
385 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
386 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
387
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100388 def test_git_number_ever_moooooooore_lineage(self):
389 self.maxDiff = 10000
390 actual = self._test_git_number(
391 'CQ commit on fresh new branch + numbering.\n'
392 '\n'
393 'NOTRY=True\n'
394 'NOPRESUBMIT=True\n'
395 'BUG=\n'
396 '\n'
397 'Review-Url: https://codereview.chromium.org/2577703003\n'
398 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
399 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
400 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
401 dest_ref='refs/heads/gnumb-test/cl',
402 child_msg='git cl on fresh new branch + numbering.\n'
403 '\n'
404 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
405 self.assertEqualByLine(
406 actual,
407 'git cl on fresh new branch + numbering.\n'
408 '\n'
409 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
410 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
411 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
412 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
413 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100414
415 def test_git_number_cherry_pick(self):
416 actual = self._test_git_number(
417 'Parent\n'
418 '\n'
419 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
420 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
421 dest_ref='refs/heads/branch',
422 child_msg='Child, which is cherry-pick from master\n'
423 '\n'
424 'Cr-Commit-Position: refs/heads/master@{#100}\n'
425 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
426 self.assertEqualByLine(
427 actual,
428 'Child, which is cherry-pick from master\n'
429 '\n'
430 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
431 '\n'
432 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
433 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
434 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
435
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000436
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200437class TestParseIssueURL(unittest.TestCase):
438 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
439 codereview=None, fail=False):
440 self.assertIsNotNone(parsed)
441 if fail:
442 self.assertFalse(parsed.valid)
443 return
444 self.assertTrue(parsed.valid)
445 self.assertEqual(parsed.issue, issue)
446 self.assertEqual(parsed.patchset, patchset)
447 self.assertEqual(parsed.hostname, hostname)
448 self.assertEqual(parsed.codereview, codereview)
449
450 def _run_and_validate(self, func, url, *args, **kwargs):
451 result = func(urlparse.urlparse(url))
452 if kwargs.pop('fail', False):
453 self.assertIsNone(result)
454 return None
455 self._validate(result, *args, fail=False, **kwargs)
456
457 def test_rietveld(self):
458 def test(url, *args, **kwargs):
459 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
460 *args, codereview='rietveld', **kwargs)
461
462 test('http://codereview.chromium.org/123',
463 123, None, 'codereview.chromium.org')
464 test('https://codereview.chromium.org/123',
465 123, None, 'codereview.chromium.org')
466 test('https://codereview.chromium.org/123/',
467 123, None, 'codereview.chromium.org')
468 test('https://codereview.chromium.org/123/whatever',
469 123, None, 'codereview.chromium.org')
470 test('https://codereview.chromium.org/123/#ps20001',
471 123, 20001, 'codereview.chromium.org')
472 test('http://codereview.chromium.org/download/issue123_4.diff',
473 123, 4, 'codereview.chromium.org')
474 # This looks like bad Gerrit, but is actually valid Rietveld, too.
475 test('https://chrome-review.source.com/123/4/',
476 123, None, 'chrome-review.source.com')
477
478 test('https://codereview.chromium.org/deadbeaf', fail=True)
479 test('https://codereview.chromium.org/api/123', fail=True)
480 test('bad://codereview.chromium.org/123', fail=True)
481 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
482
483 def test_gerrit(self):
484 def test(url, issue=None, patchset=None, hostname=None, fail=None):
485 self._test_ParseIssueUrl(
486 git_cl._GerritChangelistImpl.ParseIssueURL,
487 url, issue, patchset, hostname, fail)
488 def test(url, *args, **kwargs):
489 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
490 *args, codereview='gerrit', **kwargs)
491
492 test('http://chrome-review.source.com/c/123',
493 123, None, 'chrome-review.source.com')
494 test('https://chrome-review.source.com/c/123/',
495 123, None, 'chrome-review.source.com')
496 test('https://chrome-review.source.com/c/123/4',
497 123, 4, 'chrome-review.source.com')
498 test('https://chrome-review.source.com/#/c/123/4',
499 123, 4, 'chrome-review.source.com')
500 test('https://chrome-review.source.com/c/123/4',
501 123, 4, 'chrome-review.source.com')
502 test('https://chrome-review.source.com/123',
503 123, None, 'chrome-review.source.com')
504 test('https://chrome-review.source.com/123/4',
505 123, 4, 'chrome-review.source.com')
506
507 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
508 test('https://chrome-review.source.com/c/abc/', fail=True)
509 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
510
511 def test_ParseIssueNumberArgument(self):
512 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200513 codereview_hint = kwargs.pop('hint', None)
514 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
515 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200516
517 test('123', 123)
518 test('', fail=True)
519 test('abc', fail=True)
520 test('123/1', fail=True)
521 test('123a', fail=True)
522 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
523 # Rietveld.
524 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200525 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200526 test('https://codereview.source.com/123',
527 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200528 # Matches both, but we take Gerrit if specifically requested.
529 test('https://codereview.source.com/123',
530 123, None, 'codereview.source.com', 'gerrit',
531 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200532 # Gerrrit.
533 test('https://chrome-review.source.com/c/123/4',
534 123, 4, 'chrome-review.source.com', 'gerrit')
535 test('https://chrome-review.source.com/bad/123/4', fail=True)
536
537
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100538class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100539 def setUp(self):
540 super(GitCookiesCheckerTest, self).setUp()
541 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100542 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100543
544 def mock_hosts_creds(self, subhost_identity_pairs):
545 def ensure_googlesource(h):
546 if not h.endswith(self.c._GOOGLESOURCE):
547 assert not h.endswith('.')
548 return h + '.' + self.c._GOOGLESOURCE
549 return h
550 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
551 for h, i in subhost_identity_pairs]
552
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200553 def test_identity_parsing(self):
554 self.assertEqual(self.c._parse_identity('ldap.google.com'),
555 ('ldap', 'google.com'))
556 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
557 ('ldap', 'example.com'))
558 # Specical case because we know there are no subdomains in chromium.org.
559 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
560 ('note.period', 'chromium.org'))
561 # Pathological: .period. can be either ldap OR domain, more likely domain.
562 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
563 ('note', 'period.example.com'))
564
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100565 def test_analysis_nothing(self):
566 self.c._all_hosts = []
567 self.assertFalse(self.c.has_generic_host())
568 self.assertEqual(set(), self.c.get_conflicting_hosts())
569 self.assertEqual(set(), self.c.get_duplicated_hosts())
570 self.assertEqual(set(), self.c.get_partially_configured_hosts())
571 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
572
573 def test_analysis(self):
574 self.mock_hosts_creds([
575 ('.googlesource.com', 'git-example.chromium.org'),
576
577 ('chromium', 'git-example.google.com'),
578 ('chromium-review', 'git-example.google.com'),
579 ('chrome-internal', 'git-example.chromium.org'),
580 ('chrome-internal-review', 'git-example.chromium.org'),
581 ('conflict', 'git-example.google.com'),
582 ('conflict-review', 'git-example.chromium.org'),
583 ('dup', 'git-example.google.com'),
584 ('dup', 'git-example.google.com'),
585 ('dup-review', 'git-example.google.com'),
586 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200587 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100588 ])
589 self.assertTrue(self.c.has_generic_host())
590 self.assertEqual(set(['conflict.googlesource.com']),
591 self.c.get_conflicting_hosts())
592 self.assertEqual(set(['dup.googlesource.com']),
593 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200594 self.assertEqual(set(['partial.googlesource.com',
595 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100596 self.c.get_partially_configured_hosts())
597 self.assertEqual(set(['chromium.googlesource.com',
598 'chrome-internal.googlesource.com']),
599 self.c.get_hosts_with_wrong_identities())
600
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100601 def test_report_no_problems(self):
602 self.test_analysis_nothing()
603 self.mock(sys, 'stdout', StringIO.StringIO())
604 self.assertFalse(self.c.find_and_report_problems())
605 self.assertEqual(sys.stdout.getvalue(), '')
606
607 def test_report(self):
608 self.test_analysis()
609 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200610 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
611 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100612 self.assertTrue(self.c.find_and_report_problems())
613 with open(os.path.join(os.path.dirname(__file__),
614 'git_cl_creds_check_report.txt')) as f:
615 expected = f.read()
616 def by_line(text):
617 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200618 self.maxDiff = 10000
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200619 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100620
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800621
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000622class TestGitCl(TestCase):
623 def setUp(self):
624 super(TestGitCl, self).setUp()
625 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700626 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000627 self.mock(subprocess2, 'call', self._mocked_call)
628 self.mock(subprocess2, 'check_call', self._mocked_call)
629 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700630 self.mock(subprocess2, 'communicate',
631 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000632 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000633 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000634 self.mock(git_common, 'get_or_create_merge_base',
635 lambda *a: (
636 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000637 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000638 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100639 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
640 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700641 self.mock(git_cl, 'write_json', lambda path, contents:
642 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000643 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000644 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000645 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700646 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
647 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000648 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000649 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000650 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100651 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
652 lambda *args, **kwargs: self._mocked_call(
653 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700654 self.mock(git_cl.gerrit_util, 'GetChangeComments',
655 lambda *args, **kwargs: self._mocked_call(
656 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100657 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700658 lambda h, i, reviewers, ccs, notify: self._mocked_call(
659 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700660 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700661 lambda h, i, msg=None, labels=None, notify=None:
662 self._mocked_call('SetReview', h, i, msg, labels, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000663 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
664 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700665 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100666 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000667 # It's important to reset settings to not have inter-tests interference.
668 git_cl.settings = None
669
670 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000671 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100672 self.assertEquals([], self.calls)
673 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000674 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100675 raise
676 # Sadly, has_failed() returns True if this OR any other tests before this
677 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200678 git_cl.logging.error(
679 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100680 'There are un-consumed self.calls after this test has finished.\n'
681 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700682 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200683 'If you are already running only this test, then **first** fix the '
684 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100685 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700686 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100687 'and follow instructions above.\n' +
688 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000689 finally:
690 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000691
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000692 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000693 self.assertTrue(
694 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700695 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000696 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000697 expected_args, result = top
698
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000699 # Also logs otherwise it could get caught in a try/finally and be hard to
700 # diagnose.
701 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700702 N = 5
703 prior_calls = '\n '.join(
704 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
705 for i, c in enumerate(self._calls_done[-N:]))
706 following_calls = '\n '.join(
707 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
708 for i, c in enumerate(self.calls[:N]))
709 extended_msg = (
710 'A few prior calls:\n %s\n\n'
711 'This (expected):\n @%d: %r\n'
712 'This (actual):\n @%d: %r\n\n'
713 'A few following expected calls:\n %s' %
714 (prior_calls, len(self._calls_done), expected_args,
715 len(self._calls_done), args, following_calls))
716 git_cl.logging.error(extended_msg)
717
tandrii99a72f22016-08-17 14:33:24 -0700718 self.fail('@%d\n'
719 ' Expected: %r\n'
720 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700721 len(self._calls_done), expected_args, args))
722
723 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700724 if isinstance(result, Exception):
725 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000726 return result
727
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100728 def test_ask_for_explicit_yes_true(self):
729 self.calls = [
730 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
731 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
732 ]
733 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
734
tandrii48df5812016-10-17 03:55:37 -0700735 def test_LoadCodereviewSettingsFromFile_gerrit(self):
736 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
737 self.calls = [
738 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
739 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
740 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
741 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
742 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
743 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700744 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
745 CERR1),
746 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700747 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
748 CERR1),
749 ((['git', 'config', 'gerrit.host', 'true'],), ''),
750 ]
751 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
752
maruel@chromium.orga3353652011-11-30 14:26:57 +0000753 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000754 def _is_gerrit_calls(cls, gerrit=False):
755 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
756 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
757
758 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000759 def _upload_calls(cls, similarity, find_copies, private):
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200760 return (cls._rietveld_git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000761 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000762
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000763 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200764 def _rietveld_upload_no_rev_calls(cls, similarity, find_copies):
765 return (cls._rietveld_git_base_calls(similarity, find_copies) + [
766 ((['git', 'config', 'core.editor'],), ''),
767 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000768
769 @classmethod
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200770 def _rietveld_git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000771 if similarity is None:
772 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700773 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700774 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000775 else:
tandrii33a46ff2016-08-23 05:53:40 -0700776 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700777 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000778
779 if find_copies is None:
780 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700781 find_copies_call = ((['git', 'config', '--bool',
782 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000783 else:
tandrii5d48c322016-08-18 16:19:37 -0700784 val = str(find_copies).lower()
785 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000786 'branch.master.git-find-copies', val],), '')
787
788 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000789 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800790 '-l100000', '-C'+similarity,
791 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000792 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000793 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000794 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000795
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000796 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000797 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000798 similarity_call,
799 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
800 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000801 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000802 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700803 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
804 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000805 ((['git', 'config', 'rietveld.server'],),
806 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000807 ((['git', 'config', 'branch.master.merge'],), 'master'),
808 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000809 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000810 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000811 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000812 ((['git', 'rev-parse', '--show-cdup'],), ''),
813 ((['git', 'rev-parse', 'HEAD'],), '12345'),
814 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000815 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000816 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700817 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000819 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000820 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000821 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000822 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000823 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000824 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000825 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700826 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000827 ]
828
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000829 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000830 def _git_upload_calls(cls, private):
831 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000832 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000833 private_call = []
834 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000835 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000836 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000837 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000838
maruel@chromium.orga3353652011-11-30 14:26:57 +0000839 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000840 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000841 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000842 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800843 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000844 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700845 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000846 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000847 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000848 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700849 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000850 ] + cls._git_post_upload_calls()
851
852 @classmethod
853 def _git_post_upload_calls(cls):
854 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000855 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
856 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
857 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000858 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000859 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000860 ]
861
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000862 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000863 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000864 fake_ancestor = 'fake_ancestor'
865 fake_cl = 'fake_cl_for_patch'
866 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000867 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000868 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000869 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000870 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000871 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000872 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000873 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000874 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700875 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000876 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000877 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000878 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000879 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000880 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000881 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000882 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000883 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000884 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000885 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000886 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000887
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000888 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700889 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000890 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000891 return [
892 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000893 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000894 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000895 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700896 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000897 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000898 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100899 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000900 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000901 ]
902
903 def _run_reviewer_test(
904 self,
905 upload_args,
906 expected_description,
907 returned_description,
908 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000909 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700910 private=False,
911 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000912 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000913 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000914 try:
915 similarity = upload_args[upload_args.index('--similarity')+1]
916 except ValueError:
917 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000918
919 if '--find-copies' in upload_args:
920 find_copies = True
921 elif '--no-find-copies' in upload_args:
922 find_copies = False
923 else:
924 find_copies = None
925
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000926 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700927 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000928
929 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000930
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000931 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000932 self.assertEquals(
933 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000934 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000935 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000936 '#--------------------This line is 72 characters long'
937 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000938 expected_description,
939 desc)
940 return returned_description
941 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000942
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000943 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000944 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700945 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000946 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000947 return 1, 2
948 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000949
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950 git_cl.main(['upload'] + upload_args)
951
952 def test_no_reviewer(self):
953 self._run_reviewer_test(
954 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000955 'desc\n\nBUG=',
956 '# Blah blah comment.\ndesc\n\nBUG=',
957 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000958 [])
959
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000960 def test_keep_similarity(self):
961 self._run_reviewer_test(
962 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000963 'desc\n\nBUG=',
964 '# Blah blah comment.\ndesc\n\nBUG=',
965 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000966 [])
967
iannucci@chromium.org79540052012-10-19 23:15:26 +0000968 def test_keep_find_copies(self):
969 self._run_reviewer_test(
970 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000971 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000972 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000973 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000974 [])
975
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000976 def test_private(self):
977 self._run_reviewer_test(
978 ['--private'],
979 'desc\n\nBUG=',
980 '# Blah blah comment.\ndesc\n\nBUG=\n',
981 'desc\n\nBUG=',
982 [])
983
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000984 def test_reviewers_cmd_line(self):
985 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000986 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000987 self._run_reviewer_test(
988 ['-r' 'foo@example.com'],
989 description,
990 '\n%s\n' % description,
991 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000992 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000993
994 def test_reviewer_tbr_overriden(self):
995 # Reviewer is overriden with TBR
996 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000997 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000998 self._run_reviewer_test(
999 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001000 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001001 description.strip('\n'),
1002 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001003 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001004
1005 def test_reviewer_multiple(self):
1006 # Handles multiple R= or TBR= lines.
1007 description = (
bradnelsond975b302016-10-23 12:20:23 -07001008 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1009 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001010 self._run_reviewer_test(
1011 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001012 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001013 description,
1014 description,
bradnelsond975b302016-10-23 12:20:23 -07001015 ['--reviewers=another@example.com,reviewer@example.com'],
1016 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001017
maruel@chromium.orga3353652011-11-30 14:26:57 +00001018 def test_reviewer_send_mail(self):
1019 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001020 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +00001021 self._run_reviewer_test(
1022 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001023 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +00001024 description.strip('\n'),
1025 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001026 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +00001027
1028 def test_reviewer_send_mail_no_rev(self):
1029 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +00001030 stdout = StringIO.StringIO()
Andrii Shyshkalov73827d12017-04-12 15:05:11 +02001031 self.calls = self._rietveld_upload_no_rev_calls(None, None) + [
tandriic2405f52016-10-10 08:13:15 -07001032 ((['DieWithError', 'Must specify reviewers to send email.'],),
1033 SystemExitMock())
1034 ]
1035
1036 def RunEditor(desc, _, **kwargs):
1037 return desc
1038 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
1039 self.mock(sys, 'stdout', stdout)
1040 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +00001041 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -07001042 self.assertEqual(
1043 '=====================================\n'
1044 'NOTICE: Rietveld is being deprecated. '
1045 'You can upload changes to Gerrit with\n'
1046 ' git cl upload --gerrit\n'
1047 'or set Gerrit to be your default code review tool with\n'
1048 ' git config gerrit.host true\n'
1049 '=====================================\n',
1050 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +00001051
tandriif9aefb72016-07-01 09:06:51 -07001052 def test_bug_on_cmd(self):
1053 self._run_reviewer_test(
1054 ['--bug=500658,proj:123'],
1055 'desc\n\nBUG=500658\nBUG=proj:123',
1056 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1057 'desc\n\nBUG=500658\nBUG=proj:1234',
1058 [])
1059
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001060 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1061 parent_msg=None,
1062 new_msg=None,
1063 fail_after_parent_msg=False,
1064 fail_cherry_pick=False,
1065 fail_push_count=0,
1066 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001067 if debug:
1068 # Very useful due to finally clause in git cl land raising exceptions and
1069 # shadowing real cause of failure.
1070 self.mock(git_cl, '_IS_BEING_TESTED', True)
1071 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001072 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001073
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001074 if git_numberer_enabled:
1075 # Special mocks to check validity of timestamp.
1076 original_git_amend_head = git_cl._git_amend_head
1077 def _git_amend_head_mock(msg, tstamp):
1078 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1079 return original_git_amend_head(msg, tstamp)
1080 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1081
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001082 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1083 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001084 self.mock(RietveldMock, 'update_description', staticmethod(
1085 lambda i, d: self._mocked_call(['update_description', i, d])))
1086 self.mock(RietveldMock, 'add_comment', staticmethod(
1087 lambda i, c: self._mocked_call(['add_comment', i, c])))
1088 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001089 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1090 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1091 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1092 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1093 CERR1),
1094 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1095 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001096 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001097 ((['git', 'config', 'rietveld.server'],),
1098 'https://codereview.chromium.org'),
1099 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1100 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1101 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1102 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001103 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1104 ''), # No commits to rebase, according to local view of origin.
1105 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1106 'fake_ancestor_sha'),
1107 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1108 ((['git', 'rev-parse', '--show-cdup'],), ''),
1109 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1110 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1111 'fake_ancestor_sha...', '.'],),
1112 'M\tfile1.cpp'),
1113 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1114 ((['git', 'config', 'branch.feature.rietveldserver'],),
1115 'https://codereview.chromium.org'),
1116 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1117 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1118 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1119 'fake_ancestor_sha', 'feature'],),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001120 # This command just prints something like this:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001121 # file1.cpp | 53 ++++++--
1122 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1123 ''),
1124 ((['git', 'show-ref', '--quiet', '--verify',
1125 'refs/heads/git-cl-commit'],),
1126 ''), # 0 return code means branch exists.
1127 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1128 ((['git', 'show-ref', '--quiet', '--verify',
1129 'refs/heads/git-cl-cherry-pick'],),
1130 CERR1), # This means git-cl-cherry-pick branch does not exist.
1131 ((['git', 'rev-parse', '--show-cdup'],), ''),
1132 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1133 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1134 ((['git', 'commit', '-m',
1135 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001136 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001137 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1138 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1139 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001140 repo_url),
1141
1142 ((['git', 'config', 'remote.origin.url'],), repo_url),
1143 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1144 git_numberer_enabled),
1145
1146 # Auto-rebase init.
1147 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1148 ]
1149 # Auto-rebase loops.
1150 for attempt in xrange(fail_push_count + 1):
1151 self.calls += [
1152 # Auto-rebase loop start.
1153 ((['git', 'retry', 'fetch', 'origin',
1154 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1155 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1156 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1157 # different in each loop iteration for truly realistic test.
1158 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1159 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1160 callError(1, 'failed to cherry pick') if fail_cherry_pick
1161 else ''),
1162 ]
1163 if fail_cherry_pick:
1164 return
1165
1166 if git_numberer_enabled:
1167 assert parent_msg
1168 self.calls += [
1169 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1170 parent_msg),
1171 ]
1172 if fail_after_parent_msg:
1173 return
1174 assert new_msg
1175 self.calls += [
1176 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1177 '1480022355'), # Committer's unix timestamp.
1178 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1179 '1480024000'),
1180 ((['git_amend_head committer timestamp', 1480024000],), ''),
1181 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1182 ]
1183 self.calls += [
1184 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1185 CERR1 if attempt < fail_push_count else ''),
1186 ]
1187 # End of autorebase + push.
1188
1189 self.calls += [
1190 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1191 ]
1192 if git_numberer_enabled:
1193 self.calls += [
1194 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1195 ]
1196
1197 # Cleanup calls.
1198 self.calls += [
1199 ((['git', 'checkout', '-q', 'feature'],), ''),
1200 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1201 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001202 ]
1203
1204 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001205 self._land_rietveld_calls(
1206 repo_url='https://chromium.googlesource.com/infra/infra',
1207 git_numberer_enabled=False,
1208 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001209 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001210 ((['git', 'config', 'rietveld.viewvc-url'],),
1211 'https://chromium.googlesource.com/infra/infra/+/'),
1212 ((['update_description', 123,
1213 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001214 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001215 ''),
1216 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001217 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001218 ]
1219 git_cl.main(['land'])
1220
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001221 def test_land_rietveld_fail_cherry_pick(self):
1222 self._land_rietveld_calls(
1223 repo_url='https://chromium.googlesource.com/infra/infra',
1224 git_numberer_enabled=False,
1225 fail_cherry_pick=True,
1226 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001227 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001228 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1229 'U path/file1\n'
1230 'U file2.cpp\n'),
1231 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001232 ((['git', 'checkout', '-q', 'feature'],), ''),
1233 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001234 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1235 ]
1236 git_cl.main(['land'])
1237
1238 def test_land_rietveld_git_numberer_fail_1_push(self):
1239 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1240
1241 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1242 self._land_rietveld_calls(
1243 repo_url='https://chromium.googlesource.com/chromium/src',
1244 git_numberer_enabled=True,
1245 parent_msg=('This is parent commit.\n'
1246 '\n'
1247 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1248 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1249 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1250 '\n'
1251 'Review-Url: https://codereview.chromium.org/123 .\n'
1252 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1253 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1254 fail_push_count=fail_push_count,
1255 debug=False)
1256
1257 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001258 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001259 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001260 ((['update_description', 123,
1261 'Issue: 123\n\nR=john@chromium.org\n'
1262 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001263 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001264 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1265 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1266 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001267 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001268 ''),
1269 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001270 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001271 ]
1272 git_cl.main(['land'])
1273
1274 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001275 self._land_rietveld_calls(
1276 repo_url='https://chromium.googlesource.com/v8/v8',
1277 git_numberer_enabled=True,
1278 parent_msg='This is parent commit with no footer.',
1279 fail_after_parent_msg=True,
1280 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001281 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001282 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001283 ((['git', 'checkout', '-q', 'feature'],), ''),
1284 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001285 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001286 ]
1287 with self.assertRaises(ValueError) as cm:
1288 git_cl.main(['land'])
1289 self.assertEqual(cm.exception.message,
1290 'Unable to infer commit position from footers')
1291
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001292 def test_git_numberer_not_whitelisted_repo(self):
1293 self.calls = []
1294 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001295 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1296 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001297 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001298
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001299 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001300 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1301 self.calls = [
1302 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001303 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001304 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001305 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001306 remote_url='https://chromium.googlesource.com/chromium/src',
1307 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001308 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001309
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001310 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001311 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001312 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001313 def fake_temporary_directory(**kwargs):
1314 yield tempdir
1315 self.mock(git_cl.gclient_utils, 'temporary_directory',
1316 fake_temporary_directory)
1317 self._test_GitNumbererState_valid_configs_inner(tempdir)
1318
1319 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001320 self.calls = [
1321 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001322 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001323 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1324 '''
1325 [plugin "git-numberer"]
1326 validate-enabled-refglob = refs/else/*
1327 validate-enabled-refglob = refs/heads/*
1328 validate-disabled-refglob = refs/heads/disabled
1329 validate-disabled-refglob = refs/branch-heads/*
1330 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001331 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1332 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001333 'refs/else/*\n'
1334 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001335 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1336 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001337 'refs/heads/disabled\n'
1338 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001339 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001340
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001341 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001342 remote_url='https://chromium.googlesource.com/chromium/src',
1343 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001344 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001345
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001346 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001347 remote_url='https://chromium.googlesource.com/chromium/src',
1348 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001349 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001350
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001351 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001352 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001353 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001354 remote_url='https://chromium.googlesource.com/chromium/src',
1355 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001356 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001357
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001358 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001359 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001360 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001361 if skip_auth_check:
1362 return [((cmd, ), 'true')]
1363
tandrii5d48c322016-08-18 16:19:37 -07001364 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001365 if issue:
1366 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001367 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001368 ])
1369 calls.extend([
1370 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1371 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1372 ((['git', 'config', 'remote.origin.url'],),
1373 'https://chromium.googlesource.com/my/repo'),
1374 ((['git', 'config', 'remote.origin.url'],),
1375 'https://chromium.googlesource.com/my/repo'),
1376 ])
1377 return calls
1378
1379 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001380 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001381 fetched_status=None, other_cl_owner=None,
1382 custom_cl_base=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001383 calls = [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001384 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1385 ((['git', 'config', 'branch.master.git-cl-similarity'],), CERR1),
1386 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1387 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001388 ]
1389 calls += cls._is_gerrit_calls(True)
1390 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001391 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1392 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1393 ((['git', 'config', 'branch.master.gerritissue'],),
1394 CERR1 if issue is None else str(issue)),
1395 ]
1396
1397 if custom_cl_base:
1398 ancestor_revision = custom_cl_base
1399 else:
1400 # Determine ancestor_revision to be merge base.
1401 ancestor_revision = 'fake_ancestor_sha'
1402 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001403 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001404 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001405 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001406 'refs/remotes/origin/master'],), ancestor_revision),
1407 ]
1408
1409 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001410 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1411
1412 if issue:
1413 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001414 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001415 '123456',
1416 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001417 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001418 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001419 'change_id': '123456789',
1420 'current_revision': 'sha1_of_current_revision',
1421 'revisions': { 'sha1_of_current_revision': {
1422 'commit': {'message': fetched_description},
1423 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001424 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001425 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001426 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001427 if fetched_status == 'ABANDONED':
1428 calls += [
1429 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1430 '123456 has been abandoned, new uploads are not '
1431 'allowed'), SystemExitMock()),
1432 ]
1433 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001434 if other_cl_owner:
1435 calls += [
1436 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1437 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001438
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001439 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1440 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001441 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001442 ((['git', 'rev-parse', '--show-cdup'],), ''),
1443 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001444
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001445 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1446 ancestor_revision + '...', '.'],),
1447 'M\t.gitignore\n'),
1448 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001449 ]
1450
1451 if not issue:
1452 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001453 ((['git', 'log', '--pretty=format:%s%n%n%b',
1454 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001455 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001456 ]
1457
1458 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001459 ((['git', 'config', 'user.email'],), 'me@example.com'),
1460 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1461 ([custom_cl_base] if custom_cl_base else
1462 [ancestor_revision, 'HEAD']),),
1463 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001464 ]
1465 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001466
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001467 @classmethod
1468 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001469 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001470 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001471 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001472 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001473 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001474 if post_amend_description is None:
1475 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001476 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001477 # Determined in `_gerrit_base_calls`.
1478 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1479
1480 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001481
tandriia60502f2016-06-20 02:01:53 -07001482 if squash_mode == 'default':
1483 calls.extend([
1484 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1485 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1486 ])
1487 elif squash_mode in ('override_squash', 'override_nosquash'):
1488 calls.extend([
1489 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1490 'true' if squash_mode == 'override_squash' else 'false'),
1491 ])
1492 else:
1493 assert squash_mode in ('squash', 'nosquash')
1494
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001495 # If issue is given, then description is fetched from Gerrit instead.
1496 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001497 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001498 ((['git', 'log', '--pretty=format:%s\n\n%b',
1499 ((custom_cl_base + '..') if custom_cl_base else
1500 'fake_ancestor_sha..HEAD')],),
1501 description),
1502 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001503 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001504 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001505 else:
1506 if not title:
1507 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001508 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1509 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001510 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001511 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001512 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001513 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001514 (('DownloadGerritHook', False), ''),
1515 # Amending of commit message to get the Change-Id.
1516 ((['git', 'log', '--pretty=format:%s\n\n%b',
1517 determined_ancestor_revision + '..HEAD'],),
1518 description),
1519 ((['git', 'commit', '--amend', '-m', description],), ''),
1520 ((['git', 'log', '--pretty=format:%s\n\n%b',
1521 determined_ancestor_revision + '..HEAD'],),
1522 post_amend_description)
1523 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001524 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001525 if not issue:
1526 # Prompting to edit description on first upload.
1527 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001528 ((['git', 'config', 'core.editor'],), ''),
1529 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001530 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001531 ref_to_push = 'abcdef0123456789'
1532 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001533 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1534 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1535 ]
1536
1537 if custom_cl_base is None:
1538 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001539 ((['get_or_create_merge_base', 'master',
1540 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001541 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001542 ]
1543 parent = 'origin/master'
1544 else:
1545 calls += [
1546 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1547 'refs/remotes/origin/master'],),
1548 callError(1)), # Means not ancenstor.
1549 (('ask_for_data',
1550 'Do you take responsibility for cleaning up potential mess '
1551 'resulting from proceeding with upload? Press Enter to upload, '
1552 'or Ctrl+C to abort'), ''),
1553 ]
1554 parent = custom_cl_base
1555
1556 calls += [
1557 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1558 '0123456789abcdef'),
1559 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001560 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001561 ref_to_push),
1562 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001563 else:
1564 ref_to_push = 'HEAD'
1565
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001566 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001567 ((['git', 'rev-list',
1568 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1569 ref_to_push],),
1570 '1hashPerLine\n'),
1571 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001572
Aaron Gableafd52772017-06-27 16:40:10 -07001573 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001574 ref_suffix = '%ready,notify=ALL'
1575 else:
1576 if not issue:
1577 ref_suffix = '%wip'
1578 else:
1579 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001580
Aaron Gable70f4e242017-06-26 10:45:59 -07001581 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001582 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001583
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001584 if git_mirror is None:
1585 calls += [
1586 ((['git', 'config', 'remote.origin.url'],),
1587 'https://chromium.googlesource.com/yyy/zzz'),
1588 ]
1589 else:
1590 calls += [
1591 ((['git', 'config', 'remote.origin.url'],),
1592 '/cache/this-dir-exists'),
1593 (('os.path.isdir', '/cache/this-dir-exists'),
1594 True),
1595 # Runs in /cache/this-dir-exists.
1596 ((['git', 'config', 'remote.origin.url'],),
1597 'https://chromium.googlesource.com/yyy/zzz'),
1598 ]
1599
ukai@chromium.orge8077812012-02-03 03:41:46 +00001600 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001601 ((['git', 'push',
1602 'https://chromium.googlesource.com/yyy/zzz',
1603 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001604 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001605 'remote: Processing changes: (\)\n'
1606 'remote: Processing changes: (|)\n'
1607 'remote: Processing changes: (/)\n'
1608 'remote: Processing changes: (-)\n'
1609 'remote: Processing changes: new: 1 (/)\n'
1610 'remote: Processing changes: new: 1, done\n'
1611 'remote:\n'
1612 'remote: New Changes:\n'
Aaron Gable289b4312017-09-13 14:06:16 -07001613 'remote: https://chromium-review.googlesource.com/#/c/foo/+/123456 '
1614 'XXX\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001615 'remote:\n'
1616 'To https://chromium.googlesource.com/yyy/zzz\n'
1617 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001618 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001619 if squash:
1620 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001621 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001622 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001623 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001624 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001625 ((['git', 'config', 'branch.master.gerritsquashhash',
1626 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001627 ]
tandrii88189772016-09-29 04:29:57 -07001628 calls += [
1629 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001630 (('AddReviewers', 'chromium-review.googlesource.com',
Aaron Gable6dadfbf2017-05-09 14:27:58 -07001631 123456 if squash else None, sorted(reviewers),
1632 ['joe@example.com'] + cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001633 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001634 if tbr:
1635 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001636 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1637 ['LABELS']), {
1638 'labels': {
1639 'Code-Review': {
1640 'default_value': 0,
1641 'all': [],
1642 'values': {
1643 '+2': 'lgtm, approved',
1644 '+1': 'lgtm, but someone else must approve',
1645 ' 0': 'No score',
1646 '-1': 'Don\'t submit as-is',
1647 }
1648 }
1649 }
1650 }),
Aaron Gablefd238082017-06-07 13:42:34 -07001651 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001652 123456 if squash else None, 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001653 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001654 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001655 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001656 return calls
1657
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001658 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001659 self,
1660 upload_args,
1661 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001662 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001663 squash=True,
1664 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001665 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001666 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001667 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001668 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001669 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001670 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001671 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001672 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001673 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001674 custom_cl_base=None,
1675 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001676 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001677 if squash_mode is None:
1678 if '--no-squash' in upload_args:
1679 squash_mode = 'nosquash'
1680 elif '--squash' in upload_args:
1681 squash_mode = 'squash'
1682 else:
1683 squash_mode = 'default'
1684
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001685 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001686 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001687 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001688 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001689 CookiesAuthenticatorMockFactory(
1690 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001691 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1692 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001693 self.mock(git_cl.gclient_utils, 'RunEditor',
1694 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001695 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1696 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001697
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001698 original_os_path_isdir = os.path.isdir
1699 def selective_os_path_isdir_mock(path):
1700 if path == '/cache/this-dir-exists':
1701 return self._mocked_call('os.path.isdir', path)
1702 return original_os_path_isdir(path)
1703 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1704
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001705 self.calls = self._gerrit_base_calls(
1706 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001707 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001708 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001709 other_cl_owner=other_cl_owner,
1710 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001711 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001712 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1713 expected_content=description))
1714 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001715 self.calls += self._gerrit_upload_calls(
1716 description, reviewers, squash,
1717 squash_mode=squash_mode,
1718 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001719 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001720 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001721 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001722 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001723 # Uncomment when debugging.
1724 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001725 git_cl.main(['upload'] + upload_args)
1726
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001727 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001728 self._run_gerrit_upload_test(
1729 ['--no-squash'],
1730 'desc\n\nBUG=\n',
1731 [],
1732 squash=False,
1733 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1734
1735 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001736 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001737 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001738 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001739 [],
tandriia60502f2016-06-20 02:01:53 -07001740 squash=False,
1741 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001742 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001743
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001744 def test_gerrit_no_reviewer(self):
1745 self._run_gerrit_upload_test(
1746 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001747 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001748 [],
1749 squash=False,
1750 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001751
Nick Carter8692b182017-11-06 16:30:38 -08001752 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001753 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1754 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001755 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001756 'desc\n\nBUG=\n\nChange-Id: I123456789',
1757 squash=False,
1758 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001759 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001760
ukai@chromium.orge8077812012-02-03 03:41:46 +00001761 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001762 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001763 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001764 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001765 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001766 squash=False,
1767 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001768 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001769
1770 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001771 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001772 [],
bradnelsond975b302016-10-23 12:20:23 -07001773 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1774 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001775 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001776 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001777 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001778 cc=['more@example.com', 'people@example.com'],
1779 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001780
1781 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001782 self._run_gerrit_upload_test(
1783 [],
1784 'desc\nBUG=\n\nChange-Id: 123456789',
1785 [],
1786 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001787
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001788 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001789 self._run_gerrit_upload_test(
1790 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001791 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001792 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001793 squash=True,
1794 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001795
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001796 def test_gerrit_upload_squash_first_against_rev(self):
1797 custom_cl_base = 'custom_cl_base_rev_or_branch'
1798 self._run_gerrit_upload_test(
1799 ['--squash', custom_cl_base],
1800 'desc\nBUG=\n\nChange-Id: 123456789',
1801 [],
1802 squash=True,
1803 expected_upstream_ref='origin/master',
1804 custom_cl_base=custom_cl_base)
1805 self.assertIn(
1806 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1807 sys.stdout.getvalue())
1808
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001809 def test_gerrit_upload_squash_first_with_mirror(self):
1810 self._run_gerrit_upload_test(
1811 ['--squash'],
1812 'desc\nBUG=\n\nChange-Id: 123456789',
1813 [],
1814 squash=True,
1815 expected_upstream_ref='origin/master',
1816 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1817
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001818 def test_gerrit_upload_squash_reupload(self):
1819 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001820 self._run_gerrit_upload_test(
1821 ['--squash'],
1822 description,
1823 [],
1824 squash=True,
1825 expected_upstream_ref='origin/master',
1826 issue=123456)
1827
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001828 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1829 self.mock(git_cl, 'DieWithError',
1830 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1831 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1832 with self.assertRaises(SystemExitMock):
1833 self._run_gerrit_upload_test(
1834 ['--squash'],
1835 description,
1836 [],
1837 squash=True,
1838 expected_upstream_ref='origin/master',
1839 issue=123456,
1840 fetched_status='ABANDONED')
1841
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001842 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1843 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1844 lambda *_, **__: {'email': 'yet-another@example.com'})
1845 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1846 self._run_gerrit_upload_test(
1847 ['--squash'],
1848 description,
1849 [],
1850 squash=True,
1851 expected_upstream_ref='origin/master',
1852 issue=123456,
1853 other_cl_owner='other@example.com')
1854 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001855 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001856 'authenticate to Gerrit as yet-another@example.com.\n'
1857 'Uploading may fail due to lack of permissions',
1858 git_cl.sys.stdout.getvalue())
1859
rmistry@google.com2dd99862015-06-22 12:22:18 +00001860 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001861 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001862 def mock_run_git(*args, **_kwargs):
1863 if args[0] == ['for-each-ref',
1864 '--format=%(refname:short) %(upstream:short)',
1865 'refs/heads']:
1866 # Create a local branch dependency tree that looks like this:
1867 # test1 -> test2 -> test3 -> test4 -> test5
1868 # -> test3.1
1869 # test6 -> test0
1870 branch_deps = [
1871 'test2 test1', # test1 -> test2
1872 'test3 test2', # test2 -> test3
1873 'test3.1 test2', # test2 -> test3.1
1874 'test4 test3', # test3 -> test4
1875 'test5 test4', # test4 -> test5
1876 'test6 test0', # test0 -> test6
1877 'test7', # test7
1878 ]
1879 return '\n'.join(branch_deps)
1880 self.mock(git_cl, 'RunGit', mock_run_git)
1881
1882 class RecordCalls:
1883 times_called = 0
1884 record_calls = RecordCalls()
1885 def mock_CMDupload(*args, **_kwargs):
1886 record_calls.times_called += 1
1887 return 0
1888 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1889
1890 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001891 (('ask_for_data', 'This command will checkout all dependent branches '
1892 'and run "git cl upload". Press Enter to continue, '
1893 'or Ctrl+C to abort'), ''),
1894 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001895
1896 class MockChangelist():
1897 def __init__(self):
1898 pass
1899 def GetBranch(self):
1900 return 'test1'
1901 def GetIssue(self):
1902 return '123'
1903 def GetPatchset(self):
1904 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001905 def IsGerrit(self):
1906 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001907
1908 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1909 # CMDupload should have been called 5 times because of 5 dependent branches.
1910 self.assertEquals(5, record_calls.times_called)
1911 self.assertEquals(0, ret)
1912
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001913 def test_gerrit_change_id(self):
1914 self.calls = [
1915 ((['git', 'write-tree'], ),
1916 'hashtree'),
1917 ((['git', 'rev-parse', 'HEAD~0'], ),
1918 'branch-parent'),
1919 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1920 'A B <a@b.org> 1456848326 +0100'),
1921 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1922 'C D <c@d.org> 1456858326 +0100'),
1923 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1924 'hashchange'),
1925 ]
1926 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1927 self.assertEqual(change_id, 'Ihashchange')
1928
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001929 def test_desecription_append_footer(self):
1930 for init_desc, footer_line, expected_desc in [
1931 # Use unique desc first lines for easy test failure identification.
1932 ('foo', 'R=one', 'foo\n\nR=one'),
1933 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1934 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1935 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1936 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1937 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1938 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1939 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1940 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1941 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1942 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1943 ]:
1944 desc = git_cl.ChangeDescription(init_desc)
1945 desc.append_footer(footer_line)
1946 self.assertEqual(desc.description, expected_desc)
1947
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001948 def test_update_reviewers(self):
1949 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001950 ('foo', [], [],
1951 'foo'),
1952 ('foo\nR=xx', [], [],
1953 'foo\nR=xx'),
1954 ('foo\nTBR=xx', [], [],
1955 'foo\nTBR=xx'),
1956 ('foo', ['a@c'], [],
1957 'foo\n\nR=a@c'),
1958 ('foo\nR=xx', ['a@c'], [],
1959 'foo\n\nR=a@c, xx'),
1960 ('foo\nTBR=xx', ['a@c'], [],
1961 'foo\n\nR=a@c\nTBR=xx'),
1962 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1963 'foo\n\nR=a@c, yy\nTBR=xx'),
1964 ('foo\nBUG=', ['a@c'], [],
1965 'foo\nBUG=\nR=a@c'),
1966 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1967 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1968 ('foo', ['a@c', 'b@c'], [],
1969 'foo\n\nR=a@c, b@c'),
1970 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1971 'foo\nBar\n\nR=c@c\nBUG='),
1972 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1973 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001974 # Same as the line before, but full of whitespaces.
1975 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001976 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001977 'foo\nBar\n\nR=c@c\n BUG =',
1978 ),
1979 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001980 ('foo BUG=allo R=joe ', ['c@c'], [],
1981 'foo BUG=allo R=joe\n\nR=c@c'),
1982 # Redundant TBRs get promoted to Rs
1983 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1984 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001985 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001986 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001987 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001988 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001989 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001990 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001991 actual.append(obj.description)
1992 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001993
Nodir Turakulov23b82142017-11-16 11:04:25 -08001994 def test_get_hash_tags(self):
1995 cases = [
1996 ('', []),
1997 ('a', []),
1998 ('[a]', ['a']),
1999 ('[aa]', ['aa']),
2000 ('[a ]', ['a']),
2001 ('[a- ]', ['a']),
2002 ('[a- b]', ['a-b']),
2003 ('[a--b]', ['a-b']),
2004 ('[a', []),
2005 ('[a]x', ['a']),
2006 ('[aa]x', ['aa']),
2007 ('[a b]', ['a-b']),
2008 ('[a b]', ['a-b']),
2009 ('[a__b]', ['a-b']),
2010 ('[a] x', ['a']),
2011 ('[a][b]', ['a', 'b']),
2012 ('[a] [b]', ['a', 'b']),
2013 ('[a][b]x', ['a', 'b']),
2014 ('[a][b] x', ['a', 'b']),
2015 ('[a]\n[b]', ['a']),
2016 ('[a\nb]', []),
2017 ('[a][', ['a']),
2018 ('Revert "[a] feature"', ['a']),
2019 ('Reland "[a] feature"', ['a']),
2020 ('Revert: [a] feature', ['a']),
2021 ('Reland: [a] feature', ['a']),
2022 ('Revert "Reland: [a] feature"', ['a']),
2023 ('Foo: feature', ['foo']),
2024 ('Foo Bar: feature', ['foo-bar']),
2025 ('Revert "Foo bar: feature"', ['foo-bar']),
2026 ('Reland "Foo bar: feature"', ['foo-bar']),
2027 ]
2028 for desc, expected in cases:
2029 change_desc = git_cl.ChangeDescription(desc)
2030 actual = change_desc.get_hash_tags()
2031 self.assertEqual(
2032 actual,
2033 expected,
2034 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
2035
wittman@chromium.org455dc922015-01-26 20:15:50 +00002036 def test_get_target_ref(self):
2037 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002038 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002039 self.assertEqual(None, git_cl.GetTargetRef(None,
2040 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002041 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00002042
wittman@chromium.org455dc922015-01-26 20:15:50 +00002043 # Check default target refs for branches.
2044 self.assertEqual('refs/heads/master',
2045 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002046 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002047 self.assertEqual('refs/heads/master',
2048 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002049 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002050 self.assertEqual('refs/heads/master',
2051 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002052 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002053 self.assertEqual('refs/branch-heads/123',
2054 git_cl.GetTargetRef('origin',
2055 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002056 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002057 self.assertEqual('refs/diff/test',
2058 git_cl.GetTargetRef('origin',
2059 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002060 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00002061 self.assertEqual('refs/heads/chrome/m42',
2062 git_cl.GetTargetRef('origin',
2063 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002064 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002065
2066 # Check target refs for user-specified target branch.
2067 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
2068 'refs/remotes/branch-heads/123'):
2069 self.assertEqual('refs/branch-heads/123',
2070 git_cl.GetTargetRef('origin',
2071 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002072 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002073 for branch in ('origin/master', 'remotes/origin/master',
2074 'refs/remotes/origin/master'):
2075 self.assertEqual('refs/heads/master',
2076 git_cl.GetTargetRef('origin',
2077 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002078 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002079 for branch in ('master', 'heads/master', 'refs/heads/master'):
2080 self.assertEqual('refs/heads/master',
2081 git_cl.GetTargetRef('origin',
2082 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01002083 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00002084
wychen@chromium.orga872e752015-04-28 23:42:18 +00002085 def test_patch_when_dirty(self):
2086 # Patch when local tree is dirty
2087 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
2088 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
2089
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002090 @staticmethod
2091 def _get_gerrit_codereview_server_calls(branch, value=None,
2092 git_short_host='host',
2093 detect_branch=True):
2094 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
2095
2096 If value is given, branch.<BRANCH>.gerritcodereview is already set.
2097 """
2098 calls = []
2099 if detect_branch:
2100 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
2101 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
2102 CERR1 if value is None else value))
2103 if value is None:
2104 calls += [
2105 ((['git', 'config', 'branch.' + branch + '.merge'],),
2106 'refs/heads' + branch),
2107 ((['git', 'config', 'branch.' + branch + '.remote'],),
2108 'origin'),
2109 ((['git', 'config', 'remote.origin.url'],),
2110 'https://%s.googlesource.com/my/repo' % git_short_host),
2111 ]
2112 return calls
2113
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002114 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002115 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002116 detect_gerrit_server=True,
2117 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002118 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00002119 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
2120 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002121 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08002122 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002123 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
2124
tandriidf09a462016-08-18 16:23:55 -07002125 if new_branch:
2126 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002127
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002128 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002129 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002130 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002131 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002132 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2133 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2134 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2135 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002136 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002137 if default_codereview == 'gerrit':
2138 if not force_codereview:
2139 self.calls += [
2140 ((['git', 'config', 'gerrit.host'],), 'true'),
2141 ]
2142 if detect_gerrit_server:
2143 self.calls += self._get_gerrit_codereview_server_calls(
2144 'master', git_short_host=git_short_host,
2145 detect_branch=not new_branch and force_codereview)
2146 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002147
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002148 elif default_codereview == 'rietveld':
2149 self.calls += [
2150 ((['git', 'config', 'gerrit.host'],), CERR1),
2151 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2152 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
2153 ]
2154 actual_codereview = 'rietveld'
2155
2156 if actual_codereview == 'rietveld':
2157 self.calls += [
2158 ((['git', 'rev-parse', '--show-cdup'],), ''),
2159 ]
2160 if not default_codereview:
2161 self.calls += [
2162 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2163 ]
2164 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002165 self.calls += [
2166 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002167 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002168 {
2169 'current_revision': '7777777777',
2170 'revisions': {
2171 '1111111111': {
2172 '_number': 1,
2173 'fetch': {'http': {
2174 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2175 'ref': 'refs/changes/56/123456/1',
2176 }},
2177 },
2178 '7777777777': {
2179 '_number': 7,
2180 'fetch': {'http': {
2181 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2182 'ref': 'refs/changes/56/123456/7',
2183 }},
2184 },
2185 },
2186 }),
2187 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002188
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002189 def _common_patch_rietveld_successful(self, **kwargs):
2190 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002191 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002192 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002193 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002194 ((['git', 'config', 'branch.master.rietveldserver',
2195 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002196 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002197 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002198 ((['git', 'commit', '-m',
2199 'Description\n\n' +
2200 'patch from issue 123456 at patchset 60001 ' +
2201 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002202 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002203
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002204 def test_patch_rietveld_default(self):
2205 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002206 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2207
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002208 def test_patch_rietveld_successful_new_branch(self):
2209 self._common_patch_rietveld_successful(default_codereview='rietveld',
2210 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002211 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2212
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002213 def test_patch_rietveld_guess_by_url(self):
2214 self._common_patch_rietveld_successful(
2215 default_codereview=None, # It doesn't matter.
2216 actual_codereview='rietveld')
2217 self.assertEqual(git_cl.main(
2218 ['patch', 'https://codereview.example.com/123456']), 0)
2219
2220 def test_patch_rietveld_conflict(self):
2221 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002222 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002223 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002224
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002225 def test_patch_gerrit_default(self):
2226 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002227 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002228 self.calls += [
2229 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2230 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002231 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002232 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002233 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002234 ((['git', 'config', 'branch.master.gerritserver',
2235 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002236 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002237 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2238 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2239 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002240 ]
2241 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2242
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002243 def test_patch_gerrit_force(self):
2244 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002245 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002246 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002247 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002248 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002249 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002250 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002251 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002252 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002253 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002254 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002255 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2256 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2257 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002258 ]
Aaron Gable62619a32017-06-16 08:22:09 -07002259 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002260
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002261 def test_patch_gerrit_guess_by_url(self):
2262 self._patch_common(
2263 default_codereview=None, # It doesn't matter what's default.
2264 actual_codereview='gerrit',
2265 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002266 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002267 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002268 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002269 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002270 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002271 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002272 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002273 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002274 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002275 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002276 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2277 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2278 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002279 ]
2280 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002281 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002282
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002283 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2284 self._patch_common(
2285 default_codereview=None, # It doesn't matter what's default.
2286 actual_codereview='gerrit',
2287 git_short_host='else', detect_gerrit_server=False)
2288 self.calls += [
2289 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2290 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002291 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002292 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2293 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2294 ''),
2295 ((['git', 'config', 'branch.master.gerritserver',
2296 'https://else-review.googlesource.com'],), ''),
2297 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002298 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2299 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2300 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002301 ]
2302 self.assertEqual(git_cl.main(
2303 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2304
2305 def test_patch_gerrit_conflict(self):
2306 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002307 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002308 self.calls += [
2309 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002310 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002311 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2312 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2313 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002314 ]
2315 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002316 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002317
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002318 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002319 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002320 raise git_cl.gerrit_util.GerritError(404, '')
2321 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2322
tandriic2405f52016-10-10 08:13:15 -07002323 self.calls = [
2324 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002325 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2326 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2327 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2328 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002329 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2330 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2331 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2332 ((['git', 'config', 'remote.origin.url'],),
2333 'https://chromium.googlesource.com/my/repo'),
2334 ((['DieWithError',
2335 'change 123456 at https://chromium-review.googlesource.com does not '
2336 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002337 ]
2338 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002339 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002340
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002341 def _checkout_calls(self):
2342 return [
2343 ((['git', 'config', '--local', '--get-regexp',
2344 'branch\\..*\\.rietveldissue'], ),
2345 ('branch.retrying.rietveldissue 1111111111\n'
2346 'branch.some-fix.rietveldissue 2222222222\n')),
2347 ((['git', 'config', '--local', '--get-regexp',
2348 'branch\\..*\\.gerritissue'], ),
2349 ('branch.ger-branch.gerritissue 123456\n'
2350 'branch.gbranch654.gerritissue 654321\n')),
2351 ]
2352
2353 def test_checkout_gerrit(self):
2354 """Tests git cl checkout <issue>."""
2355 self.calls = self._checkout_calls()
2356 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2357 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2358
2359 def test_checkout_rietveld(self):
2360 """Tests git cl checkout <issue>."""
2361 self.calls = self._checkout_calls()
2362 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2363 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2364
2365 def test_checkout_not_found(self):
2366 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002367 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002368 self.calls = self._checkout_calls()
2369 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2370
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002371 def test_checkout_no_branch_issues(self):
2372 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002373 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002374 self.calls = [
2375 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002376 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002377 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002378 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002379 ]
2380 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2381
tandrii@chromium.org28253532016-04-14 13:46:56 +00002382 def _test_gerrit_ensure_authenticated_common(self, auth,
2383 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002384 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2385 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2386 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002387 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002388 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002389 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002390 cl.branch = 'master'
2391 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002392 cl.lookedup_issue = True
2393 return cl
2394
2395 def test_gerrit_ensure_authenticated_missing(self):
2396 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002397 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002398 })
2399 self.calls.append(
2400 ((['DieWithError',
2401 'Credentials for the following hosts are required:\n'
2402 ' chromium-review.googlesource.com\n'
2403 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002404 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002405 'https://chromium-review.googlesource.com/new-password'],), ''),)
2406 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2407
2408 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002409 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002410 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002411 'chromium.googlesource.com':
2412 ('git-one.example.com', None, 'secret1'),
2413 'chromium-review.googlesource.com':
2414 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002415 })
2416 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002417 (('ask_for_data', 'If you know what you are doing '
2418 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002419 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2420
2421 def test_gerrit_ensure_authenticated_ok(self):
2422 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002423 'chromium.googlesource.com':
2424 ('git-same.example.com', None, 'secret'),
2425 'chromium-review.googlesource.com':
2426 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002427 })
2428 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2429
tandrii@chromium.org28253532016-04-14 13:46:56 +00002430 def test_gerrit_ensure_authenticated_skipped(self):
2431 cl = self._test_gerrit_ensure_authenticated_common(
2432 auth={}, skip_auth_check=True)
2433 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2434
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002435 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002436 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2437 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002438 self.calls = [
2439 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002440 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002441 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2442 ((['git', 'config', 'rietveld.server'],), ''),
2443 ((['git', 'config', 'rietveld.server'],), ''),
2444 ((['git', 'config', 'branch.feature.rietveldserver'],),
2445 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002446 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002447 ]
2448 self.assertEqual(0, git_cl.main(['set-commit']))
2449
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002450 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002451 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002452 lambda h, i, labels, notify=None:
2453 self._mocked_call(['SetReview', h, i, labels, notify]))
2454
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002455 self.calls = [
2456 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002457 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2458 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002459 ((['git', 'config', 'branch.feature.gerritserver'],),
2460 'https://chromium-review.googlesource.com'),
2461 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002462 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002463 ]
tandriid9e5ce52016-07-13 02:32:59 -07002464
2465 def test_cmd_set_commit_gerrit_clear(self):
2466 self._cmd_set_commit_gerrit_common(0)
2467 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2468
2469 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002470 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002471 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2472
tandriid9e5ce52016-07-13 02:32:59 -07002473 def test_cmd_set_commit_gerrit(self):
2474 self._cmd_set_commit_gerrit_common(2)
2475 self.assertEqual(0, git_cl.main(['set-commit']))
2476
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002477 def test_description_display(self):
2478 out = StringIO.StringIO()
2479 self.mock(git_cl.sys, 'stdout', out)
2480
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002481 self.mock(git_cl, 'Changelist', ChangelistMock)
2482 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002483
2484 self.assertEqual(0, git_cl.main(['description', '-d']))
2485 self.assertEqual('foo\n', out.getvalue())
2486
2487 def test_description_rietveld(self):
2488 out = StringIO.StringIO()
2489 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002490 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002491
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002492 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002493 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002494 self.assertEqual('foobar\n', out.getvalue())
2495
iannucci3c972b92016-08-17 13:24:10 -07002496 def test_StatusFieldOverrideIssueMissingArgs(self):
2497 out = StringIO.StringIO()
2498 self.mock(git_cl.sys, 'stderr', out)
2499
2500 try:
2501 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2502 except SystemExit as ex:
2503 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002504 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002505
2506 out = StringIO.StringIO()
2507 self.mock(git_cl.sys, 'stderr', out)
2508
2509 try:
2510 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2511 except SystemExit as ex:
2512 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002513 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002514
2515 def test_StatusFieldOverrideIssue(self):
2516 out = StringIO.StringIO()
2517 self.mock(git_cl.sys, 'stdout', out)
2518
2519 def assertIssue(cl_self, *_args):
2520 self.assertEquals(cl_self.issue, 1)
2521 return 'foobar'
2522
2523 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2524 self.calls = [
2525 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2526 ((['git', 'config', 'rietveld.server'],), ''),
2527 ((['git', 'config', 'rietveld.server'],), ''),
2528 ]
iannuccie53c9352016-08-17 14:40:40 -07002529 self.assertEqual(
2530 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2531 0)
iannucci3c972b92016-08-17 13:24:10 -07002532 self.assertEqual(out.getvalue(), 'foobar\n')
2533
iannuccie53c9352016-08-17 14:40:40 -07002534 def test_SetCloseOverrideIssue(self):
2535 def assertIssue(cl_self, *_args):
2536 self.assertEquals(cl_self.issue, 1)
2537 return 'foobar'
2538
2539 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2540 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2541 self.calls = [
2542 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2543 ((['git', 'config', 'rietveld.server'],), ''),
2544 ((['git', 'config', 'rietveld.server'],), ''),
2545 ]
2546 self.assertEqual(
2547 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2548
2549 def test_SetCommitOverrideIssue(self):
2550 def assertIssue(cl_self, *_args):
2551 self.assertEquals(cl_self.issue, 1)
2552 return 'foobar'
2553
2554 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2555 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2556 self.calls = [
2557 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2558 ((['git', 'config', 'rietveld.server'],), ''),
2559 ((['git', 'config', 'rietveld.server'],), ''),
2560 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2561 ((['git', 'config', 'rietveld.server'],), ''),
2562 ((['git', 'config', 'rietveld.server'],), ''),
2563 ]
2564 self.assertEqual(
2565 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2566
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002567 def test_description_gerrit(self):
2568 out = StringIO.StringIO()
2569 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002570 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002571 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002572 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2573 {
2574 'current_revision': 'sha1',
2575 'revisions': {'sha1': {
2576 'commit': {'message': 'foobar'},
2577 }},
2578 }),
2579 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002580 self.assertEqual(0, git_cl.main([
2581 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2582 self.assertEqual('foobar\n', out.getvalue())
2583
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002584 def test_description_set_raw(self):
2585 out = StringIO.StringIO()
2586 self.mock(git_cl.sys, 'stdout', out)
2587
2588 self.mock(git_cl, 'Changelist', ChangelistMock)
2589 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2590
2591 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2592 self.assertEqual('hihi', ChangelistMock.desc)
2593
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002594 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002595 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002596
2597 def RunEditor(desc, _, **kwargs):
2598 self.assertEquals(
2599 '# Enter a description of the change.\n'
2600 '# This will be displayed on the codereview site.\n'
2601 '# The first line will also be used as the subject of the review.\n'
2602 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002603 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002604 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002605 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002606 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002607 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002608
dsansomee2d6fd92016-09-08 00:10:47 -07002609 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002610 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002611
2612 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2613 self.mock(git_cl.Changelist, 'GetDescription',
2614 lambda *args: current_desc)
2615 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2616 UpdateDescriptionRemote)
2617 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2618
2619 self.calls = [
2620 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002621 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002622 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2623 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002624 ((['git', 'config', 'core.editor'],), 'vi'),
2625 ]
2626 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2627
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002628 def test_description_set_stdin(self):
2629 out = StringIO.StringIO()
2630 self.mock(git_cl.sys, 'stdout', out)
2631
2632 self.mock(git_cl, 'Changelist', ChangelistMock)
2633 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2634
2635 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2636 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2637
kmarshall3bff56b2016-06-06 18:31:47 -07002638 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002639 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2640
kmarshall3bff56b2016-06-06 18:31:47 -07002641 self.calls = \
2642 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2643 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002644 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002645 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2646 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002647 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2648 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2649 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002650 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2651 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2652 ((['git', 'branch', '-D', 'foo'],), '')]
2653
kmarshall3bff56b2016-06-06 18:31:47 -07002654 self.mock(git_cl, 'get_cl_statuses',
2655 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002656 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2657 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2658 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002659
2660 self.assertEqual(0, git_cl.main(['archive', '-f']))
2661
2662 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002663 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002664 self.calls = \
2665 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2666 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002667 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002668 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2669 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002670 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2671
kmarshall9249e012016-08-23 12:02:16 -07002672 self.mock(git_cl, 'get_cl_statuses',
2673 lambda branches, fine_grained, max_processes:
2674 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2675
2676 self.assertEqual(1, git_cl.main(['archive', '-f']))
2677
2678 def test_archive_dry_run(self):
2679 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2680
2681 self.calls = \
2682 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2683 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2684 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2685 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2686 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2687 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2688 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2689 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2690 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002691
2692 self.mock(git_cl, 'get_cl_statuses',
2693 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002694 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2695 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2696 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002697
kmarshall9249e012016-08-23 12:02:16 -07002698 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2699
2700 def test_archive_no_tags(self):
2701 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2702
2703 self.calls = \
2704 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2705 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2706 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2707 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2708 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2709 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2710 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2711 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2712 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2713 ((['git', 'branch', '-D', 'foo'],), '')]
2714
2715 self.mock(git_cl, 'get_cl_statuses',
2716 lambda branches, fine_grained, max_processes:
2717 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2718 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2719 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2720
2721 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002722
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002723 def test_cmd_issue_erase_existing(self):
2724 out = StringIO.StringIO()
2725 self.mock(git_cl.sys, 'stdout', out)
2726 self.calls = [
2727 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002728 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2729 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002730 # Let this command raise exception (retcode=1) - it should be ignored.
2731 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002732 CERR1),
2733 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2734 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002735 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2736 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2737 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002738 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002739 ]
2740 self.assertEqual(0, git_cl.main(['issue', '0']))
2741
Aaron Gable400e9892017-07-12 15:31:21 -07002742 def test_cmd_issue_erase_existing_with_change_id(self):
2743 out = StringIO.StringIO()
2744 self.mock(git_cl.sys, 'stdout', out)
2745 self.mock(git_cl.Changelist, 'GetDescription',
2746 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2747 self.calls = [
2748 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2749 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2750 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002751 # Let this command raise exception (retcode=1) - it should be ignored.
2752 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2753 CERR1),
2754 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2755 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2756 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2757 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2758 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002759 ((['git', 'log', '-1', '--format=%B'],),
2760 'This is a description\n\nChange-Id: Ideadbeef'),
2761 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002762 ]
2763 self.assertEqual(0, git_cl.main(['issue', '0']))
2764
phajdan.jre328cf92016-08-22 04:12:17 -07002765 def test_cmd_issue_json(self):
2766 out = StringIO.StringIO()
2767 self.mock(git_cl.sys, 'stdout', out)
2768 self.calls = [
2769 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002770 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002771 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2772 ((['git', 'config', 'rietveld.server'],),
2773 'https://codereview.chromium.org'),
2774 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2775 (('write_json', 'output.json',
2776 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2777 ''),
2778 ]
2779 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2780
tandriide281ae2016-10-12 06:02:30 -07002781 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002782 self.mock(git_cl.Changelist, 'GetChange',
2783 lambda _, *a: (
2784 self._mocked_call(['GetChange']+list(a))))
2785 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2786 lambda *_, **__: (
2787 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002788 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2789 lambda _, s: self._mocked_call(['SetCQState', s]))
2790 self.calls = [
2791 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002792 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002793 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2794 ((['git', 'config', 'rietveld.server'],),
2795 'https://codereview.chromium.org'),
2796 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2797 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2798 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2799 ((['get_or_create_merge_base', 'feature', 'feature'],),
2800 'fake_ancestor_sha'),
2801 ((['GetChange', 'fake_ancestor_sha', None], ),
2802 git_cl.presubmit_support.GitChange(
2803 '', '', '', '', '', '', '', '')),
2804 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2805 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002806 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2807 ]
2808 out = StringIO.StringIO()
2809 self.mock(git_cl.sys, 'stdout', out)
2810 self.assertEqual(0, git_cl.main(['try']))
2811 self.assertEqual(
2812 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002813 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002814
tandrii8c5a3532016-11-04 07:52:02 -07002815 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2816 self.mock(git_cl.Changelist, 'GetChange',
2817 lambda _, *a: (
2818 self._mocked_call(['GetChange']+list(a))))
2819 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2820 lambda *_, **__: (
2821 self._mocked_call(['DoGetTryMasters'])))
2822 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2823 lambda _, s: self._mocked_call(['SetCQState', s]))
2824
tandrii8c5a3532016-11-04 07:52:02 -07002825 self.calls = [
2826 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2827 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2828 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2829 ((['git', 'config', 'branch.feature.gerritserver'],),
2830 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002831 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2832 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2833 'project': 'depot_tools',
2834 'status': 'OPEN',
2835 'owner': {'email': 'owner@e.mail'},
2836 'revisions': {
2837 'deadbeaf': {
2838 '_number': 6,
2839 },
2840 'beeeeeef': {
2841 '_number': 7,
2842 'fetch': {'http': {
2843 'url': 'https://chromium.googlesource.com/depot_tools',
2844 'ref': 'refs/changes/56/123456/7'
2845 }},
2846 },
2847 },
2848 }),
tandrii8c5a3532016-11-04 07:52:02 -07002849 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2850 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2851 ((['get_or_create_merge_base', 'feature', 'feature'],),
2852 'fake_ancestor_sha'),
2853 ((['GetChange', 'fake_ancestor_sha', None], ),
2854 git_cl.presubmit_support.GitChange(
2855 '', '', '', '', '', '', '', '')),
2856 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2857 ((['DoGetTryMasters'], ), None),
2858 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2859 ]
2860 out = StringIO.StringIO()
2861 self.mock(git_cl.sys, 'stdout', out)
2862 self.assertEqual(0, git_cl.main(['try']))
2863 self.assertEqual(
2864 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002865 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002866 'https://chromium-review.googlesource.com/123456\n')
2867
2868 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2869 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2870 lambda _: {
2871 'owner_email': 'owner@e.mail',
2872 'private': False,
2873 'closed': False,
2874 'project': 'depot_tools',
2875 'patchsets': [20001],
2876 })
tandriide281ae2016-10-12 06:02:30 -07002877 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2878 self.calls = [
2879 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2880 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2881 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2882 ((['git', 'config', 'rietveld.server'],),
2883 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002884 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002885 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002886 ]
2887
2888 def _buildbucket_retry(*_, **kw):
2889 # self.maxDiff = 10000
2890 body = json.loads(kw['body'])
2891 self.assertEqual(len(body['builds']), 1)
2892 build = body['builds'][0]
2893 params = json.loads(build.pop('parameters_json'))
2894 self.assertEqual(params, {
2895 u'builder_name': u'win',
2896 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2897 u'revision': None}],
2898 u'properties': {
2899 u'category': u'git_cl_try',
2900 u'issue': 123,
2901 u'key': u'val',
2902 u'json': [{u'a': 1}, None],
2903 u'master': u'tryserver.chromium',
2904 u'patch_project': u'depot_tools',
2905 u'patch_storage': u'rietveld',
2906 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002907 u'rietveld': u'https://codereview.chromium.org',
2908 }
2909 })
2910 self.assertEqual(build, {
2911 u'bucket': u'master.tryserver.chromium',
2912 u'client_operation_id': u'uuid4',
2913 u'tags': [u'builder:win',
2914 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002915 u'user_agent:git_cl_try',
2916 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002917 })
2918
2919 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2920
2921 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2922 self.assertEqual(0, git_cl.main([
2923 'try', '-m', 'tryserver.chromium', '-b', 'win',
2924 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2925 self.assertRegexpMatches(
2926 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002927 'Tried jobs on:\nBucket: master.tryserver.chromium')
2928
tandrii8c5a3532016-11-04 07:52:02 -07002929 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2930 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2931 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2932
tandrii8c5a3532016-11-04 07:52:02 -07002933 self.calls = [
2934 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2935 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2936 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2937 ((['git', 'config', 'branch.feature.gerritserver'],),
2938 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002939 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002940 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002941 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002942 'status': 'OPEN',
2943 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002944 'revisions': {
2945 'deadbeaf': {
2946 '_number': 6,
2947 },
2948 'beeeeeef': {
2949 '_number': 7,
2950 'fetch': {'http': {
2951 'url': 'https://chromium.googlesource.com/depot_tools',
2952 'ref': 'refs/changes/56/123456/7'
2953 }},
2954 },
2955 },
2956 }),
2957 ]
2958
2959 def _buildbucket_retry(*_, **kw):
2960 # self.maxDiff = 10000
2961 body = json.loads(kw['body'])
2962 self.assertEqual(len(body['builds']), 1)
2963 build = body['builds'][0]
2964 params = json.loads(build.pop('parameters_json'))
2965 self.assertEqual(params, {
2966 u'builder_name': u'win',
2967 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2968 u'revision': None}],
2969 u'properties': {
2970 u'category': u'git_cl_try',
2971 u'key': u'val',
2972 u'json': [{u'a': 1}, None],
2973 u'master': u'tryserver.chromium',
2974
2975 u'patch_gerrit_url':
2976 u'https://chromium-review.googlesource.com',
2977 u'patch_issue': 123456,
2978 u'patch_project': u'depot_tools',
2979 u'patch_ref': u'refs/changes/56/123456/7',
2980 u'patch_repository_url':
2981 u'https://chromium.googlesource.com/depot_tools',
2982 u'patch_set': 7,
2983 u'patch_storage': u'gerrit',
2984 }
2985 })
2986 self.assertEqual(build, {
2987 u'bucket': u'master.tryserver.chromium',
2988 u'client_operation_id': u'uuid4',
2989 u'tags': [
2990 u'builder:win',
2991 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2992 u'user_agent:git_cl_try',
2993 u'master:tryserver.chromium'],
2994 })
2995
2996 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2997
2998 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2999 self.assertEqual(0, git_cl.main([
3000 'try', '-m', 'tryserver.chromium', '-b', 'win',
3001 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
3002 self.assertRegexpMatches(
3003 git_cl.sys.stdout.getvalue(),
3004 'Tried jobs on:\nBucket: master.tryserver.chromium')
3005
borenet6c0efe62016-10-19 08:13:29 -07003006 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07003007 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
3008 lambda _: {
3009 'owner_email': 'owner@e.mail',
3010 'private': False,
3011 'closed': False,
3012 'project': 'depot_tools',
3013 'patchsets': [20001],
3014 })
borenet6c0efe62016-10-19 08:13:29 -07003015 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
3016 self.calls = [
3017 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3018 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3019 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3020 ((['git', 'config', 'rietveld.server'],),
3021 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07003022 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07003023 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07003024 ]
3025
3026 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07003027 body = json.loads(kw['body'])
3028 self.assertEqual(len(body['builds']), 1)
3029 build = body['builds'][0]
3030 params = json.loads(build.pop('parameters_json'))
3031 self.assertEqual(params, {
3032 u'builder_name': u'win',
3033 u'changes': [{u'author': {u'email': u'owner@e.mail'},
3034 u'revision': None}],
3035 u'properties': {
3036 u'category': u'git_cl_try',
3037 u'issue': 123,
3038 u'patch_project': u'depot_tools',
3039 u'patch_storage': u'rietveld',
3040 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07003041 u'rietveld': u'https://codereview.chromium.org',
3042 }
3043 })
3044 self.assertEqual(build, {
3045 u'bucket': u'test.bucket',
3046 u'client_operation_id': u'uuid4',
3047 u'tags': [u'builder:win',
3048 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
3049 u'user_agent:git_cl_try'],
3050 })
3051
3052 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3053
3054 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3055 self.assertEqual(0, git_cl.main([
3056 'try', '-B', 'test.bucket', '-b', 'win']))
3057 self.assertRegexpMatches(
3058 git_cl.sys.stdout.getvalue(),
3059 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07003060
qyearsley123a4682016-10-26 09:12:17 -07003061 def test_git_cl_try_bots_on_multiple_masters(self):
3062 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
3063 self.calls = [
3064 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3065 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
3066 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3067 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07003068 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07003069 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
3070 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3071 ]
3072
3073 def _buildbucket_retry(*_, **kw):
3074 body = json.loads(kw['body'])
3075 self.assertEqual(len(body['builds']), 2)
3076
3077 first_build_params = json.loads(body['builds'][0]['parameters_json'])
3078 self.assertEqual(first_build_params['builder_name'], 'builder1')
3079 self.assertEqual(first_build_params['properties']['master'], 'master1')
3080
3081 first_build_params = json.loads(body['builds'][1]['parameters_json'])
3082 self.assertEqual(first_build_params['builder_name'], 'builder2')
3083 self.assertEqual(first_build_params['properties']['master'], 'master2')
3084
3085 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
3086
3087 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
3088 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
3089
3090 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3091 self.assertEqual(
3092 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
3093 self.assertEqual(
3094 git_cl.sys.stdout.getvalue(),
3095 'Tried jobs on:\n'
3096 'Bucket: master.master1\n'
3097 ' builder1: []\n'
3098 'Bucket: master.master2\n'
3099 ' builder2: []\n'
3100 'To see results here, run: git cl try-results\n'
3101 'To see results in browser, run: git cl web\n')
3102
tandrii16e0b4e2016-06-07 10:34:28 -07003103 def _common_GerritCommitMsgHookCheck(self):
3104 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
3105 self.mock(git_cl.os.path, 'abspath',
3106 lambda path: self._mocked_call(['abspath', path]))
3107 self.mock(git_cl.os.path, 'exists',
3108 lambda path: self._mocked_call(['exists', path]))
3109 self.mock(git_cl.gclient_utils, 'FileRead',
3110 lambda path: self._mocked_call(['FileRead', path]))
3111 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
3112 lambda path: self._mocked_call(['rm_file_or_tree', path]))
3113 self.calls = [
3114 ((['git', 'rev-parse', '--show-cdup'],), '../'),
3115 ((['abspath', '../'],), '/abs/git_repo_root'),
3116 ]
3117 return git_cl.Changelist(codereview='gerrit', issue=123)
3118
3119 def test_GerritCommitMsgHookCheck_custom_hook(self):
3120 cl = self._common_GerritCommitMsgHookCheck()
3121 self.calls += [
3122 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3123 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3124 '#!/bin/sh\necho "custom hook"')
3125 ]
3126 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3127
3128 def test_GerritCommitMsgHookCheck_not_exists(self):
3129 cl = self._common_GerritCommitMsgHookCheck()
3130 self.calls += [
3131 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
3132 ]
3133 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3134
3135 def test_GerritCommitMsgHookCheck(self):
3136 cl = self._common_GerritCommitMsgHookCheck()
3137 self.calls += [
3138 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
3139 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3140 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01003141 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07003142 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
3143 ''),
3144 ]
3145 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
3146
tandriic4344b52016-08-29 06:04:54 -07003147 def test_GerritCmdLand(self):
3148 self.calls += [
3149 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3150 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
3151 'deadbeaf'),
3152 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
3153 ((['git', 'config', 'branch.feature.gerritserver'],),
3154 'chromium-review.googlesource.com'),
3155 ]
3156 cl = git_cl.Changelist(issue=123, codereview='gerrit')
3157 cl._codereview_impl._GetChangeDetail = lambda _: {
3158 'labels': {},
3159 'current_revision': 'deadbeaf',
3160 }
agable32978d92016-11-01 12:55:02 -07003161 cl._codereview_impl._GetChangeCommit = lambda: {
3162 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08003163 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07003164 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
3165 }
tandriic4344b52016-08-29 06:04:54 -07003166 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07003167 out = StringIO.StringIO()
3168 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07003169 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07003170 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003171 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07003172
tandrii221ab252016-10-06 08:12:04 -07003173 BUILDBUCKET_BUILDS_MAP = {
3174 '9000': {
3175 'id': '9000',
3176 'status': 'STARTED',
3177 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3178 'result_details_json': '{"properties": {}}',
3179 'bucket': 'master.x.y',
3180 'created_by': 'user:someone@chromium.org',
3181 'created_ts': '147200002222000',
3182 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3183 },
3184 '8000': {
3185 'id': '8000',
3186 'status': 'COMPLETED',
3187 'result': 'FAILURE',
3188 'failure_reason': 'BUILD_FAILURE',
3189 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3190 'result_details_json': '{"properties": {}}',
3191 'bucket': 'master.x.y',
3192 'created_by': 'user:someone@chromium.org',
3193 'created_ts': '147200001111000',
3194 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3195 },
3196 }
3197
3198 def test_write_try_results_json(self):
3199 expected_output = [
3200 {
3201 'buildbucket_id': '8000',
3202 'bucket': 'master.x.y',
3203 'builder_name': 'my-builder',
3204 'status': 'COMPLETED',
3205 'result': 'FAILURE',
3206 'failure_reason': 'BUILD_FAILURE',
3207 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3208 },
3209 {
3210 'buildbucket_id': '9000',
3211 'bucket': 'master.x.y',
3212 'builder_name': 'my-builder',
3213 'status': 'STARTED',
3214 'result': None,
3215 'failure_reason': None,
3216 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3217 }
3218 ]
3219 self.calls = [(('write_json', 'output.json', expected_output), '')]
3220 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3221
tandrii45b2a582016-10-11 03:14:16 -07003222 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003223 out = StringIO.StringIO()
3224 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003225 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3226 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003227 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3228 self._mocked_call(['get_authenticator_for_host', host]))
3229 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3230 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003231
3232 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3233 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003234 self.calls += [
3235 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3236 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3237 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3238 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3239 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3240 ((['git', 'config', 'branch.feature.rietveldserver'],),
3241 'codereview.example.com'),
3242 ((['get_authenticator_for_host', 'codereview.example.com'],),
3243 AuthenticatorMock()),
3244 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3245
3246 def test_fetch_try_jobs_none_rietveld(self):
3247 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003248 # Simulate that user isn't logged in.
3249 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003250 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003251 self.assertRegexpMatches(sys.stdout.getvalue(),
3252 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003253 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3254
3255 def test_fetch_try_jobs_some_rietveld(self):
3256 self._setup_fetch_try_jobs_rietveld({
3257 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3258 })
3259 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003260 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3261 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3262 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3263
3264 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3265 self._setup_fetch_try_jobs(most_recent_patchset=13)
3266 self.calls += [
3267 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3268 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3269 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003270 # TODO(tandrii): Uncomment the below if we decide to support checking
3271 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003272 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003273 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003274 ((['git', 'config', 'branch.feature.gerritserver'],),
3275 'https://x-review.googlesource.com'),
3276 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3277 AuthenticatorMock()),
3278 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3279
3280 def test_fetch_try_jobs_none_gerrit(self):
3281 self._setup_fetch_try_jobs_gerrit({})
3282 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003283 # TODO(tandrii): Uncomment the below if we decide to support checking
3284 # patchsets for Gerrit.
3285 # self.assertRegexpMatches(
3286 # sys.stdout.getvalue(),
3287 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003288 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3289
3290 def test_fetch_try_jobs_some_gerrit(self):
3291 self._setup_fetch_try_jobs_gerrit({
3292 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3293 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003294 # TODO(tandrii): Uncomment the below if we decide to support checking
3295 # patchsets for Gerrit.
3296 # self.calls.remove(
3297 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003298 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3299
3300 # ... and doesn't result in warning.
3301 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3302 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003303 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3304 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3305
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003306 def _mock_gerrit_changes_for_detail_cache(self):
3307 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003308
3309 def test_gerrit_change_detail_cache_normalize(self):
3310 self._mock_gerrit_changes_for_detail_cache()
3311 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003312 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003313 ]
3314 cl = git_cl.Changelist(codereview='gerrit')
3315 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3316 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3317 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3318 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3319
3320 def test_gerrit_change_detail_cache_simple(self):
3321 self._mock_gerrit_changes_for_detail_cache()
3322 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003323 (('GetChangeDetail', 'host', '1', []), 'a'),
3324 (('GetChangeDetail', 'host', '2', []), 'b'),
3325 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003326 ]
3327 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3328 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3329 self.assertEqual(cl._GetChangeDetail(), 'a')
3330 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003331 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003332 self.assertEqual(cl._GetChangeDetail(), 'a')
3333 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3334
3335 def test_gerrit_change_detail_cache_options(self):
3336 self._mock_gerrit_changes_for_detail_cache()
3337 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003338 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3339 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3340 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3341 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003342 ]
3343 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3344 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3345 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3346 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3347 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3348 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3349 self.assertEqual(cl._GetChangeDetail(), 'cab')
3350
3351 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3352 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3353 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3354 self.assertEqual(cl._GetChangeDetail(), 'cab')
3355
3356 # Finally, no_cache should invalidate all caches for given change.
3357 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3358 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3359
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003360 def test_gerrit_description_caching(self):
3361 def gen_detail(rev, desc):
3362 return {
3363 'current_revision': rev,
3364 'revisions': {rev: {'commit': {'message': desc}}}
3365 }
3366 self.calls = [
3367 (('GetChangeDetail', 'host', '1',
3368 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3369 gen_detail('rev1', 'desc1')),
3370 (('GetChangeDetail', 'host', '1',
3371 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3372 gen_detail('rev2', 'desc2')),
3373 ]
3374
3375 self._mock_gerrit_changes_for_detail_cache()
3376 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3377 self.assertEqual(cl.GetDescription(), 'desc1')
3378 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3379 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003380
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003381 def test_print_current_creds(self):
3382 class CookiesAuthenticatorMock(object):
3383 def __init__(self):
3384 self.gitcookies = {
3385 'host.googlesource.com': ('user', 'pass'),
3386 'host-review.googlesource.com': ('user', 'pass'),
3387 }
3388 self.netrc = self
3389 self.netrc.hosts = {
3390 'github.com': ('user2', None, 'pass2'),
3391 'host2.googlesource.com': ('user3', None, 'pass'),
3392 }
3393 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3394 CookiesAuthenticatorMock)
3395 self.mock(sys, 'stdout', StringIO.StringIO())
3396 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3397 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3398 ' Host\t User\t Which file',
3399 '============================\t=====\t===========',
3400 'host-review.googlesource.com\t user\t.gitcookies',
3401 ' host.googlesource.com\t user\t.gitcookies',
3402 ' host2.googlesource.com\tuser3\t .netrc',
3403 ])
3404 sys.stdout.buf = ''
3405 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3406 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3407 ' Host\tUser\t Which file',
3408 '============================\t====\t===========',
3409 'host-review.googlesource.com\tuser\t.gitcookies',
3410 ' host.googlesource.com\tuser\t.gitcookies',
3411 ])
3412
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003413 def _common_creds_check_mocks(self):
3414 def exists_mock(path):
3415 dirname = os.path.dirname(path)
3416 if dirname == os.path.expanduser('~'):
3417 dirname = '~'
3418 base = os.path.basename(path)
3419 if base in ('.netrc', '.gitcookies'):
3420 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3421 # git cl also checks for existence other files not relevant to this test.
3422 return None
3423 self.mock(os.path, 'exists', exists_mock)
3424 self.mock(sys, 'stdout', StringIO.StringIO())
3425
3426 def test_creds_check_gitcookies_not_configured(self):
3427 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003428 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003429 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003430 self.calls = [
3431 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3432 (('os.path.exists', '~/.netrc'), True),
3433 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3434 'or Ctrl+C to abort'), ''),
3435 ((['git', 'config', '--global', 'http.cookiefile',
3436 os.path.expanduser('~/.gitcookies')], ), ''),
3437 ]
3438 self.assertEqual(0, git_cl.main(['creds-check']))
3439 self.assertRegexpMatches(
3440 sys.stdout.getvalue(),
3441 '^You seem to be using outdated .netrc for git credentials:')
3442 self.assertRegexpMatches(
3443 sys.stdout.getvalue(),
3444 '\nConfigured git to use .gitcookies from')
3445
3446 def test_creds_check_gitcookies_configured_custom_broken(self):
3447 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003448 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003449 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003450 self.calls = [
3451 ((['git', 'config', '--global', 'http.cookiefile'],),
3452 '/custom/.gitcookies'),
3453 (('os.path.exists', '/custom/.gitcookies'), False),
3454 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3455 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3456 ((['git', 'config', '--global', 'http.cookiefile',
3457 os.path.expanduser('~/.gitcookies')], ), ''),
3458 ]
3459 self.assertEqual(0, git_cl.main(['creds-check']))
3460 self.assertRegexpMatches(
3461 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003462 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003463 self.assertRegexpMatches(
3464 sys.stdout.getvalue(),
3465 'However, your configured .gitcookies file is missing.')
3466
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003467 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003468 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003469 lambda _, message, publish: self._mocked_call(
3470 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003471 self.calls = [
3472 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3473 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003474 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003475 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003476 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3477 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003478
3479 def test_git_cl_comment_add_gerrit(self):
3480 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003481 lambda host, change, msg, ready:
3482 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003483 self.calls = [
3484 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3485 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3486 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3487 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3488 'origin/master'),
3489 ((['git', 'config', 'remote.origin.url'],),
3490 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003491 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3492 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003493 ]
3494 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3495 '-a', 'msg']))
3496
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003497 def test_git_cl_comments_fetch_rietveld(self):
3498 self.mock(sys, 'stdout', StringIO.StringIO())
3499 self.calls = [
3500 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3501 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3502 ] * 2
3503 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3504 'messages': [
3505 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3506 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3507 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3508 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3509 # Intentionally wrong order here.
3510 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3511 'disapproval': False, 'approval': False,
3512 'sender': 'owner@example.com'},
3513 ],
3514 'owner_email': 'owner@example.com',
3515 })
3516 expected_comments_summary = [
3517 git_cl._CommentSummary(
3518 message='lgtm',
3519 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3520 disapproval=False, approval=True, sender='r@example.com'),
3521 git_cl._CommentSummary(
3522 message='not lgtm',
3523 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3524 disapproval=True, approval=False, sender='r2@example.com'),
3525 # Note: same order as in whatever Rietveld returns.
3526 git_cl._CommentSummary(
3527 message='PTAL',
3528 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3529 disapproval=False, approval=False, sender='owner@example.com'),
3530 ]
3531 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3532 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3533
3534 with git_cl.gclient_utils.temporary_directory() as tempdir:
3535 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3536 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3537 '-j', out_file]))
3538 with open(out_file) as f:
3539 read = json.load(f)
3540 self.assertEqual(len(read), 3)
3541 self.assertEqual(read[0], {
3542 'date': '2000-03-13 20:49:34.515270',
3543 'message': 'PTAL',
3544 'approval': False,
3545 'disapproval': False,
3546 'sender': 'owner@example.com'})
3547 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3548 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3549
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003550 def test_git_cl_comments_fetch_gerrit(self):
3551 self.mock(sys, 'stdout', StringIO.StringIO())
3552 self.calls = [
3553 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3554 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3555 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3556 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3557 'origin/master'),
3558 ((['git', 'config', 'remote.origin.url'],),
3559 'https://chromium.googlesource.com/infra/infra'),
3560 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3561 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003562 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003563 'messages': [
3564 {
3565 u'_revision_number': 1,
3566 u'author': {
3567 u'_account_id': 1111084,
3568 u'email': u'commit-bot@chromium.org',
3569 u'name': u'Commit Bot'
3570 },
3571 u'date': u'2017-03-15 20:08:45.000000000',
3572 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003573 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003574 u'tag': u'autogenerated:cq:dry-run'
3575 },
3576 {
3577 u'_revision_number': 2,
3578 u'author': {
3579 u'_account_id': 11151243,
3580 u'email': u'owner@example.com',
3581 u'name': u'owner'
3582 },
3583 u'date': u'2017-03-16 20:00:41.000000000',
3584 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3585 u'message': u'PTAL',
3586 },
3587 {
3588 u'_revision_number': 2,
3589 u'author': {
3590 u'_account_id': 148512 ,
3591 u'email': u'reviewer@example.com',
3592 u'name': u'reviewer'
3593 },
3594 u'date': u'2017-03-17 05:19:37.500000000',
3595 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3596 u'message': u'Patch Set 2: Code-Review+1',
3597 },
3598 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003599 }),
3600 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3601 '/COMMIT_MSG': [
3602 {
3603 'author': {'email': u'reviewer@example.com'},
3604 'updated': u'2017-03-17 05:19:37.500000000',
3605 'patch_set': 2,
3606 'side': 'REVISION',
3607 'message': 'Please include a bug link',
3608 },
3609 ],
3610 'codereview.settings': [
3611 {
3612 'author': {'email': u'owner@example.com'},
3613 'updated': u'2017-03-16 20:00:41.000000000',
3614 'patch_set': 2,
3615 'side': 'PARENT',
3616 'line': 42,
3617 'message': 'I removed this because it is bad',
3618 },
3619 ]
3620 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003621 ] * 2
3622 expected_comments_summary = [
3623 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003624 message=(
3625 u'PTAL\n' +
3626 u'\n' +
3627 u'codereview.settings\n' +
3628 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3629 u'c/1/2/codereview.settings#b42\n' +
3630 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003631 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3632 disapproval=False, approval=False, sender=u'owner@example.com'),
3633 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003634 message=(
3635 u'Patch Set 2: Code-Review+1\n' +
3636 u'\n' +
3637 u'/COMMIT_MSG\n' +
3638 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3639 u'c/1/2//COMMIT_MSG#\n' +
3640 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003641 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3642 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3643 ]
3644 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3645 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3646
3647 with git_cl.gclient_utils.temporary_directory() as tempdir:
3648 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3649 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3650 '-j', out_file]))
3651 with open(out_file) as f:
3652 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003653 self.assertEqual(len(read), 2)
3654 self.assertEqual(read[0], {
3655 u'date': u'2017-03-16 20:00:41.000000',
3656 u'message': (
3657 u'PTAL\n' +
3658 u'\n' +
3659 u'codereview.settings\n' +
3660 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3661 u'c/1/2/codereview.settings#b42\n' +
3662 u' I removed this because it is bad\n'),
3663 u'approval': False,
3664 u'disapproval': False,
3665 u'sender': u'owner@example.com'})
3666 self.assertEqual(read[1], {
3667 u'date': u'2017-03-17 05:19:37.500000',
3668 u'message': (
3669 u'Patch Set 2: Code-Review+1\n' +
3670 u'\n' +
3671 u'/COMMIT_MSG\n' +
3672 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3673 u'c/1/2//COMMIT_MSG#\n' +
3674 u' Please include a bug link\n'),
3675 u'approval': False,
3676 u'disapproval': False,
3677 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003678
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003679
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003680if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003681 logging.basicConfig(
3682 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003683 unittest.main()