blob: 58ec847e6ab8730e6ae302c92d5131f0085b73d1 [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 = []
Daniel Cheng7227d212017-11-17 08:12:37 -080074 self.more_cc = ['chromium-reviews+test-more-cc@chromium.org']
75
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000076 @staticmethod
77 def should_continue():
78 return True
79
80
81class RietveldMock(object):
82 def __init__(self, *args, **kwargs):
83 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000084
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000085 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080086 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000087 return 'Issue: %d' % issue
88
maruel@chromium.org78936cb2013-04-11 00:17:52 +000089 @staticmethod
90 def get_issue_properties(_issue, _messages):
91 return {
92 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
93 'messages': [
94 {
95 'approval': True,
Aaron Gablea1bab272017-04-11 16:38:18 -070096 'disapproval': False,
maruel@chromium.org78936cb2013-04-11 00:17:52 +000097 'sender': 'john@chromium.org',
98 },
99 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100100 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000101 }
102
iannuccie53c9352016-08-17 14:40:40 -0700103 @staticmethod
104 def close_issue(_issue):
105 return 'Closed'
106
skobes6468b902016-10-24 08:45:10 -0700107 @staticmethod
108 def get_patch(issue, patchset):
109 return 'patch set from issue %s patchset %s' % (issue, patchset)
110
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100111 @staticmethod
112 def update_description(_issue, _description):
113 return 'Updated'
114
115 @staticmethod
116 def add_comment(_issue, _comment):
117 return 'Commented'
118
119
skobes6468b902016-10-24 08:45:10 -0700120class GitCheckoutMock(object):
121 def __init__(self, *args, **kwargs):
122 pass
123
124 @staticmethod
125 def reset():
126 GitCheckoutMock.conflict = False
127
128 def apply_patch(self, p):
129 if GitCheckoutMock.conflict:
130 raise Exception('failed')
131
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000132
133class WatchlistsMock(object):
134 def __init__(self, _):
135 pass
136 @staticmethod
137 def GetWatchersForPaths(_):
138 return ['joe@example.com']
139
140
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000141class CodereviewSettingsFileMock(object):
142 def __init__(self):
143 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800144 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000145 def read(self):
146 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000147 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000148
149
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000150class AuthenticatorMock(object):
151 def __init__(self, *_args):
152 pass
153 def has_cached_credentials(self):
154 return True
tandrii221ab252016-10-06 08:12:04 -0700155 def authorize(self, http):
156 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000157
158
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100159def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000160 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
161
162 Usage:
163 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100164 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000165
166 OR
167 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100168 CookiesAuthenticatorMockFactory(
169 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000170 """
171 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800172 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000173 # Intentionally not calling super() because it reads actual cookie files.
174 pass
175 @classmethod
176 def get_gitcookies_path(cls):
177 return '~/.gitcookies'
178 @classmethod
179 def get_netrc_path(cls):
180 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100181 def _get_auth_for_host(self, host):
182 if same_auth:
183 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000184 return (hosts_with_creds or {}).get(host)
185 return CookiesAuthenticatorMock
186
Aaron Gable9a03ae02017-11-03 11:31:07 -0700187
kmarshall9249e012016-08-23 12:02:16 -0700188class MockChangelistWithBranchAndIssue():
189 def __init__(self, branch, issue):
190 self.branch = branch
191 self.issue = issue
192 def GetBranch(self):
193 return self.branch
194 def GetIssue(self):
195 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000196
tandriic2405f52016-10-10 08:13:15 -0700197
198class SystemExitMock(Exception):
199 pass
200
201
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000202class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100203 def test_get_description(self):
204 cl = git_cl.Changelist(issue=1, codereview='rietveld',
205 codereview_host='host')
206 cl.description = 'x'
207 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800208 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100209 self.assertEquals(cl.GetDescription(), 'x')
210 self.assertEquals(cl.GetDescription(force=True), 'y')
211 self.assertEquals(cl.GetDescription(), 'y')
212
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700213 def test_description_footers(self):
214 cl = git_cl.Changelist(issue=1, codereview='gerrit',
215 codereview_host='host')
216 cl.description = '\n'.join([
217 'This is some message',
218 '',
219 'It has some lines',
220 'and, also',
221 '',
222 'Some: Really',
223 'Awesome: Footers',
224 ])
225 cl.has_description = True
226 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
227 msg, footers = cl.GetDescriptionFooters()
228 self.assertEquals(
229 msg, ['This is some message', '', 'It has some lines', 'and, also'])
230 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
231
232 msg.append('wut')
233 footers.append(('gnarly-dude', 'beans'))
234 cl.UpdateDescriptionFooters(msg, footers)
235 self.assertEquals(cl.GetDescription().splitlines(), [
236 'This is some message',
237 '',
238 'It has some lines',
239 'and, also',
240 'wut'
241 '',
242 'Some: Really',
243 'Awesome: Footers',
244 'Gnarly-Dude: beans',
245 ])
246
tandriif9aefb72016-07-01 09:06:51 -0700247 def test_get_bug_line_values(self):
248 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
249 self.assertEqual(f('', ''), [])
250 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
251 self.assertEqual(f('v8', '456'), ['v8:456'])
252 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
253 # Not nice, but not worth carying.
254 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
255 ['v8:456', 'chromium:123', 'v8:123'])
256
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100257 def _test_git_number(self, parent_msg, dest_ref, child_msg,
258 parent_hash='parenthash'):
259 desc = git_cl.ChangeDescription(child_msg)
260 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
261 return desc.description
262
263 def assertEqualByLine(self, actual, expected):
264 self.assertEqual(actual.splitlines(), expected.splitlines())
265
266 def test_git_number_bad_parent(self):
267 with self.assertRaises(ValueError):
268 self._test_git_number('Parent', 'refs/heads/master', 'Child')
269
270 def test_git_number_bad_parent_footer(self):
271 with self.assertRaises(AssertionError):
272 self._test_git_number(
273 'Parent\n'
274 '\n'
275 'Cr-Commit-Position: wrong',
276 'refs/heads/master', 'Child')
277
278 def test_git_number_bad_lineage_ignored(self):
279 actual = self._test_git_number(
280 'Parent\n'
281 '\n'
282 'Cr-Commit-Position: refs/heads/master@{#1}\n'
283 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
284 'refs/heads/master', 'Child')
285 self.assertEqualByLine(
286 actual,
287 'Child\n'
288 '\n'
289 'Cr-Commit-Position: refs/heads/master@{#2}\n'
290 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
291
292 def test_git_number_same_branch(self):
293 actual = self._test_git_number(
294 'Parent\n'
295 '\n'
296 'Cr-Commit-Position: refs/heads/master@{#12}',
297 dest_ref='refs/heads/master',
298 child_msg='Child')
299 self.assertEqualByLine(
300 actual,
301 'Child\n'
302 '\n'
303 'Cr-Commit-Position: refs/heads/master@{#13}')
304
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200305 def test_git_number_same_branch_mixed_footers(self):
306 actual = self._test_git_number(
307 'Parent\n'
308 '\n'
309 'Cr-Commit-Position: refs/heads/master@{#12}',
310 dest_ref='refs/heads/master',
311 child_msg='Child\n'
312 '\n'
313 'Broken-by: design\n'
314 'BUG=123')
315 self.assertEqualByLine(
316 actual,
317 'Child\n'
318 '\n'
319 'Broken-by: design\n'
320 'BUG=123\n'
321 'Cr-Commit-Position: refs/heads/master@{#13}')
322
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100323 def test_git_number_same_branch_with_originals(self):
324 actual = self._test_git_number(
325 'Parent\n'
326 '\n'
327 'Cr-Commit-Position: refs/heads/master@{#12}',
328 dest_ref='refs/heads/master',
329 child_msg='Child\n'
330 '\n'
331 'Some users are smart and insert their own footers\n'
332 '\n'
333 'Cr-Whatever: value\n'
334 'Cr-Commit-Position: refs/copy/paste@{#22}')
335 self.assertEqualByLine(
336 actual,
337 'Child\n'
338 '\n'
339 'Some users are smart and insert their own footers\n'
340 '\n'
341 'Cr-Original-Whatever: value\n'
342 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
343 'Cr-Commit-Position: refs/heads/master@{#13}')
344
345 def test_git_number_new_branch(self):
346 actual = self._test_git_number(
347 'Parent\n'
348 '\n'
349 'Cr-Commit-Position: refs/heads/master@{#12}',
350 dest_ref='refs/heads/branch',
351 child_msg='Child')
352 self.assertEqualByLine(
353 actual,
354 'Child\n'
355 '\n'
356 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
357 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
358
359 def test_git_number_lineage(self):
360 actual = self._test_git_number(
361 'Parent\n'
362 '\n'
363 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
364 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
365 dest_ref='refs/heads/branch',
366 child_msg='Child')
367 self.assertEqualByLine(
368 actual,
369 'Child\n'
370 '\n'
371 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
372 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
373
374 def test_git_number_moooooooore_lineage(self):
375 actual = self._test_git_number(
376 'Parent\n'
377 '\n'
378 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
379 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
380 dest_ref='refs/heads/mooore',
381 child_msg='Child')
382 self.assertEqualByLine(
383 actual,
384 'Child\n'
385 '\n'
386 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
387 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
388 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
389
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100390 def test_git_number_ever_moooooooore_lineage(self):
Robert Iannucci456b0d62018-03-13 19:15:50 -0700391 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100392 actual = self._test_git_number(
393 'CQ commit on fresh new branch + numbering.\n'
394 '\n'
395 'NOTRY=True\n'
396 'NOPRESUBMIT=True\n'
397 'BUG=\n'
398 '\n'
399 'Review-Url: https://codereview.chromium.org/2577703003\n'
400 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
401 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
402 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
403 dest_ref='refs/heads/gnumb-test/cl',
404 child_msg='git cl on fresh new branch + numbering.\n'
405 '\n'
406 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
407 self.assertEqualByLine(
408 actual,
409 'git cl on fresh new branch + numbering.\n'
410 '\n'
411 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
412 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
413 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
414 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
415 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100416
417 def test_git_number_cherry_pick(self):
418 actual = self._test_git_number(
419 'Parent\n'
420 '\n'
421 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
422 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
423 dest_ref='refs/heads/branch',
424 child_msg='Child, which is cherry-pick from master\n'
425 '\n'
426 'Cr-Commit-Position: refs/heads/master@{#100}\n'
427 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
428 self.assertEqualByLine(
429 actual,
430 'Child, which is cherry-pick from master\n'
431 '\n'
432 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
433 '\n'
434 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
435 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
436 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
437
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000438
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200439class TestParseIssueURL(unittest.TestCase):
440 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
441 codereview=None, fail=False):
442 self.assertIsNotNone(parsed)
443 if fail:
444 self.assertFalse(parsed.valid)
445 return
446 self.assertTrue(parsed.valid)
447 self.assertEqual(parsed.issue, issue)
448 self.assertEqual(parsed.patchset, patchset)
449 self.assertEqual(parsed.hostname, hostname)
450 self.assertEqual(parsed.codereview, codereview)
451
452 def _run_and_validate(self, func, url, *args, **kwargs):
453 result = func(urlparse.urlparse(url))
454 if kwargs.pop('fail', False):
455 self.assertIsNone(result)
456 return None
457 self._validate(result, *args, fail=False, **kwargs)
458
459 def test_rietveld(self):
460 def test(url, *args, **kwargs):
461 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
462 *args, codereview='rietveld', **kwargs)
463
464 test('http://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/',
469 123, None, 'codereview.chromium.org')
470 test('https://codereview.chromium.org/123/whatever',
471 123, None, 'codereview.chromium.org')
472 test('https://codereview.chromium.org/123/#ps20001',
473 123, 20001, 'codereview.chromium.org')
474 test('http://codereview.chromium.org/download/issue123_4.diff',
475 123, 4, 'codereview.chromium.org')
476 # This looks like bad Gerrit, but is actually valid Rietveld, too.
477 test('https://chrome-review.source.com/123/4/',
478 123, None, 'chrome-review.source.com')
479
480 test('https://codereview.chromium.org/deadbeaf', fail=True)
481 test('https://codereview.chromium.org/api/123', fail=True)
482 test('bad://codereview.chromium.org/123', fail=True)
483 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
484
485 def test_gerrit(self):
486 def test(url, issue=None, patchset=None, hostname=None, fail=None):
487 self._test_ParseIssueUrl(
488 git_cl._GerritChangelistImpl.ParseIssueURL,
489 url, issue, patchset, hostname, fail)
490 def test(url, *args, **kwargs):
491 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
492 *args, codereview='gerrit', **kwargs)
493
494 test('http://chrome-review.source.com/c/123',
495 123, None, 'chrome-review.source.com')
496 test('https://chrome-review.source.com/c/123/',
497 123, None, '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/c/123/4',
503 123, 4, 'chrome-review.source.com')
504 test('https://chrome-review.source.com/123',
505 123, None, 'chrome-review.source.com')
506 test('https://chrome-review.source.com/123/4',
507 123, 4, 'chrome-review.source.com')
508
509 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
510 test('https://chrome-review.source.com/c/abc/', fail=True)
511 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
512
513 def test_ParseIssueNumberArgument(self):
514 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200515 codereview_hint = kwargs.pop('hint', None)
516 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
517 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200518
519 test('123', 123)
520 test('', fail=True)
521 test('abc', fail=True)
522 test('123/1', fail=True)
523 test('123a', fail=True)
524 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
525 # Rietveld.
526 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200527 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200528 test('https://codereview.source.com/123',
529 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200530 # Matches both, but we take Gerrit if specifically requested.
531 test('https://codereview.source.com/123',
532 123, None, 'codereview.source.com', 'gerrit',
533 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200534 # Gerrrit.
535 test('https://chrome-review.source.com/c/123/4',
536 123, 4, 'chrome-review.source.com', 'gerrit')
537 test('https://chrome-review.source.com/bad/123/4', fail=True)
538
539
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100540class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100541 def setUp(self):
542 super(GitCookiesCheckerTest, self).setUp()
543 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100544 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100545
546 def mock_hosts_creds(self, subhost_identity_pairs):
547 def ensure_googlesource(h):
548 if not h.endswith(self.c._GOOGLESOURCE):
549 assert not h.endswith('.')
550 return h + '.' + self.c._GOOGLESOURCE
551 return h
552 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
553 for h, i in subhost_identity_pairs]
554
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200555 def test_identity_parsing(self):
556 self.assertEqual(self.c._parse_identity('ldap.google.com'),
557 ('ldap', 'google.com'))
558 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
559 ('ldap', 'example.com'))
560 # Specical case because we know there are no subdomains in chromium.org.
561 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
562 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800563 # Pathological: ".period." can be either username OR domain, more likely
564 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200565 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
566 ('note', 'period.example.com'))
567
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100568 def test_analysis_nothing(self):
569 self.c._all_hosts = []
570 self.assertFalse(self.c.has_generic_host())
571 self.assertEqual(set(), self.c.get_conflicting_hosts())
572 self.assertEqual(set(), self.c.get_duplicated_hosts())
573 self.assertEqual(set(), self.c.get_partially_configured_hosts())
574 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
575
576 def test_analysis(self):
577 self.mock_hosts_creds([
578 ('.googlesource.com', 'git-example.chromium.org'),
579
580 ('chromium', 'git-example.google.com'),
581 ('chromium-review', 'git-example.google.com'),
582 ('chrome-internal', 'git-example.chromium.org'),
583 ('chrome-internal-review', 'git-example.chromium.org'),
584 ('conflict', 'git-example.google.com'),
585 ('conflict-review', 'git-example.chromium.org'),
586 ('dup', 'git-example.google.com'),
587 ('dup', 'git-example.google.com'),
588 ('dup-review', 'git-example.google.com'),
589 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200590 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100591 ])
592 self.assertTrue(self.c.has_generic_host())
593 self.assertEqual(set(['conflict.googlesource.com']),
594 self.c.get_conflicting_hosts())
595 self.assertEqual(set(['dup.googlesource.com']),
596 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200597 self.assertEqual(set(['partial.googlesource.com',
598 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100599 self.c.get_partially_configured_hosts())
600 self.assertEqual(set(['chromium.googlesource.com',
601 'chrome-internal.googlesource.com']),
602 self.c.get_hosts_with_wrong_identities())
603
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100604 def test_report_no_problems(self):
605 self.test_analysis_nothing()
606 self.mock(sys, 'stdout', StringIO.StringIO())
607 self.assertFalse(self.c.find_and_report_problems())
608 self.assertEqual(sys.stdout.getvalue(), '')
609
610 def test_report(self):
611 self.test_analysis()
612 self.mock(sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200613 self.mock(git_cl.gerrit_util.CookiesAuthenticator, 'get_gitcookies_path',
614 classmethod(lambda _: '~/.gitcookies'))
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100615 self.assertTrue(self.c.find_and_report_problems())
616 with open(os.path.join(os.path.dirname(__file__),
617 'git_cl_creds_check_report.txt')) as f:
618 expected = f.read()
619 def by_line(text):
620 return [l.rstrip() for l in text.rstrip().splitlines()]
Robert Iannucci456b0d62018-03-13 19:15:50 -0700621 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200622 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100623
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800624
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000625class TestGitCl(TestCase):
626 def setUp(self):
627 super(TestGitCl, self).setUp()
628 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700629 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000630 self.mock(subprocess2, 'call', self._mocked_call)
631 self.mock(subprocess2, 'check_call', self._mocked_call)
632 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700633 self.mock(subprocess2, 'communicate',
634 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000635 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000636 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000637 self.mock(git_common, 'get_or_create_merge_base',
638 lambda *a: (
639 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000640 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000641 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100642 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
643 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700644 self.mock(git_cl, 'write_json', lambda path, contents:
645 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000646 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000647 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000648 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700649 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
650 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000651 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000652 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000653 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100654 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
655 lambda *args, **kwargs: self._mocked_call(
656 'GetChangeDetail', *args, **kwargs))
Aaron Gable0ffdf2d2017-06-05 13:01:17 -0700657 self.mock(git_cl.gerrit_util, 'GetChangeComments',
658 lambda *args, **kwargs: self._mocked_call(
659 'GetChangeComments', *args, **kwargs))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100660 self.mock(git_cl.gerrit_util, 'AddReviewers',
Aaron Gable6dadfbf2017-05-09 14:27:58 -0700661 lambda h, i, reviewers, ccs, notify: self._mocked_call(
662 'AddReviewers', h, i, reviewers, ccs, notify))
Aaron Gablefd238082017-06-07 13:42:34 -0700663 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gablefc62f762017-07-17 11:12:07 -0700664 lambda h, i, msg=None, labels=None, notify=None:
665 self._mocked_call('SetReview', h, i, msg, labels, notify))
Andrii Shyshkalov733d4ec2018-04-19 11:48:58 -0700666 self.mock(git_cl.gerrit_util.LuciContextAuthenticator, 'is_luci',
667 staticmethod(lambda: False))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000668 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
669 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700670 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100671 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000672 # It's important to reset settings to not have inter-tests interference.
673 git_cl.settings = None
674
675 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000676 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100677 self.assertEquals([], self.calls)
678 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000679 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100680 raise
681 # Sadly, has_failed() returns True if this OR any other tests before this
682 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200683 git_cl.logging.error(
684 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100685 'There are un-consumed self.calls after this test has finished.\n'
686 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700687 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200688 'If you are already running only this test, then **first** fix the '
689 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100690 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700691 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100692 'and follow instructions above.\n' +
693 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000694 finally:
695 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000696
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000697 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000698 self.assertTrue(
699 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700700 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000701 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000702 expected_args, result = top
703
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000704 # Also logs otherwise it could get caught in a try/finally and be hard to
705 # diagnose.
706 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700707 N = 5
708 prior_calls = '\n '.join(
709 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
710 for i, c in enumerate(self._calls_done[-N:]))
711 following_calls = '\n '.join(
712 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
713 for i, c in enumerate(self.calls[:N]))
714 extended_msg = (
715 'A few prior calls:\n %s\n\n'
716 'This (expected):\n @%d: %r\n'
717 'This (actual):\n @%d: %r\n\n'
718 'A few following expected calls:\n %s' %
719 (prior_calls, len(self._calls_done), expected_args,
720 len(self._calls_done), args, following_calls))
721 git_cl.logging.error(extended_msg)
722
tandrii99a72f22016-08-17 14:33:24 -0700723 self.fail('@%d\n'
724 ' Expected: %r\n'
725 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700726 len(self._calls_done), expected_args, args))
727
728 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700729 if isinstance(result, Exception):
730 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000731 return result
732
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100733 def test_ask_for_explicit_yes_true(self):
734 self.calls = [
735 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
736 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
737 ]
738 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
739
tandrii48df5812016-10-17 03:55:37 -0700740 def test_LoadCodereviewSettingsFromFile_gerrit(self):
741 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
742 self.calls = [
743 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
744 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
745 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
746 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
747 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
748 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700749 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
750 CERR1),
751 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700752 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
753 CERR1),
754 ((['git', 'config', 'gerrit.host', 'true'],), ''),
755 ]
756 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
757
maruel@chromium.orga3353652011-11-30 14:26:57 +0000758 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000759 def _is_gerrit_calls(cls, gerrit=False):
760 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
761 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
762
763 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800764 def _upload_calls(cls, private):
765 return (cls._rietveld_git_base_calls() +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000766 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000767
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000768 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800769 def _rietveld_upload_no_rev_calls(cls):
770 return (cls._rietveld_git_base_calls() + [
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200771 ((['git', 'config', 'core.editor'],), ''),
772 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000773
774 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800775 def _rietveld_git_base_calls(cls):
776 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
777 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000778
Aaron Gable13101a62018-02-09 13:20:41 -0800779 return cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000780 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700781 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
782 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000783 ((['git', 'config', 'rietveld.server'],),
784 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000785 ((['git', 'config', 'branch.master.merge'],), 'master'),
786 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000787 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000788 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000789 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git', 'rev-parse', '--show-cdup'],), ''),
791 ((['git', 'rev-parse', 'HEAD'],), '12345'),
Aaron Gable7817f022017-12-12 09:43:17 -0800792 ((['git', '-c', 'core.quotePath=false', 'diff',
793 '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000794 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700795 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000796 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000797 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000798 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000799 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000800 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000801 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000802 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000803 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700804 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000805 ]
806
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000807 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000808 def _git_upload_calls(cls, private):
809 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000810 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000811 private_call = []
812 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000813 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000814 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000815 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000816
maruel@chromium.orga3353652011-11-30 14:26:57 +0000817 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000819 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000820 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800821 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000822 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700823 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000825 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000826 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700827 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000828 ] + cls._git_post_upload_calls()
829
830 @classmethod
831 def _git_post_upload_calls(cls):
832 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000833 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
834 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
835 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000836 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000837 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000838 ]
839
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000840 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000841 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000842 fake_ancestor = 'fake_ancestor'
843 fake_cl = 'fake_cl_for_patch'
844 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000845 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000846 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000847 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000848 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000849 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000850 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000851 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000852 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700853 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000854 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000855 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000856 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000857 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000858 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000859 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000860 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000861 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000862 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000863 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000864 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000865
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000866 @staticmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800867 def _cmd_line(description, args, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000868 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000869 return [
Daniel Cheng7227d212017-11-17 08:12:37 -0800870 'upload', '--assume_yes', '--server', 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000871 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000872 ] + args + [
Daniel Cheng7227d212017-11-17 08:12:37 -0800873 '--cc',
874 ','.join(
875 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
876 cc),
Aaron Gable13101a62018-02-09 13:20:41 -0800877 ] + (['--private'] if private else []) + ['fake_ancestor_sha', 'HEAD']
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000878
879 def _run_reviewer_test(
880 self,
881 upload_args,
882 expected_description,
883 returned_description,
884 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000885 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700886 private=False,
887 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000888 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000889 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org79540052012-10-19 23:15:26 +0000890
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000891 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700892 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000893
Aaron Gable13101a62018-02-09 13:20:41 -0800894 self.calls = self._upload_calls(private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000895
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000896 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000897 self.assertEquals(
898 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000899 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000900 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000901 '#--------------------This line is 72 characters long'
902 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000903 expected_description,
904 desc)
905 return returned_description
906 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000907
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000908 def check_upload(args):
Aaron Gable13101a62018-02-09 13:20:41 -0800909 cmd_line = self._cmd_line(final_description, reviewers, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000910 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000911 return 1, 2
912 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000913
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000914 git_cl.main(['upload'] + upload_args)
915
916 def test_no_reviewer(self):
917 self._run_reviewer_test(
918 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000919 'desc\n\nBUG=',
920 '# Blah blah comment.\ndesc\n\nBUG=',
921 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000922 [])
923
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000924 def test_private(self):
925 self._run_reviewer_test(
926 ['--private'],
927 'desc\n\nBUG=',
928 '# Blah blah comment.\ndesc\n\nBUG=\n',
929 'desc\n\nBUG=',
930 [])
931
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000932 def test_reviewers_cmd_line(self):
933 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000934 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000935 self._run_reviewer_test(
936 ['-r' 'foo@example.com'],
937 description,
938 '\n%s\n' % description,
939 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000940 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000941
942 def test_reviewer_tbr_overriden(self):
943 # Reviewer is overriden with TBR
944 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000945 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000946 self._run_reviewer_test(
947 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000948 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000949 description.strip('\n'),
950 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000951 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000952
953 def test_reviewer_multiple(self):
954 # Handles multiple R= or TBR= lines.
955 description = (
bradnelsond975b302016-10-23 12:20:23 -0700956 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
957 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000958 self._run_reviewer_test(
959 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000960 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000961 description,
962 description,
bradnelsond975b302016-10-23 12:20:23 -0700963 ['--reviewers=another@example.com,reviewer@example.com'],
964 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000965
maruel@chromium.orga3353652011-11-30 14:26:57 +0000966 def test_reviewer_send_mail(self):
967 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000968 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000969 self._run_reviewer_test(
970 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000971 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000972 description.strip('\n'),
973 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000974 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000975
976 def test_reviewer_send_mail_no_rev(self):
977 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000978 stdout = StringIO.StringIO()
Aaron Gable13101a62018-02-09 13:20:41 -0800979 self.calls = self._rietveld_upload_no_rev_calls() + [
tandriic2405f52016-10-10 08:13:15 -0700980 ((['DieWithError', 'Must specify reviewers to send email.'],),
981 SystemExitMock())
982 ]
983
984 def RunEditor(desc, _, **kwargs):
985 return desc
986 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
987 self.mock(sys, 'stdout', stdout)
988 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000989 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -0700990 self.assertEqual(
991 '=====================================\n'
992 'NOTICE: Rietveld is being deprecated. '
993 'You can upload changes to Gerrit with\n'
994 ' git cl upload --gerrit\n'
995 'or set Gerrit to be your default code review tool with\n'
996 ' git config gerrit.host true\n'
997 '=====================================\n',
998 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000999
tandriif9aefb72016-07-01 09:06:51 -07001000 def test_bug_on_cmd(self):
1001 self._run_reviewer_test(
1002 ['--bug=500658,proj:123'],
1003 'desc\n\nBUG=500658\nBUG=proj:123',
1004 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1005 'desc\n\nBUG=500658\nBUG=proj:1234',
1006 [])
1007
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001008 def test_git_numberer_not_whitelisted_repo(self):
1009 self.calls = []
1010 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001011 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1012 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001013 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001014
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001015 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001016 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1017 self.calls = [
1018 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001019 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001020 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001021 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001022 remote_url='https://chromium.googlesource.com/chromium/src',
1023 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001024 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001025
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001026 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001027 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001028 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001029 def fake_temporary_directory(**kwargs):
1030 yield tempdir
1031 self.mock(git_cl.gclient_utils, 'temporary_directory',
1032 fake_temporary_directory)
1033 self._test_GitNumbererState_valid_configs_inner(tempdir)
1034
1035 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001036 self.calls = [
1037 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001038 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001039 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1040 '''
1041 [plugin "git-numberer"]
1042 validate-enabled-refglob = refs/else/*
1043 validate-enabled-refglob = refs/heads/*
1044 validate-disabled-refglob = refs/heads/disabled
1045 validate-disabled-refglob = refs/branch-heads/*
1046 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001047 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1048 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001049 'refs/else/*\n'
1050 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001051 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1052 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001053 'refs/heads/disabled\n'
1054 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001055 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001056
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001057 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001058 remote_url='https://chromium.googlesource.com/chromium/src',
1059 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001060 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001061
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001062 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001063 remote_url='https://chromium.googlesource.com/chromium/src',
1064 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001065 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001066
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001067 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001068 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001069 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001070 remote_url='https://chromium.googlesource.com/chromium/src',
1071 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001072 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001073
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001074 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001075 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001076 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001077 if skip_auth_check:
1078 return [((cmd, ), 'true')]
1079
tandrii5d48c322016-08-18 16:19:37 -07001080 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001081 if issue:
1082 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001083 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001084 ])
1085 calls.extend([
1086 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1087 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1088 ((['git', 'config', 'remote.origin.url'],),
1089 'https://chromium.googlesource.com/my/repo'),
1090 ((['git', 'config', 'remote.origin.url'],),
1091 'https://chromium.googlesource.com/my/repo'),
1092 ])
1093 return calls
1094
1095 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001096 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001097 fetched_status=None, other_cl_owner=None,
1098 custom_cl_base=None):
Aaron Gable13101a62018-02-09 13:20:41 -08001099 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001100 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001101 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1102 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1103 ((['git', 'config', 'branch.master.gerritissue'],),
1104 CERR1 if issue is None else str(issue)),
1105 ]
1106
1107 if custom_cl_base:
1108 ancestor_revision = custom_cl_base
1109 else:
1110 # Determine ancestor_revision to be merge base.
1111 ancestor_revision = 'fake_ancestor_sha'
1112 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001113 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001114 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001115 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001116 'refs/remotes/origin/master'],), ancestor_revision),
1117 ]
1118
1119 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001120 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1121
1122 if issue:
1123 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001124 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001125 '123456',
1126 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001127 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001128 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001129 'change_id': '123456789',
1130 'current_revision': 'sha1_of_current_revision',
1131 'revisions': { 'sha1_of_current_revision': {
1132 'commit': {'message': fetched_description},
1133 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001134 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001135 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001136 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001137 if fetched_status == 'ABANDONED':
1138 calls += [
1139 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1140 '123456 has been abandoned, new uploads are not '
1141 'allowed'), SystemExitMock()),
1142 ]
1143 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001144 if other_cl_owner:
1145 calls += [
1146 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1147 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001148
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001149 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1150 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001151 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001152 ((['git', 'rev-parse', '--show-cdup'],), ''),
1153 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001154
Aaron Gable7817f022017-12-12 09:43:17 -08001155 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1156 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001157 'M\t.gitignore\n'),
1158 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001159 ]
1160
1161 if not issue:
1162 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001163 ((['git', 'log', '--pretty=format:%s%n%n%b',
1164 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001165 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001166 ]
1167
1168 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001169 ((['git', 'config', 'user.email'],), 'me@example.com'),
1170 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1171 ([custom_cl_base] if custom_cl_base else
1172 [ancestor_revision, 'HEAD']),),
1173 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001174 ]
1175 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001176
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001177 @classmethod
1178 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001179 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001180 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001181 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001182 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001183 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001184 if post_amend_description is None:
1185 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001186 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001187 # Determined in `_gerrit_base_calls`.
1188 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1189
1190 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001191
tandriia60502f2016-06-20 02:01:53 -07001192 if squash_mode == 'default':
1193 calls.extend([
1194 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1195 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1196 ])
1197 elif squash_mode in ('override_squash', 'override_nosquash'):
1198 calls.extend([
1199 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1200 'true' if squash_mode == 'override_squash' else 'false'),
1201 ])
1202 else:
1203 assert squash_mode in ('squash', 'nosquash')
1204
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001205 # If issue is given, then description is fetched from Gerrit instead.
1206 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001207 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001208 ((['git', 'log', '--pretty=format:%s\n\n%b',
1209 ((custom_cl_base + '..') if custom_cl_base else
1210 'fake_ancestor_sha..HEAD')],),
1211 description),
1212 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001213 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001214 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001215 else:
1216 if not title:
1217 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001218 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1219 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001220 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001221 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001222 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001223 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001224 (('DownloadGerritHook', False), ''),
1225 # Amending of commit message to get the Change-Id.
1226 ((['git', 'log', '--pretty=format:%s\n\n%b',
1227 determined_ancestor_revision + '..HEAD'],),
1228 description),
1229 ((['git', 'commit', '--amend', '-m', description],), ''),
1230 ((['git', 'log', '--pretty=format:%s\n\n%b',
1231 determined_ancestor_revision + '..HEAD'],),
1232 post_amend_description)
1233 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001234 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001235 if not issue:
1236 # Prompting to edit description on first upload.
1237 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001238 ((['git', 'config', 'core.editor'],), ''),
1239 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001240 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001241 ref_to_push = 'abcdef0123456789'
1242 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001243 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1244 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1245 ]
1246
1247 if custom_cl_base is None:
1248 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001249 ((['get_or_create_merge_base', 'master',
1250 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001251 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001252 ]
1253 parent = 'origin/master'
1254 else:
1255 calls += [
1256 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1257 'refs/remotes/origin/master'],),
1258 callError(1)), # Means not ancenstor.
1259 (('ask_for_data',
1260 'Do you take responsibility for cleaning up potential mess '
1261 'resulting from proceeding with upload? Press Enter to upload, '
1262 'or Ctrl+C to abort'), ''),
1263 ]
1264 parent = custom_cl_base
1265
1266 calls += [
1267 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1268 '0123456789abcdef'),
1269 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001270 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001271 ref_to_push),
1272 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001273 else:
1274 ref_to_push = 'HEAD'
1275
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001276 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001277 ((['git', 'rev-list',
1278 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1279 ref_to_push],),
1280 '1hashPerLine\n'),
1281 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001282
Aaron Gableafd52772017-06-27 16:40:10 -07001283 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001284 ref_suffix = '%ready,notify=ALL'
1285 else:
Jamie Madill276da0b2018-04-27 14:41:20 -04001286 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -07001287 ref_suffix = '%wip'
1288 else:
1289 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001290
Aaron Gable70f4e242017-06-26 10:45:59 -07001291 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001292 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001293
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001294 if git_mirror is None:
1295 calls += [
1296 ((['git', 'config', 'remote.origin.url'],),
1297 'https://chromium.googlesource.com/yyy/zzz'),
1298 ]
1299 else:
1300 calls += [
1301 ((['git', 'config', 'remote.origin.url'],),
1302 '/cache/this-dir-exists'),
1303 (('os.path.isdir', '/cache/this-dir-exists'),
1304 True),
1305 # Runs in /cache/this-dir-exists.
1306 ((['git', 'config', 'remote.origin.url'],),
1307 'https://chromium.googlesource.com/yyy/zzz'),
1308 ]
1309
ukai@chromium.orge8077812012-02-03 03:41:46 +00001310 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001311 ((['git', 'push',
1312 'https://chromium.googlesource.com/yyy/zzz',
1313 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001314 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001315 'remote: Processing changes: (\)\n'
1316 'remote: Processing changes: (|)\n'
1317 'remote: Processing changes: (/)\n'
1318 'remote: Processing changes: (-)\n'
1319 'remote: Processing changes: new: 1 (/)\n'
1320 'remote: Processing changes: new: 1, done\n'
1321 'remote:\n'
1322 'remote: New Changes:\n'
Aaron Gable289b4312017-09-13 14:06:16 -07001323 'remote: https://chromium-review.googlesource.com/#/c/foo/+/123456 '
1324 'XXX\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001325 'remote:\n'
1326 'To https://chromium.googlesource.com/yyy/zzz\n'
1327 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001328 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001329 if squash:
1330 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001331 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001332 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001333 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001334 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001335 ((['git', 'config', 'branch.master.gerritsquashhash',
1336 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001337 ]
tandrii88189772016-09-29 04:29:57 -07001338 calls += [
1339 ((['git', 'config', 'rietveld.cc'],), ''),
Daniel Cheng7227d212017-11-17 08:12:37 -08001340 (('AddReviewers', 'chromium-review.googlesource.com', 123456
1341 if squash else None, sorted(reviewers),
1342 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1343 cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001344 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001345 if tbr:
1346 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001347 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1348 ['LABELS']), {
1349 'labels': {
1350 'Code-Review': {
1351 'default_value': 0,
1352 'all': [],
1353 'values': {
1354 '+2': 'lgtm, approved',
1355 '+1': 'lgtm, but someone else must approve',
1356 ' 0': 'No score',
1357 '-1': 'Don\'t submit as-is',
1358 }
1359 }
1360 }
1361 }),
Aaron Gablefd238082017-06-07 13:42:34 -07001362 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001363 123456 if squash else None, 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001364 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001365 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001366 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001367 return calls
1368
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001369 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001370 self,
1371 upload_args,
1372 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001373 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001374 squash=True,
1375 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001376 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001377 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001378 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001379 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001380 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001381 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001382 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001383 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001384 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001385 custom_cl_base=None,
1386 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001387 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001388 if squash_mode is None:
1389 if '--no-squash' in upload_args:
1390 squash_mode = 'nosquash'
1391 elif '--squash' in upload_args:
1392 squash_mode = 'squash'
1393 else:
1394 squash_mode = 'default'
1395
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001396 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001397 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001398 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001399 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001400 CookiesAuthenticatorMockFactory(
1401 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001402 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1403 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001404 self.mock(git_cl.gclient_utils, 'RunEditor',
1405 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001406 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1407 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001408
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001409 original_os_path_isdir = os.path.isdir
1410 def selective_os_path_isdir_mock(path):
1411 if path == '/cache/this-dir-exists':
1412 return self._mocked_call('os.path.isdir', path)
1413 return original_os_path_isdir(path)
1414 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1415
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001416 self.calls = self._gerrit_base_calls(
1417 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001418 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001419 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001420 other_cl_owner=other_cl_owner,
1421 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001422 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001423 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1424 expected_content=description))
1425 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001426 self.calls += self._gerrit_upload_calls(
1427 description, reviewers, squash,
1428 squash_mode=squash_mode,
1429 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001430 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001431 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001432 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001433 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001434 # Uncomment when debugging.
1435 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001436 git_cl.main(['upload'] + upload_args)
1437
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001438 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001439 self._run_gerrit_upload_test(
1440 ['--no-squash'],
1441 'desc\n\nBUG=\n',
1442 [],
1443 squash=False,
1444 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1445
1446 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001447 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001448 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001449 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001450 [],
tandriia60502f2016-06-20 02:01:53 -07001451 squash=False,
1452 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001453 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001454
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001455 def test_gerrit_no_reviewer(self):
1456 self._run_gerrit_upload_test(
1457 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001458 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001459 [],
1460 squash=False,
1461 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001462
Nick Carter8692b182017-11-06 16:30:38 -08001463 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001464 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1465 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001466 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001467 'desc\n\nBUG=\n\nChange-Id: I123456789',
1468 squash=False,
1469 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001470 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001471
ukai@chromium.orge8077812012-02-03 03:41:46 +00001472 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001473 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001474 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001475 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001476 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001477 squash=False,
1478 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001479 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001480
1481 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001482 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001483 [],
bradnelsond975b302016-10-23 12:20:23 -07001484 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1485 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001486 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001487 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001488 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001489 cc=['more@example.com', 'people@example.com'],
1490 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001491
1492 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001493 self._run_gerrit_upload_test(
1494 [],
1495 'desc\nBUG=\n\nChange-Id: 123456789',
1496 [],
1497 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001498
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001499 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001500 self._run_gerrit_upload_test(
1501 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001502 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001503 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001504 squash=True,
1505 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001506
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001507 def test_gerrit_upload_squash_first_against_rev(self):
1508 custom_cl_base = 'custom_cl_base_rev_or_branch'
1509 self._run_gerrit_upload_test(
1510 ['--squash', custom_cl_base],
1511 'desc\nBUG=\n\nChange-Id: 123456789',
1512 [],
1513 squash=True,
1514 expected_upstream_ref='origin/master',
1515 custom_cl_base=custom_cl_base)
1516 self.assertIn(
1517 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1518 sys.stdout.getvalue())
1519
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001520 def test_gerrit_upload_squash_first_with_mirror(self):
1521 self._run_gerrit_upload_test(
1522 ['--squash'],
1523 'desc\nBUG=\n\nChange-Id: 123456789',
1524 [],
1525 squash=True,
1526 expected_upstream_ref='origin/master',
1527 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1528
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001529 def test_gerrit_upload_squash_reupload(self):
1530 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001531 self._run_gerrit_upload_test(
1532 ['--squash'],
1533 description,
1534 [],
1535 squash=True,
1536 expected_upstream_ref='origin/master',
1537 issue=123456)
1538
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001539 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1540 self.mock(git_cl, 'DieWithError',
1541 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1542 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1543 with self.assertRaises(SystemExitMock):
1544 self._run_gerrit_upload_test(
1545 ['--squash'],
1546 description,
1547 [],
1548 squash=True,
1549 expected_upstream_ref='origin/master',
1550 issue=123456,
1551 fetched_status='ABANDONED')
1552
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001553 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1554 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1555 lambda *_, **__: {'email': 'yet-another@example.com'})
1556 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1557 self._run_gerrit_upload_test(
1558 ['--squash'],
1559 description,
1560 [],
1561 squash=True,
1562 expected_upstream_ref='origin/master',
1563 issue=123456,
1564 other_cl_owner='other@example.com')
1565 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001566 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001567 'authenticate to Gerrit as yet-another@example.com.\n'
1568 'Uploading may fail due to lack of permissions',
1569 git_cl.sys.stdout.getvalue())
1570
rmistry@google.com2dd99862015-06-22 12:22:18 +00001571 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001572 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001573 def mock_run_git(*args, **_kwargs):
1574 if args[0] == ['for-each-ref',
1575 '--format=%(refname:short) %(upstream:short)',
1576 'refs/heads']:
1577 # Create a local branch dependency tree that looks like this:
1578 # test1 -> test2 -> test3 -> test4 -> test5
1579 # -> test3.1
1580 # test6 -> test0
1581 branch_deps = [
1582 'test2 test1', # test1 -> test2
1583 'test3 test2', # test2 -> test3
1584 'test3.1 test2', # test2 -> test3.1
1585 'test4 test3', # test3 -> test4
1586 'test5 test4', # test4 -> test5
1587 'test6 test0', # test0 -> test6
1588 'test7', # test7
1589 ]
1590 return '\n'.join(branch_deps)
1591 self.mock(git_cl, 'RunGit', mock_run_git)
1592
1593 class RecordCalls:
1594 times_called = 0
1595 record_calls = RecordCalls()
1596 def mock_CMDupload(*args, **_kwargs):
1597 record_calls.times_called += 1
1598 return 0
1599 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1600
1601 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001602 (('ask_for_data', 'This command will checkout all dependent branches '
1603 'and run "git cl upload". Press Enter to continue, '
1604 'or Ctrl+C to abort'), ''),
1605 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001606
1607 class MockChangelist():
1608 def __init__(self):
1609 pass
1610 def GetBranch(self):
1611 return 'test1'
1612 def GetIssue(self):
1613 return '123'
1614 def GetPatchset(self):
1615 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001616 def IsGerrit(self):
1617 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001618
1619 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1620 # CMDupload should have been called 5 times because of 5 dependent branches.
1621 self.assertEquals(5, record_calls.times_called)
1622 self.assertEquals(0, ret)
1623
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001624 def test_gerrit_change_id(self):
1625 self.calls = [
1626 ((['git', 'write-tree'], ),
1627 'hashtree'),
1628 ((['git', 'rev-parse', 'HEAD~0'], ),
1629 'branch-parent'),
1630 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1631 'A B <a@b.org> 1456848326 +0100'),
1632 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1633 'C D <c@d.org> 1456858326 +0100'),
1634 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1635 'hashchange'),
1636 ]
1637 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1638 self.assertEqual(change_id, 'Ihashchange')
1639
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001640 def test_desecription_append_footer(self):
1641 for init_desc, footer_line, expected_desc in [
1642 # Use unique desc first lines for easy test failure identification.
1643 ('foo', 'R=one', 'foo\n\nR=one'),
1644 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1645 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1646 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1647 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1648 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1649 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1650 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1651 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1652 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1653 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1654 ]:
1655 desc = git_cl.ChangeDescription(init_desc)
1656 desc.append_footer(footer_line)
1657 self.assertEqual(desc.description, expected_desc)
1658
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001659 def test_update_reviewers(self):
1660 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001661 ('foo', [], [],
1662 'foo'),
1663 ('foo\nR=xx', [], [],
1664 'foo\nR=xx'),
1665 ('foo\nTBR=xx', [], [],
1666 'foo\nTBR=xx'),
1667 ('foo', ['a@c'], [],
1668 'foo\n\nR=a@c'),
1669 ('foo\nR=xx', ['a@c'], [],
1670 'foo\n\nR=a@c, xx'),
1671 ('foo\nTBR=xx', ['a@c'], [],
1672 'foo\n\nR=a@c\nTBR=xx'),
1673 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1674 'foo\n\nR=a@c, yy\nTBR=xx'),
1675 ('foo\nBUG=', ['a@c'], [],
1676 'foo\nBUG=\nR=a@c'),
1677 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1678 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1679 ('foo', ['a@c', 'b@c'], [],
1680 'foo\n\nR=a@c, b@c'),
1681 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1682 'foo\nBar\n\nR=c@c\nBUG='),
1683 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1684 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001685 # Same as the line before, but full of whitespaces.
1686 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001687 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001688 'foo\nBar\n\nR=c@c\n BUG =',
1689 ),
1690 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001691 ('foo BUG=allo R=joe ', ['c@c'], [],
1692 'foo BUG=allo R=joe\n\nR=c@c'),
1693 # Redundant TBRs get promoted to Rs
1694 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1695 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001696 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001697 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001698 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001699 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001700 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001701 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001702 actual.append(obj.description)
1703 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001704
Nodir Turakulov23b82142017-11-16 11:04:25 -08001705 def test_get_hash_tags(self):
1706 cases = [
1707 ('', []),
1708 ('a', []),
1709 ('[a]', ['a']),
1710 ('[aa]', ['aa']),
1711 ('[a ]', ['a']),
1712 ('[a- ]', ['a']),
1713 ('[a- b]', ['a-b']),
1714 ('[a--b]', ['a-b']),
1715 ('[a', []),
1716 ('[a]x', ['a']),
1717 ('[aa]x', ['aa']),
1718 ('[a b]', ['a-b']),
1719 ('[a b]', ['a-b']),
1720 ('[a__b]', ['a-b']),
1721 ('[a] x', ['a']),
1722 ('[a][b]', ['a', 'b']),
1723 ('[a] [b]', ['a', 'b']),
1724 ('[a][b]x', ['a', 'b']),
1725 ('[a][b] x', ['a', 'b']),
1726 ('[a]\n[b]', ['a']),
1727 ('[a\nb]', []),
1728 ('[a][', ['a']),
1729 ('Revert "[a] feature"', ['a']),
1730 ('Reland "[a] feature"', ['a']),
1731 ('Revert: [a] feature', ['a']),
1732 ('Reland: [a] feature', ['a']),
1733 ('Revert "Reland: [a] feature"', ['a']),
1734 ('Foo: feature', ['foo']),
1735 ('Foo Bar: feature', ['foo-bar']),
1736 ('Revert "Foo bar: feature"', ['foo-bar']),
1737 ('Reland "Foo bar: feature"', ['foo-bar']),
1738 ]
1739 for desc, expected in cases:
1740 change_desc = git_cl.ChangeDescription(desc)
1741 actual = change_desc.get_hash_tags()
1742 self.assertEqual(
1743 actual,
1744 expected,
1745 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1746
wittman@chromium.org455dc922015-01-26 20:15:50 +00001747 def test_get_target_ref(self):
1748 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001749 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001750 self.assertEqual(None, git_cl.GetTargetRef(None,
1751 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001752 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001753
wittman@chromium.org455dc922015-01-26 20:15:50 +00001754 # Check default target refs for branches.
1755 self.assertEqual('refs/heads/master',
1756 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001757 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001758 self.assertEqual('refs/heads/master',
1759 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001760 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001761 self.assertEqual('refs/heads/master',
1762 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001763 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001764 self.assertEqual('refs/branch-heads/123',
1765 git_cl.GetTargetRef('origin',
1766 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001767 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001768 self.assertEqual('refs/diff/test',
1769 git_cl.GetTargetRef('origin',
1770 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001771 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001772 self.assertEqual('refs/heads/chrome/m42',
1773 git_cl.GetTargetRef('origin',
1774 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001775 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001776
1777 # Check target refs for user-specified target branch.
1778 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1779 'refs/remotes/branch-heads/123'):
1780 self.assertEqual('refs/branch-heads/123',
1781 git_cl.GetTargetRef('origin',
1782 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001783 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001784 for branch in ('origin/master', 'remotes/origin/master',
1785 'refs/remotes/origin/master'):
1786 self.assertEqual('refs/heads/master',
1787 git_cl.GetTargetRef('origin',
1788 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001789 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001790 for branch in ('master', 'heads/master', 'refs/heads/master'):
1791 self.assertEqual('refs/heads/master',
1792 git_cl.GetTargetRef('origin',
1793 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001794 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001795
wychen@chromium.orga872e752015-04-28 23:42:18 +00001796 def test_patch_when_dirty(self):
1797 # Patch when local tree is dirty
1798 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1799 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1800
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001801 @staticmethod
1802 def _get_gerrit_codereview_server_calls(branch, value=None,
1803 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001804 detect_branch=True,
1805 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001806 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1807
1808 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1809 """
1810 calls = []
1811 if detect_branch:
1812 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001813 if detect_server:
1814 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1815 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001816 if value is None:
1817 calls += [
1818 ((['git', 'config', 'branch.' + branch + '.merge'],),
1819 'refs/heads' + branch),
1820 ((['git', 'config', 'branch.' + branch + '.remote'],),
1821 'origin'),
1822 ((['git', 'config', 'remote.origin.url'],),
1823 'https://%s.googlesource.com/my/repo' % git_short_host),
1824 ]
1825 return calls
1826
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001827 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001828 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001829 detect_gerrit_server=True,
1830 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001831 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001832 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1833 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001834 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001835 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001836 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1837
tandriidf09a462016-08-18 16:23:55 -07001838 if new_branch:
1839 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001840
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001841 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001842 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001843 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001844 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001845 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1846 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1847 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1848 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001849 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001850 if default_codereview == 'gerrit':
1851 if not force_codereview:
1852 self.calls += [
1853 ((['git', 'config', 'gerrit.host'],), 'true'),
1854 ]
1855 if detect_gerrit_server:
1856 self.calls += self._get_gerrit_codereview_server_calls(
1857 'master', git_short_host=git_short_host,
1858 detect_branch=not new_branch and force_codereview)
1859 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001860
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001861 elif default_codereview == 'rietveld':
1862 self.calls += [
1863 ((['git', 'config', 'gerrit.host'],), CERR1),
1864 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1865 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
1866 ]
1867 actual_codereview = 'rietveld'
1868
1869 if actual_codereview == 'rietveld':
1870 self.calls += [
1871 ((['git', 'rev-parse', '--show-cdup'],), ''),
1872 ]
1873 if not default_codereview:
1874 self.calls += [
1875 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1876 ]
1877 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001878 self.calls += [
1879 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001880 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001881 {
1882 'current_revision': '7777777777',
1883 'revisions': {
1884 '1111111111': {
1885 '_number': 1,
1886 'fetch': {'http': {
1887 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1888 'ref': 'refs/changes/56/123456/1',
1889 }},
1890 },
1891 '7777777777': {
1892 '_number': 7,
1893 'fetch': {'http': {
1894 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1895 'ref': 'refs/changes/56/123456/7',
1896 }},
1897 },
1898 },
1899 }),
1900 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001901
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001902 def _common_patch_rietveld_successful(self, **kwargs):
1903 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001904 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001905 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001906 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001907 ((['git', 'config', 'branch.master.rietveldserver',
1908 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001909 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001910 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001911 ((['git', 'commit', '-m',
1912 'Description\n\n' +
1913 'patch from issue 123456 at patchset 60001 ' +
1914 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001915 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001916
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001917 def test_patch_rietveld_default(self):
1918 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001919 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1920
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001921 def test_patch_rietveld_successful_new_branch(self):
1922 self._common_patch_rietveld_successful(default_codereview='rietveld',
1923 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001924 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1925
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001926 def test_patch_rietveld_guess_by_url(self):
1927 self._common_patch_rietveld_successful(
1928 default_codereview=None, # It doesn't matter.
1929 actual_codereview='rietveld')
1930 self.assertEqual(git_cl.main(
1931 ['patch', 'https://codereview.example.com/123456']), 0)
1932
1933 def test_patch_rietveld_conflict(self):
1934 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07001935 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001936 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001937
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001938 def test_patch_gerrit_default(self):
1939 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001940 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001941 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08001942 ((['git', 'config', 'remote.origin.url'],),
1943 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001944 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1945 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001946 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001947 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001948 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001949 ((['git', 'config', 'branch.master.gerritserver',
1950 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001951 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001952 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1953 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1954 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001955 ]
1956 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1957
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001958 def test_patch_gerrit_force(self):
1959 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001960 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001961 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08001962 ((['git', 'config', 'remote.origin.url'],),
1963 'https://host.googlesource.com/my/repo'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001964 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001965 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001966 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001967 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001968 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001969 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001970 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001971 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001972 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1973 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1974 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001975 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001976 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001977
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001978 def test_patch_gerrit_guess_by_url(self):
1979 self._patch_common(
1980 default_codereview=None, # It doesn't matter what's default.
1981 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08001982 git_short_host='else')
1983 self.calls += self._get_gerrit_codereview_server_calls(
1984 'master', git_short_host='else', detect_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001985 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001986 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001987 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001988 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001989 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001990 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001991 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001992 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001993 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001994 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1995 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1996 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001997 ]
1998 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001999 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002000
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002001 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2002 self._patch_common(
2003 default_codereview=None, # It doesn't matter what's default.
2004 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08002005 git_short_host='else')
2006 self.calls += self._get_gerrit_codereview_server_calls(
2007 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002008 self.calls += [
2009 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2010 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002011 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002012 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2013 ''),
2014 ((['git', 'config', 'branch.master.gerritserver',
2015 'https://else-review.googlesource.com'],), ''),
2016 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002017 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2018 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2019 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002020 ]
2021 self.assertEqual(git_cl.main(
2022 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2023
Aaron Gable697a91b2018-01-19 15:20:15 -08002024 def test_patch_gerrit_guess_by_url_with_repo(self):
2025 self._patch_common(
2026 default_codereview=None, # It doesn't matter what's default.
2027 actual_codereview='gerrit',
2028 git_short_host='else')
2029 self.calls += self._get_gerrit_codereview_server_calls(
2030 'master', git_short_host='else', detect_server=False)
2031 self.calls += [
2032 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2033 'refs/changes/56/123456/1'],), ''),
2034 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2035 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2036 ''),
2037 ((['git', 'config', 'branch.master.gerritserver',
2038 'https://else-review.googlesource.com'],), ''),
2039 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2040 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2041 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2042 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
2043 ]
2044 self.assertEqual(git_cl.main(
2045 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
2046 0)
2047
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002048 def test_patch_gerrit_conflict(self):
2049 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002050 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002051 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08002052 ((['git', 'config', 'remote.origin.url'],),
2053 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002054 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002055 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002056 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2057 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2058 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002059 ]
2060 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002061 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002062
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002063 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002064 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002065 raise git_cl.gerrit_util.GerritError(404, '')
2066 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2067
tandriic2405f52016-10-10 08:13:15 -07002068 self.calls = [
2069 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002070 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2071 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2072 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2073 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002074 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2075 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2076 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2077 ((['git', 'config', 'remote.origin.url'],),
2078 'https://chromium.googlesource.com/my/repo'),
2079 ((['DieWithError',
2080 'change 123456 at https://chromium-review.googlesource.com does not '
2081 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002082 ]
2083 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002084 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002085
Aaron Gable697a91b2018-01-19 15:20:15 -08002086 def test_patch_gerrit_wrong_repo(self):
2087 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
2088 detect_gerrit_server=True)
2089 self.calls += [
2090 ((['git', 'config', 'remote.origin.url'],),
2091 'https://chromium.googlesource.com/wrong/repo'),
2092 ((['DieWithError',
2093 'Trying to patch a change from '
2094 'https://chromium.googlesource.com/my/repo but this repo appears '
2095 'to be https://chromium.googlesource.com/wrong/repo.'],),
2096 SystemExitMock()),
2097 ]
2098 with self.assertRaises(SystemExitMock):
2099 self.assertEqual(1, git_cl.main(['patch', '123456']))
2100
2101
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002102 def _checkout_calls(self):
2103 return [
2104 ((['git', 'config', '--local', '--get-regexp',
2105 'branch\\..*\\.rietveldissue'], ),
2106 ('branch.retrying.rietveldissue 1111111111\n'
2107 'branch.some-fix.rietveldissue 2222222222\n')),
2108 ((['git', 'config', '--local', '--get-regexp',
2109 'branch\\..*\\.gerritissue'], ),
2110 ('branch.ger-branch.gerritissue 123456\n'
2111 'branch.gbranch654.gerritissue 654321\n')),
2112 ]
2113
2114 def test_checkout_gerrit(self):
2115 """Tests git cl checkout <issue>."""
2116 self.calls = self._checkout_calls()
2117 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2118 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2119
2120 def test_checkout_rietveld(self):
2121 """Tests git cl checkout <issue>."""
2122 self.calls = self._checkout_calls()
2123 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2124 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2125
2126 def test_checkout_not_found(self):
2127 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002128 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002129 self.calls = self._checkout_calls()
2130 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2131
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002132 def test_checkout_no_branch_issues(self):
2133 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002134 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002135 self.calls = [
2136 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002137 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002138 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002139 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002140 ]
2141 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2142
tandrii@chromium.org28253532016-04-14 13:46:56 +00002143 def _test_gerrit_ensure_authenticated_common(self, auth,
2144 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002145 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2146 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2147 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002148 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002149 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002150 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002151 cl.branch = 'master'
2152 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002153 cl.lookedup_issue = True
2154 return cl
2155
2156 def test_gerrit_ensure_authenticated_missing(self):
2157 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002158 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002159 })
2160 self.calls.append(
2161 ((['DieWithError',
2162 'Credentials for the following hosts are required:\n'
2163 ' chromium-review.googlesource.com\n'
2164 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002165 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002166 'https://chromium-review.googlesource.com/new-password'],), ''),)
2167 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2168
2169 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002170 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002171 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002172 'chromium.googlesource.com':
2173 ('git-one.example.com', None, 'secret1'),
2174 'chromium-review.googlesource.com':
2175 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002176 })
2177 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002178 (('ask_for_data', 'If you know what you are doing '
2179 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002180 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2181
2182 def test_gerrit_ensure_authenticated_ok(self):
2183 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002184 'chromium.googlesource.com':
2185 ('git-same.example.com', None, 'secret'),
2186 'chromium-review.googlesource.com':
2187 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002188 })
2189 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2190
tandrii@chromium.org28253532016-04-14 13:46:56 +00002191 def test_gerrit_ensure_authenticated_skipped(self):
2192 cl = self._test_gerrit_ensure_authenticated_common(
2193 auth={}, skip_auth_check=True)
2194 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2195
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002196 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002197 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2198 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002199 self.calls = [
2200 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002201 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002202 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2203 ((['git', 'config', 'rietveld.server'],), ''),
2204 ((['git', 'config', 'rietveld.server'],), ''),
2205 ((['git', 'config', 'branch.feature.rietveldserver'],),
2206 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002207 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002208 ]
2209 self.assertEqual(0, git_cl.main(['set-commit']))
2210
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002211 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002212 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002213 lambda h, i, labels, notify=None:
2214 self._mocked_call(['SetReview', h, i, labels, notify]))
2215
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002216 self.calls = [
2217 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002218 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2219 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002220 ((['git', 'config', 'branch.feature.gerritserver'],),
2221 'https://chromium-review.googlesource.com'),
2222 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002223 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002224 ]
tandriid9e5ce52016-07-13 02:32:59 -07002225
2226 def test_cmd_set_commit_gerrit_clear(self):
2227 self._cmd_set_commit_gerrit_common(0)
2228 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2229
2230 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002231 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002232 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2233
tandriid9e5ce52016-07-13 02:32:59 -07002234 def test_cmd_set_commit_gerrit(self):
2235 self._cmd_set_commit_gerrit_common(2)
2236 self.assertEqual(0, git_cl.main(['set-commit']))
2237
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002238 def test_description_display(self):
2239 out = StringIO.StringIO()
2240 self.mock(git_cl.sys, 'stdout', out)
2241
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002242 self.mock(git_cl, 'Changelist', ChangelistMock)
2243 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002244
2245 self.assertEqual(0, git_cl.main(['description', '-d']))
2246 self.assertEqual('foo\n', out.getvalue())
2247
2248 def test_description_rietveld(self):
2249 out = StringIO.StringIO()
2250 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002251 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002252
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002253 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002254 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002255 self.assertEqual('foobar\n', out.getvalue())
2256
iannucci3c972b92016-08-17 13:24:10 -07002257 def test_StatusFieldOverrideIssueMissingArgs(self):
2258 out = StringIO.StringIO()
2259 self.mock(git_cl.sys, 'stderr', out)
2260
2261 try:
2262 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2263 except SystemExit as ex:
2264 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002265 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002266
2267 out = StringIO.StringIO()
2268 self.mock(git_cl.sys, 'stderr', out)
2269
2270 try:
2271 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2272 except SystemExit as ex:
2273 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002274 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002275
2276 def test_StatusFieldOverrideIssue(self):
2277 out = StringIO.StringIO()
2278 self.mock(git_cl.sys, 'stdout', out)
2279
2280 def assertIssue(cl_self, *_args):
2281 self.assertEquals(cl_self.issue, 1)
2282 return 'foobar'
2283
2284 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2285 self.calls = [
2286 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2287 ((['git', 'config', 'rietveld.server'],), ''),
2288 ((['git', 'config', 'rietveld.server'],), ''),
2289 ]
iannuccie53c9352016-08-17 14:40:40 -07002290 self.assertEqual(
2291 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2292 0)
iannucci3c972b92016-08-17 13:24:10 -07002293 self.assertEqual(out.getvalue(), 'foobar\n')
2294
iannuccie53c9352016-08-17 14:40:40 -07002295 def test_SetCloseOverrideIssue(self):
2296 def assertIssue(cl_self, *_args):
2297 self.assertEquals(cl_self.issue, 1)
2298 return 'foobar'
2299
2300 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2301 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2302 self.calls = [
2303 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2304 ((['git', 'config', 'rietveld.server'],), ''),
2305 ((['git', 'config', 'rietveld.server'],), ''),
2306 ]
2307 self.assertEqual(
2308 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2309
2310 def test_SetCommitOverrideIssue(self):
2311 def assertIssue(cl_self, *_args):
2312 self.assertEquals(cl_self.issue, 1)
2313 return 'foobar'
2314
2315 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2316 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2317 self.calls = [
2318 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2319 ((['git', 'config', 'rietveld.server'],), ''),
2320 ((['git', 'config', 'rietveld.server'],), ''),
2321 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2322 ((['git', 'config', 'rietveld.server'],), ''),
2323 ((['git', 'config', 'rietveld.server'],), ''),
2324 ]
2325 self.assertEqual(
2326 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2327
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002328 def test_description_gerrit(self):
2329 out = StringIO.StringIO()
2330 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002331 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002332 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002333 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2334 {
2335 'current_revision': 'sha1',
2336 'revisions': {'sha1': {
2337 'commit': {'message': 'foobar'},
2338 }},
2339 }),
2340 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002341 self.assertEqual(0, git_cl.main([
2342 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2343 self.assertEqual('foobar\n', out.getvalue())
2344
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002345 def test_description_set_raw(self):
2346 out = StringIO.StringIO()
2347 self.mock(git_cl.sys, 'stdout', out)
2348
2349 self.mock(git_cl, 'Changelist', ChangelistMock)
2350 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2351
2352 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2353 self.assertEqual('hihi', ChangelistMock.desc)
2354
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002355 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002356 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002357
2358 def RunEditor(desc, _, **kwargs):
2359 self.assertEquals(
2360 '# Enter a description of the change.\n'
2361 '# This will be displayed on the codereview site.\n'
2362 '# The first line will also be used as the subject of the review.\n'
2363 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002364 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002365 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002366 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002367 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002368 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002369
dsansomee2d6fd92016-09-08 00:10:47 -07002370 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002371 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002372
2373 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2374 self.mock(git_cl.Changelist, 'GetDescription',
2375 lambda *args: current_desc)
2376 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2377 UpdateDescriptionRemote)
2378 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2379
2380 self.calls = [
2381 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002382 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002383 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2384 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002385 ((['git', 'config', 'core.editor'],), 'vi'),
2386 ]
2387 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2388
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002389 def test_description_set_stdin(self):
2390 out = StringIO.StringIO()
2391 self.mock(git_cl.sys, 'stdout', out)
2392
2393 self.mock(git_cl, 'Changelist', ChangelistMock)
2394 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2395
2396 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2397 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2398
kmarshall3bff56b2016-06-06 18:31:47 -07002399 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002400 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2401
kmarshall3bff56b2016-06-06 18:31:47 -07002402 self.calls = \
2403 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2404 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002405 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002406 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2407 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002408 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2409 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2410 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002411 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2412 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2413 ((['git', 'branch', '-D', 'foo'],), '')]
2414
kmarshall3bff56b2016-06-06 18:31:47 -07002415 self.mock(git_cl, 'get_cl_statuses',
2416 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002417 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2418 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2419 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002420
2421 self.assertEqual(0, git_cl.main(['archive', '-f']))
2422
2423 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002424 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002425 self.calls = \
2426 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2427 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002428 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002429 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2430 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002431 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2432
kmarshall9249e012016-08-23 12:02:16 -07002433 self.mock(git_cl, 'get_cl_statuses',
2434 lambda branches, fine_grained, max_processes:
2435 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2436
2437 self.assertEqual(1, git_cl.main(['archive', '-f']))
2438
2439 def test_archive_dry_run(self):
2440 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2441
2442 self.calls = \
2443 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2444 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2445 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2446 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2447 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2448 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2449 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2450 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2451 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002452
2453 self.mock(git_cl, 'get_cl_statuses',
2454 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002455 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2456 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2457 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002458
kmarshall9249e012016-08-23 12:02:16 -07002459 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2460
2461 def test_archive_no_tags(self):
2462 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2463
2464 self.calls = \
2465 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2466 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2467 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2468 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2469 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2470 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2471 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2472 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2473 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2474 ((['git', 'branch', '-D', 'foo'],), '')]
2475
2476 self.mock(git_cl, 'get_cl_statuses',
2477 lambda branches, fine_grained, max_processes:
2478 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2479 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2480 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2481
2482 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002483
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002484 def test_cmd_issue_erase_existing(self):
2485 out = StringIO.StringIO()
2486 self.mock(git_cl.sys, 'stdout', out)
2487 self.calls = [
2488 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002489 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2490 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002491 # Let this command raise exception (retcode=1) - it should be ignored.
2492 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002493 CERR1),
2494 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2495 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002496 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2497 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2498 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002499 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002500 ]
2501 self.assertEqual(0, git_cl.main(['issue', '0']))
2502
Aaron Gable400e9892017-07-12 15:31:21 -07002503 def test_cmd_issue_erase_existing_with_change_id(self):
2504 out = StringIO.StringIO()
2505 self.mock(git_cl.sys, 'stdout', out)
2506 self.mock(git_cl.Changelist, 'GetDescription',
2507 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2508 self.calls = [
2509 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2510 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2511 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002512 # Let this command raise exception (retcode=1) - it should be ignored.
2513 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2514 CERR1),
2515 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2516 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2517 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2518 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2519 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002520 ((['git', 'log', '-1', '--format=%B'],),
2521 'This is a description\n\nChange-Id: Ideadbeef'),
2522 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002523 ]
2524 self.assertEqual(0, git_cl.main(['issue', '0']))
2525
phajdan.jre328cf92016-08-22 04:12:17 -07002526 def test_cmd_issue_json(self):
2527 out = StringIO.StringIO()
2528 self.mock(git_cl.sys, 'stdout', out)
2529 self.calls = [
2530 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002531 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002532 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2533 ((['git', 'config', 'rietveld.server'],),
2534 'https://codereview.chromium.org'),
2535 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2536 (('write_json', 'output.json',
2537 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2538 ''),
2539 ]
2540 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2541
tandriide281ae2016-10-12 06:02:30 -07002542 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002543 self.mock(git_cl.Changelist, 'GetChange',
2544 lambda _, *a: (
2545 self._mocked_call(['GetChange']+list(a))))
2546 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2547 lambda *_, **__: (
2548 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002549 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2550 lambda _, s: self._mocked_call(['SetCQState', s]))
2551 self.calls = [
2552 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002553 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002554 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2555 ((['git', 'config', 'rietveld.server'],),
2556 'https://codereview.chromium.org'),
2557 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2558 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2559 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2560 ((['get_or_create_merge_base', 'feature', 'feature'],),
2561 'fake_ancestor_sha'),
2562 ((['GetChange', 'fake_ancestor_sha', None], ),
2563 git_cl.presubmit_support.GitChange(
2564 '', '', '', '', '', '', '', '')),
2565 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2566 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002567 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2568 ]
2569 out = StringIO.StringIO()
2570 self.mock(git_cl.sys, 'stdout', out)
2571 self.assertEqual(0, git_cl.main(['try']))
2572 self.assertEqual(
2573 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002574 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002575
tandrii8c5a3532016-11-04 07:52:02 -07002576 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2577 self.mock(git_cl.Changelist, 'GetChange',
2578 lambda _, *a: (
2579 self._mocked_call(['GetChange']+list(a))))
2580 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2581 lambda *_, **__: (
2582 self._mocked_call(['DoGetTryMasters'])))
2583 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2584 lambda _, s: self._mocked_call(['SetCQState', s]))
2585
tandrii8c5a3532016-11-04 07:52:02 -07002586 self.calls = [
2587 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2588 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2589 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2590 ((['git', 'config', 'branch.feature.gerritserver'],),
2591 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002592 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2593 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2594 'project': 'depot_tools',
2595 'status': 'OPEN',
2596 'owner': {'email': 'owner@e.mail'},
2597 'revisions': {
2598 'deadbeaf': {
2599 '_number': 6,
2600 },
2601 'beeeeeef': {
2602 '_number': 7,
2603 'fetch': {'http': {
2604 'url': 'https://chromium.googlesource.com/depot_tools',
2605 'ref': 'refs/changes/56/123456/7'
2606 }},
2607 },
2608 },
2609 }),
tandrii8c5a3532016-11-04 07:52:02 -07002610 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2611 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2612 ((['get_or_create_merge_base', 'feature', 'feature'],),
2613 'fake_ancestor_sha'),
2614 ((['GetChange', 'fake_ancestor_sha', None], ),
2615 git_cl.presubmit_support.GitChange(
2616 '', '', '', '', '', '', '', '')),
2617 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2618 ((['DoGetTryMasters'], ), None),
2619 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2620 ]
2621 out = StringIO.StringIO()
2622 self.mock(git_cl.sys, 'stdout', out)
2623 self.assertEqual(0, git_cl.main(['try']))
2624 self.assertEqual(
2625 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002626 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002627 'https://chromium-review.googlesource.com/123456\n')
2628
2629 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2630 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2631 lambda _: {
2632 'owner_email': 'owner@e.mail',
2633 'private': False,
2634 'closed': False,
2635 'project': 'depot_tools',
2636 'patchsets': [20001],
2637 })
tandriide281ae2016-10-12 06:02:30 -07002638 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2639 self.calls = [
2640 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2641 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2642 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2643 ((['git', 'config', 'rietveld.server'],),
2644 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002645 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002646 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002647 ]
2648
2649 def _buildbucket_retry(*_, **kw):
2650 # self.maxDiff = 10000
2651 body = json.loads(kw['body'])
2652 self.assertEqual(len(body['builds']), 1)
2653 build = body['builds'][0]
2654 params = json.loads(build.pop('parameters_json'))
2655 self.assertEqual(params, {
2656 u'builder_name': u'win',
2657 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2658 u'revision': None}],
2659 u'properties': {
2660 u'category': u'git_cl_try',
2661 u'issue': 123,
2662 u'key': u'val',
2663 u'json': [{u'a': 1}, None],
2664 u'master': u'tryserver.chromium',
2665 u'patch_project': u'depot_tools',
2666 u'patch_storage': u'rietveld',
2667 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002668 u'rietveld': u'https://codereview.chromium.org',
2669 }
2670 })
2671 self.assertEqual(build, {
2672 u'bucket': u'master.tryserver.chromium',
2673 u'client_operation_id': u'uuid4',
2674 u'tags': [u'builder:win',
2675 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002676 u'user_agent:git_cl_try',
2677 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002678 })
2679
2680 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2681
2682 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2683 self.assertEqual(0, git_cl.main([
2684 'try', '-m', 'tryserver.chromium', '-b', 'win',
2685 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2686 self.assertRegexpMatches(
2687 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002688 'Tried jobs on:\nBucket: master.tryserver.chromium')
2689
tandrii8c5a3532016-11-04 07:52:02 -07002690 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2691 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2692 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2693
tandrii8c5a3532016-11-04 07:52:02 -07002694 self.calls = [
2695 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2696 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2697 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2698 ((['git', 'config', 'branch.feature.gerritserver'],),
2699 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002700 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002701 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002702 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002703 'status': 'OPEN',
2704 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002705 'revisions': {
2706 'deadbeaf': {
2707 '_number': 6,
2708 },
2709 'beeeeeef': {
2710 '_number': 7,
2711 'fetch': {'http': {
2712 'url': 'https://chromium.googlesource.com/depot_tools',
2713 'ref': 'refs/changes/56/123456/7'
2714 }},
2715 },
2716 },
2717 }),
2718 ]
2719
2720 def _buildbucket_retry(*_, **kw):
2721 # self.maxDiff = 10000
2722 body = json.loads(kw['body'])
2723 self.assertEqual(len(body['builds']), 1)
2724 build = body['builds'][0]
2725 params = json.loads(build.pop('parameters_json'))
2726 self.assertEqual(params, {
2727 u'builder_name': u'win',
2728 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2729 u'revision': None}],
2730 u'properties': {
2731 u'category': u'git_cl_try',
2732 u'key': u'val',
2733 u'json': [{u'a': 1}, None],
2734 u'master': u'tryserver.chromium',
2735
2736 u'patch_gerrit_url':
2737 u'https://chromium-review.googlesource.com',
2738 u'patch_issue': 123456,
2739 u'patch_project': u'depot_tools',
2740 u'patch_ref': u'refs/changes/56/123456/7',
2741 u'patch_repository_url':
2742 u'https://chromium.googlesource.com/depot_tools',
2743 u'patch_set': 7,
2744 u'patch_storage': u'gerrit',
2745 }
2746 })
2747 self.assertEqual(build, {
2748 u'bucket': u'master.tryserver.chromium',
2749 u'client_operation_id': u'uuid4',
2750 u'tags': [
2751 u'builder:win',
2752 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2753 u'user_agent:git_cl_try',
2754 u'master:tryserver.chromium'],
2755 })
2756
2757 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2758
2759 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2760 self.assertEqual(0, git_cl.main([
2761 'try', '-m', 'tryserver.chromium', '-b', 'win',
2762 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2763 self.assertRegexpMatches(
2764 git_cl.sys.stdout.getvalue(),
2765 'Tried jobs on:\nBucket: master.tryserver.chromium')
2766
borenet6c0efe62016-10-19 08:13:29 -07002767 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002768 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2769 lambda _: {
2770 'owner_email': 'owner@e.mail',
2771 'private': False,
2772 'closed': False,
2773 'project': 'depot_tools',
2774 'patchsets': [20001],
2775 })
borenet6c0efe62016-10-19 08:13:29 -07002776 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2777 self.calls = [
2778 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2779 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2780 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2781 ((['git', 'config', 'rietveld.server'],),
2782 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002783 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002784 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002785 ]
2786
2787 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002788 body = json.loads(kw['body'])
2789 self.assertEqual(len(body['builds']), 1)
2790 build = body['builds'][0]
2791 params = json.loads(build.pop('parameters_json'))
2792 self.assertEqual(params, {
2793 u'builder_name': u'win',
2794 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2795 u'revision': None}],
2796 u'properties': {
2797 u'category': u'git_cl_try',
2798 u'issue': 123,
2799 u'patch_project': u'depot_tools',
2800 u'patch_storage': u'rietveld',
2801 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002802 u'rietveld': u'https://codereview.chromium.org',
2803 }
2804 })
2805 self.assertEqual(build, {
2806 u'bucket': u'test.bucket',
2807 u'client_operation_id': u'uuid4',
2808 u'tags': [u'builder:win',
2809 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2810 u'user_agent:git_cl_try'],
2811 })
2812
2813 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2814
2815 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2816 self.assertEqual(0, git_cl.main([
2817 'try', '-B', 'test.bucket', '-b', 'win']))
2818 self.assertRegexpMatches(
2819 git_cl.sys.stdout.getvalue(),
2820 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002821
qyearsley123a4682016-10-26 09:12:17 -07002822 def test_git_cl_try_bots_on_multiple_masters(self):
2823 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2824 self.calls = [
2825 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2826 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2827 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2828 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002829 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002830 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2831 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2832 ]
2833
2834 def _buildbucket_retry(*_, **kw):
2835 body = json.loads(kw['body'])
2836 self.assertEqual(len(body['builds']), 2)
2837
Nodir Turakulovb422e682018-02-20 22:51:30 -08002838 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2839 params = json.loads(body['builds'][0]['parameters_json'])
2840 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002841
Nodir Turakulovb422e682018-02-20 22:51:30 -08002842 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2843 params = json.loads(body['builds'][1]['parameters_json'])
2844 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002845
2846 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2847
2848 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002849 json.dumps({
2850 'builder1': {'bucket': 'bucket1'},
2851 'builder2': {'bucket': 'bucket2'},
2852 })))
qyearsley123a4682016-10-26 09:12:17 -07002853
2854 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2855 self.assertEqual(
2856 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2857 self.assertEqual(
2858 git_cl.sys.stdout.getvalue(),
2859 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002860 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002861 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002862 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002863 ' builder2: []\n'
2864 'To see results here, run: git cl try-results\n'
2865 'To see results in browser, run: git cl web\n')
2866
tandrii16e0b4e2016-06-07 10:34:28 -07002867 def _common_GerritCommitMsgHookCheck(self):
2868 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2869 self.mock(git_cl.os.path, 'abspath',
2870 lambda path: self._mocked_call(['abspath', path]))
2871 self.mock(git_cl.os.path, 'exists',
2872 lambda path: self._mocked_call(['exists', path]))
2873 self.mock(git_cl.gclient_utils, 'FileRead',
2874 lambda path: self._mocked_call(['FileRead', path]))
2875 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2876 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2877 self.calls = [
2878 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2879 ((['abspath', '../'],), '/abs/git_repo_root'),
2880 ]
2881 return git_cl.Changelist(codereview='gerrit', issue=123)
2882
2883 def test_GerritCommitMsgHookCheck_custom_hook(self):
2884 cl = self._common_GerritCommitMsgHookCheck()
2885 self.calls += [
2886 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2887 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2888 '#!/bin/sh\necho "custom hook"')
2889 ]
2890 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2891
2892 def test_GerritCommitMsgHookCheck_not_exists(self):
2893 cl = self._common_GerritCommitMsgHookCheck()
2894 self.calls += [
2895 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2896 ]
2897 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2898
2899 def test_GerritCommitMsgHookCheck(self):
2900 cl = self._common_GerritCommitMsgHookCheck()
2901 self.calls += [
2902 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2903 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2904 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002905 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002906 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2907 ''),
2908 ]
2909 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2910
tandriic4344b52016-08-29 06:04:54 -07002911 def test_GerritCmdLand(self):
2912 self.calls += [
2913 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2914 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2915 'deadbeaf'),
2916 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2917 ((['git', 'config', 'branch.feature.gerritserver'],),
2918 'chromium-review.googlesource.com'),
2919 ]
2920 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2921 cl._codereview_impl._GetChangeDetail = lambda _: {
2922 'labels': {},
2923 'current_revision': 'deadbeaf',
2924 }
agable32978d92016-11-01 12:55:02 -07002925 cl._codereview_impl._GetChangeCommit = lambda: {
2926 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002927 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002928 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2929 }
tandriic4344b52016-08-29 06:04:54 -07002930 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002931 out = StringIO.StringIO()
2932 self.mock(sys, 'stdout', out)
Olivier Robin75ee7252018-04-13 10:02:56 +02002933 self.assertEqual(0, cl.CMDLand(force=True,
2934 bypass_hooks=True,
2935 verbose=True,
2936 parallel=False))
tandrii8da412c2016-09-07 16:01:07 -07002937 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002938 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002939
tandrii221ab252016-10-06 08:12:04 -07002940 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002941 '9000': {
2942 'id': '9000',
2943 'bucket': 'master.x.y',
2944 'created_by': 'user:someone@chromium.org',
2945 'created_ts': '147200002222000',
2946 'experimental': False,
2947 'parameters_json': json.dumps({
2948 'builder_name': 'my-bot',
2949 'properties': {'category': 'cq'},
2950 }),
2951 'status': 'STARTED',
2952 'tags': [
2953 'build_address:x.y/my-bot/2',
2954 'builder:my-bot',
2955 'experimental:false',
2956 'user_agent:cq',
2957 ],
2958 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2959 },
2960 '8000': {
2961 'id': '8000',
2962 'bucket': 'master.x.y',
2963 'created_by': 'user:someone@chromium.org',
2964 'created_ts': '147200001111000',
2965 'experimental': False,
2966 'failure_reason': 'BUILD_FAILURE',
2967 'parameters_json': json.dumps({
2968 'builder_name': 'my-bot',
2969 'properties': {'category': 'cq'},
2970 }),
2971 'result_details_json': json.dumps({
2972 'properties': {'buildnumber': 1},
2973 }),
2974 'result': 'FAILURE',
2975 'status': 'COMPLETED',
2976 'tags': [
2977 'build_address:x.y/my-bot/1',
2978 'builder:my-bot',
2979 'experimental:false',
2980 'user_agent:cq',
2981 ],
2982 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2983 },
2984 }
tandrii221ab252016-10-06 08:12:04 -07002985
2986 def test_write_try_results_json(self):
2987 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002988 {
2989 'bucket': 'master.x.y',
2990 'buildbucket_id': '8000',
2991 'builder_name': 'my-bot',
2992 'created_ts': '147200001111000',
2993 'experimental': False,
2994 'failure_reason': 'BUILD_FAILURE',
2995 'result': 'FAILURE',
2996 'status': 'COMPLETED',
2997 'tags': [
2998 'build_address:x.y/my-bot/1',
2999 'builder:my-bot',
3000 'experimental:false',
3001 'user_agent:cq',
3002 ],
3003 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
3004 },
3005 {
3006 'bucket': 'master.x.y',
3007 'buildbucket_id': '9000',
3008 'builder_name': 'my-bot',
3009 'created_ts': '147200002222000',
3010 'experimental': False,
3011 'failure_reason': None,
3012 'result': None,
3013 'status': 'STARTED',
3014 'tags': [
3015 'build_address:x.y/my-bot/2',
3016 'builder:my-bot',
3017 'experimental:false',
3018 'user_agent:cq',
3019 ],
3020 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
3021 },
tandrii221ab252016-10-06 08:12:04 -07003022 ]
3023 self.calls = [(('write_json', 'output.json', expected_output), '')]
3024 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3025
tandrii45b2a582016-10-11 03:14:16 -07003026 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003027 out = StringIO.StringIO()
3028 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003029 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3030 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003031 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3032 self._mocked_call(['get_authenticator_for_host', host]))
3033 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3034 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003035
3036 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3037 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003038 self.calls += [
3039 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3040 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3041 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3042 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3043 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3044 ((['git', 'config', 'branch.feature.rietveldserver'],),
3045 'codereview.example.com'),
3046 ((['get_authenticator_for_host', 'codereview.example.com'],),
3047 AuthenticatorMock()),
3048 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3049
3050 def test_fetch_try_jobs_none_rietveld(self):
3051 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003052 # Simulate that user isn't logged in.
3053 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003054 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003055 self.assertRegexpMatches(sys.stdout.getvalue(),
3056 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003057 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3058
3059 def test_fetch_try_jobs_some_rietveld(self):
3060 self._setup_fetch_try_jobs_rietveld({
3061 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3062 })
3063 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003064 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3065 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3066 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3067
3068 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3069 self._setup_fetch_try_jobs(most_recent_patchset=13)
3070 self.calls += [
3071 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3072 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3073 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003074 # TODO(tandrii): Uncomment the below if we decide to support checking
3075 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003076 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003077 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003078 ((['git', 'config', 'branch.feature.gerritserver'],),
3079 'https://x-review.googlesource.com'),
3080 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3081 AuthenticatorMock()),
3082 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3083
3084 def test_fetch_try_jobs_none_gerrit(self):
3085 self._setup_fetch_try_jobs_gerrit({})
3086 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003087 # TODO(tandrii): Uncomment the below if we decide to support checking
3088 # patchsets for Gerrit.
3089 # self.assertRegexpMatches(
3090 # sys.stdout.getvalue(),
3091 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003092 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3093
3094 def test_fetch_try_jobs_some_gerrit(self):
3095 self._setup_fetch_try_jobs_gerrit({
3096 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3097 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003098 # TODO(tandrii): Uncomment the below if we decide to support checking
3099 # patchsets for Gerrit.
3100 # self.calls.remove(
3101 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003102 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3103
3104 # ... and doesn't result in warning.
3105 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3106 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003107 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3108 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3109
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003110 def _mock_gerrit_changes_for_detail_cache(self):
3111 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003112
3113 def test_gerrit_change_detail_cache_normalize(self):
3114 self._mock_gerrit_changes_for_detail_cache()
3115 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003116 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003117 ]
3118 cl = git_cl.Changelist(codereview='gerrit')
3119 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3120 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3121 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3122 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3123
3124 def test_gerrit_change_detail_cache_simple(self):
3125 self._mock_gerrit_changes_for_detail_cache()
3126 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003127 (('GetChangeDetail', 'host', '1', []), 'a'),
3128 (('GetChangeDetail', 'host', '2', []), 'b'),
3129 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003130 ]
3131 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3132 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3133 self.assertEqual(cl._GetChangeDetail(), 'a')
3134 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003135 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003136 self.assertEqual(cl._GetChangeDetail(), 'a')
3137 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3138
3139 def test_gerrit_change_detail_cache_options(self):
3140 self._mock_gerrit_changes_for_detail_cache()
3141 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003142 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3143 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3144 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3145 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003146 ]
3147 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3148 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3149 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3150 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3151 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3152 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3153 self.assertEqual(cl._GetChangeDetail(), 'cab')
3154
3155 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3156 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3157 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3158 self.assertEqual(cl._GetChangeDetail(), 'cab')
3159
3160 # Finally, no_cache should invalidate all caches for given change.
3161 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3162 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3163
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003164 def test_gerrit_description_caching(self):
3165 def gen_detail(rev, desc):
3166 return {
3167 'current_revision': rev,
3168 'revisions': {rev: {'commit': {'message': desc}}}
3169 }
3170 self.calls = [
3171 (('GetChangeDetail', 'host', '1',
3172 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3173 gen_detail('rev1', 'desc1')),
3174 (('GetChangeDetail', 'host', '1',
3175 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3176 gen_detail('rev2', 'desc2')),
3177 ]
3178
3179 self._mock_gerrit_changes_for_detail_cache()
3180 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3181 self.assertEqual(cl.GetDescription(), 'desc1')
3182 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3183 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003184
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003185 def test_print_current_creds(self):
3186 class CookiesAuthenticatorMock(object):
3187 def __init__(self):
3188 self.gitcookies = {
3189 'host.googlesource.com': ('user', 'pass'),
3190 'host-review.googlesource.com': ('user', 'pass'),
3191 }
3192 self.netrc = self
3193 self.netrc.hosts = {
3194 'github.com': ('user2', None, 'pass2'),
3195 'host2.googlesource.com': ('user3', None, 'pass'),
3196 }
3197 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3198 CookiesAuthenticatorMock)
3199 self.mock(sys, 'stdout', StringIO.StringIO())
3200 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3201 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3202 ' Host\t User\t Which file',
3203 '============================\t=====\t===========',
3204 'host-review.googlesource.com\t user\t.gitcookies',
3205 ' host.googlesource.com\t user\t.gitcookies',
3206 ' host2.googlesource.com\tuser3\t .netrc',
3207 ])
3208 sys.stdout.buf = ''
3209 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3210 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3211 ' Host\tUser\t Which file',
3212 '============================\t====\t===========',
3213 'host-review.googlesource.com\tuser\t.gitcookies',
3214 ' host.googlesource.com\tuser\t.gitcookies',
3215 ])
3216
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003217 def _common_creds_check_mocks(self):
3218 def exists_mock(path):
3219 dirname = os.path.dirname(path)
3220 if dirname == os.path.expanduser('~'):
3221 dirname = '~'
3222 base = os.path.basename(path)
3223 if base in ('.netrc', '.gitcookies'):
3224 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3225 # git cl also checks for existence other files not relevant to this test.
3226 return None
3227 self.mock(os.path, 'exists', exists_mock)
3228 self.mock(sys, 'stdout', StringIO.StringIO())
3229
3230 def test_creds_check_gitcookies_not_configured(self):
3231 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003232 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003233 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003234 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003235 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003236 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3237 (('os.path.exists', '~/.netrc'), True),
3238 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3239 'or Ctrl+C to abort'), ''),
3240 ((['git', 'config', '--global', 'http.cookiefile',
3241 os.path.expanduser('~/.gitcookies')], ), ''),
3242 ]
3243 self.assertEqual(0, git_cl.main(['creds-check']))
3244 self.assertRegexpMatches(
3245 sys.stdout.getvalue(),
3246 '^You seem to be using outdated .netrc for git credentials:')
3247 self.assertRegexpMatches(
3248 sys.stdout.getvalue(),
3249 '\nConfigured git to use .gitcookies from')
3250
3251 def test_creds_check_gitcookies_configured_custom_broken(self):
3252 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003253 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003254 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003255 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003256 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003257 ((['git', 'config', '--global', 'http.cookiefile'],),
3258 '/custom/.gitcookies'),
3259 (('os.path.exists', '/custom/.gitcookies'), False),
3260 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3261 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3262 ((['git', 'config', '--global', 'http.cookiefile',
3263 os.path.expanduser('~/.gitcookies')], ), ''),
3264 ]
3265 self.assertEqual(0, git_cl.main(['creds-check']))
3266 self.assertRegexpMatches(
3267 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003268 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003269 self.assertRegexpMatches(
3270 sys.stdout.getvalue(),
3271 'However, your configured .gitcookies file is missing.')
3272
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003273 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003274 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003275 lambda _, message, publish: self._mocked_call(
3276 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003277 self.calls = [
3278 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3279 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003280 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003281 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003282 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3283 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003284
3285 def test_git_cl_comment_add_gerrit(self):
3286 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003287 lambda host, change, msg, ready:
3288 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003289 self.calls = [
3290 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3291 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3292 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3293 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3294 'origin/master'),
3295 ((['git', 'config', 'remote.origin.url'],),
3296 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003297 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3298 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003299 ]
3300 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3301 '-a', 'msg']))
3302
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003303 def test_git_cl_comments_fetch_rietveld(self):
3304 self.mock(sys, 'stdout', StringIO.StringIO())
3305 self.calls = [
3306 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3307 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3308 ] * 2
3309 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3310 'messages': [
3311 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3312 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3313 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3314 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3315 # Intentionally wrong order here.
3316 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3317 'disapproval': False, 'approval': False,
3318 'sender': 'owner@example.com'},
3319 ],
3320 'owner_email': 'owner@example.com',
3321 })
3322 expected_comments_summary = [
3323 git_cl._CommentSummary(
3324 message='lgtm',
3325 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3326 disapproval=False, approval=True, sender='r@example.com'),
3327 git_cl._CommentSummary(
3328 message='not lgtm',
3329 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3330 disapproval=True, approval=False, sender='r2@example.com'),
3331 # Note: same order as in whatever Rietveld returns.
3332 git_cl._CommentSummary(
3333 message='PTAL',
3334 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3335 disapproval=False, approval=False, sender='owner@example.com'),
3336 ]
3337 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3338 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3339
3340 with git_cl.gclient_utils.temporary_directory() as tempdir:
3341 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3342 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3343 '-j', out_file]))
3344 with open(out_file) as f:
3345 read = json.load(f)
3346 self.assertEqual(len(read), 3)
3347 self.assertEqual(read[0], {
3348 'date': '2000-03-13 20:49:34.515270',
3349 'message': 'PTAL',
3350 'approval': False,
3351 'disapproval': False,
3352 'sender': 'owner@example.com'})
3353 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3354 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3355
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003356 def test_git_cl_comments_fetch_gerrit(self):
3357 self.mock(sys, 'stdout', StringIO.StringIO())
3358 self.calls = [
3359 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3360 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3361 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3362 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3363 'origin/master'),
3364 ((['git', 'config', 'remote.origin.url'],),
3365 'https://chromium.googlesource.com/infra/infra'),
3366 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3367 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003368 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003369 'messages': [
3370 {
3371 u'_revision_number': 1,
3372 u'author': {
3373 u'_account_id': 1111084,
3374 u'email': u'commit-bot@chromium.org',
3375 u'name': u'Commit Bot'
3376 },
3377 u'date': u'2017-03-15 20:08:45.000000000',
3378 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003379 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003380 u'tag': u'autogenerated:cq:dry-run'
3381 },
3382 {
3383 u'_revision_number': 2,
3384 u'author': {
3385 u'_account_id': 11151243,
3386 u'email': u'owner@example.com',
3387 u'name': u'owner'
3388 },
3389 u'date': u'2017-03-16 20:00:41.000000000',
3390 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3391 u'message': u'PTAL',
3392 },
3393 {
3394 u'_revision_number': 2,
3395 u'author': {
3396 u'_account_id': 148512 ,
3397 u'email': u'reviewer@example.com',
3398 u'name': u'reviewer'
3399 },
3400 u'date': u'2017-03-17 05:19:37.500000000',
3401 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3402 u'message': u'Patch Set 2: Code-Review+1',
3403 },
3404 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003405 }),
3406 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3407 '/COMMIT_MSG': [
3408 {
3409 'author': {'email': u'reviewer@example.com'},
3410 'updated': u'2017-03-17 05:19:37.500000000',
3411 'patch_set': 2,
3412 'side': 'REVISION',
3413 'message': 'Please include a bug link',
3414 },
3415 ],
3416 'codereview.settings': [
3417 {
3418 'author': {'email': u'owner@example.com'},
3419 'updated': u'2017-03-16 20:00:41.000000000',
3420 'patch_set': 2,
3421 'side': 'PARENT',
3422 'line': 42,
3423 'message': 'I removed this because it is bad',
3424 },
3425 ]
3426 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003427 ] * 2
3428 expected_comments_summary = [
3429 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003430 message=(
3431 u'PTAL\n' +
3432 u'\n' +
3433 u'codereview.settings\n' +
3434 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3435 u'c/1/2/codereview.settings#b42\n' +
3436 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003437 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3438 disapproval=False, approval=False, sender=u'owner@example.com'),
3439 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003440 message=(
3441 u'Patch Set 2: Code-Review+1\n' +
3442 u'\n' +
3443 u'/COMMIT_MSG\n' +
3444 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3445 u'c/1/2//COMMIT_MSG#\n' +
3446 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003447 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3448 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3449 ]
3450 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3451 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3452
3453 with git_cl.gclient_utils.temporary_directory() as tempdir:
3454 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3455 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3456 '-j', out_file]))
3457 with open(out_file) as f:
3458 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003459 self.assertEqual(len(read), 2)
3460 self.assertEqual(read[0], {
3461 u'date': u'2017-03-16 20:00:41.000000',
3462 u'message': (
3463 u'PTAL\n' +
3464 u'\n' +
3465 u'codereview.settings\n' +
3466 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3467 u'c/1/2/codereview.settings#b42\n' +
3468 u' I removed this because it is bad\n'),
3469 u'approval': False,
3470 u'disapproval': False,
3471 u'sender': u'owner@example.com'})
3472 self.assertEqual(read[1], {
3473 u'date': u'2017-03-17 05:19:37.500000',
3474 u'message': (
3475 u'Patch Set 2: Code-Review+1\n' +
3476 u'\n' +
3477 u'/COMMIT_MSG\n' +
3478 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3479 u'c/1/2//COMMIT_MSG#\n' +
3480 u' Please include a bug link\n'),
3481 u'approval': False,
3482 u'disapproval': False,
3483 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003484
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003485
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003486if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003487 logging.basicConfig(
3488 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003489 unittest.main()