blob: ee6fe3b427185b34966548f092ec129a4bc86358 [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))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000666 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
667 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700668 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100669 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000670 # It's important to reset settings to not have inter-tests interference.
671 git_cl.settings = None
672
673 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000674 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100675 self.assertEquals([], self.calls)
676 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000677 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100678 raise
679 # Sadly, has_failed() returns True if this OR any other tests before this
680 # one have failed.
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200681 git_cl.logging.error(
682 '!!!!!! IF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME !!!!!\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100683 'There are un-consumed self.calls after this test has finished.\n'
684 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700685 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalove05d4882017-04-12 14:34:49 +0200686 'If you are already running only this test, then **first** fix the '
687 'problem whose exception is emitted below by unittest runner.\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100688 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700689 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100690 'and follow instructions above.\n' +
691 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000692 finally:
693 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000694
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000695 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000696 self.assertTrue(
697 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700698 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000699 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000700 expected_args, result = top
701
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000702 # Also logs otherwise it could get caught in a try/finally and be hard to
703 # diagnose.
704 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700705 N = 5
706 prior_calls = '\n '.join(
707 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
708 for i, c in enumerate(self._calls_done[-N:]))
709 following_calls = '\n '.join(
710 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
711 for i, c in enumerate(self.calls[:N]))
712 extended_msg = (
713 'A few prior calls:\n %s\n\n'
714 'This (expected):\n @%d: %r\n'
715 'This (actual):\n @%d: %r\n\n'
716 'A few following expected calls:\n %s' %
717 (prior_calls, len(self._calls_done), expected_args,
718 len(self._calls_done), args, following_calls))
719 git_cl.logging.error(extended_msg)
720
tandrii99a72f22016-08-17 14:33:24 -0700721 self.fail('@%d\n'
722 ' Expected: %r\n'
723 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700724 len(self._calls_done), expected_args, args))
725
726 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700727 if isinstance(result, Exception):
728 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000729 return result
730
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100731 def test_ask_for_explicit_yes_true(self):
732 self.calls = [
733 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
734 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
735 ]
736 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
737
tandrii48df5812016-10-17 03:55:37 -0700738 def test_LoadCodereviewSettingsFromFile_gerrit(self):
739 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
740 self.calls = [
741 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
742 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
743 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
744 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
745 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
746 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700747 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
748 CERR1),
749 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700750 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
751 CERR1),
752 ((['git', 'config', 'gerrit.host', 'true'],), ''),
753 ]
754 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
755
maruel@chromium.orga3353652011-11-30 14:26:57 +0000756 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000757 def _is_gerrit_calls(cls, gerrit=False):
758 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
759 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
760
761 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800762 def _upload_calls(cls, private):
763 return (cls._rietveld_git_base_calls() +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000764 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000765
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000766 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800767 def _rietveld_upload_no_rev_calls(cls):
768 return (cls._rietveld_git_base_calls() + [
Andrii Shyshkalov73827d12017-04-12 15:05:11 +0200769 ((['git', 'config', 'core.editor'],), ''),
770 ])
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000771
772 @classmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800773 def _rietveld_git_base_calls(cls):
774 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
775 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000776
Aaron Gable13101a62018-02-09 13:20:41 -0800777 return cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000778 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700779 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
780 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000781 ((['git', 'config', 'rietveld.server'],),
782 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000783 ((['git', 'config', 'branch.master.merge'],), 'master'),
784 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000785 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000786 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000787 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000788 ((['git', 'rev-parse', '--show-cdup'],), ''),
789 ((['git', 'rev-parse', 'HEAD'],), '12345'),
Aaron Gable7817f022017-12-12 09:43:17 -0800790 ((['git', '-c', 'core.quotePath=false', 'diff',
791 '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000792 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700793 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000794 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000795 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000796 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000797 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000798 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000799 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000800 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000801 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700802 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000803 ]
804
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000805 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000806 def _git_upload_calls(cls, private):
807 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000808 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000809 private_call = []
810 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000811 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000812 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000813 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000814
maruel@chromium.orga3353652011-11-30 14:26:57 +0000815 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000816 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000817 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000818 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800819 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000820 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700821 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000822 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000823 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700825 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000826 ] + cls._git_post_upload_calls()
827
828 @classmethod
829 def _git_post_upload_calls(cls):
830 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000831 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
832 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
833 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000834 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000835 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000836 ]
837
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000838 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000839 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000840 fake_ancestor = 'fake_ancestor'
841 fake_cl = 'fake_cl_for_patch'
842 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000843 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000844 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000845 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000846 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000847 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000848 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000849 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000850 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700851 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000852 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000853 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000854 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000855 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000856 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000857 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000858 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000859 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000860 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000861 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000862 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000863
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000864 @staticmethod
Aaron Gable13101a62018-02-09 13:20:41 -0800865 def _cmd_line(description, args, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000866 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000867 return [
Daniel Cheng7227d212017-11-17 08:12:37 -0800868 'upload', '--assume_yes', '--server', 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000869 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000870 ] + args + [
Daniel Cheng7227d212017-11-17 08:12:37 -0800871 '--cc',
872 ','.join(
873 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
874 cc),
Aaron Gable13101a62018-02-09 13:20:41 -0800875 ] + (['--private'] if private else []) + ['fake_ancestor_sha', 'HEAD']
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000876
877 def _run_reviewer_test(
878 self,
879 upload_args,
880 expected_description,
881 returned_description,
882 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000883 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700884 private=False,
885 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000886 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000887 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org79540052012-10-19 23:15:26 +0000888
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000889 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700890 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000891
Aaron Gable13101a62018-02-09 13:20:41 -0800892 self.calls = self._upload_calls(private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000893
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000894 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000895 self.assertEquals(
896 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000897 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000898 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000899 '#--------------------This line is 72 characters long'
900 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000901 expected_description,
902 desc)
903 return returned_description
904 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000905
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000906 def check_upload(args):
Aaron Gable13101a62018-02-09 13:20:41 -0800907 cmd_line = self._cmd_line(final_description, reviewers, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000908 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000909 return 1, 2
910 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000911
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000912 git_cl.main(['upload'] + upload_args)
913
914 def test_no_reviewer(self):
915 self._run_reviewer_test(
916 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000917 'desc\n\nBUG=',
918 '# Blah blah comment.\ndesc\n\nBUG=',
919 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000920 [])
921
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000922 def test_private(self):
923 self._run_reviewer_test(
924 ['--private'],
925 'desc\n\nBUG=',
926 '# Blah blah comment.\ndesc\n\nBUG=\n',
927 'desc\n\nBUG=',
928 [])
929
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000930 def test_reviewers_cmd_line(self):
931 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000932 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000933 self._run_reviewer_test(
934 ['-r' 'foo@example.com'],
935 description,
936 '\n%s\n' % description,
937 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000938 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000939
940 def test_reviewer_tbr_overriden(self):
941 # Reviewer is overriden with TBR
942 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000943 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000944 self._run_reviewer_test(
945 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000946 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000947 description.strip('\n'),
948 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000949 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000950
951 def test_reviewer_multiple(self):
952 # Handles multiple R= or TBR= lines.
953 description = (
bradnelsond975b302016-10-23 12:20:23 -0700954 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
955 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000956 self._run_reviewer_test(
957 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000958 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000959 description,
960 description,
bradnelsond975b302016-10-23 12:20:23 -0700961 ['--reviewers=another@example.com,reviewer@example.com'],
962 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000963
maruel@chromium.orga3353652011-11-30 14:26:57 +0000964 def test_reviewer_send_mail(self):
965 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000966 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000967 self._run_reviewer_test(
968 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000969 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000970 description.strip('\n'),
971 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000972 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000973
974 def test_reviewer_send_mail_no_rev(self):
975 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000976 stdout = StringIO.StringIO()
Aaron Gable13101a62018-02-09 13:20:41 -0800977 self.calls = self._rietveld_upload_no_rev_calls() + [
tandriic2405f52016-10-10 08:13:15 -0700978 ((['DieWithError', 'Must specify reviewers to send email.'],),
979 SystemExitMock())
980 ]
981
982 def RunEditor(desc, _, **kwargs):
983 return desc
984 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
985 self.mock(sys, 'stdout', stdout)
986 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000987 git_cl.main(['upload', '--send-mail'])
Aaron Gablec4c40d12017-05-22 11:49:53 -0700988 self.assertEqual(
989 '=====================================\n'
990 'NOTICE: Rietveld is being deprecated. '
991 'You can upload changes to Gerrit with\n'
992 ' git cl upload --gerrit\n'
993 'or set Gerrit to be your default code review tool with\n'
994 ' git config gerrit.host true\n'
995 '=====================================\n',
996 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000997
tandriif9aefb72016-07-01 09:06:51 -0700998 def test_bug_on_cmd(self):
999 self._run_reviewer_test(
1000 ['--bug=500658,proj:123'],
1001 'desc\n\nBUG=500658\nBUG=proj:123',
1002 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1003 'desc\n\nBUG=500658\nBUG=proj:1234',
1004 [])
1005
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001006 def test_git_numberer_not_whitelisted_repo(self):
1007 self.calls = []
1008 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001009 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1010 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001011 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001012
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001013 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001014 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1015 self.calls = [
1016 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001017 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001018 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001019 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001020 remote_url='https://chromium.googlesource.com/chromium/src',
1021 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001022 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001023
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001024 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001025 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001026 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001027 def fake_temporary_directory(**kwargs):
1028 yield tempdir
1029 self.mock(git_cl.gclient_utils, 'temporary_directory',
1030 fake_temporary_directory)
1031 self._test_GitNumbererState_valid_configs_inner(tempdir)
1032
1033 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001034 self.calls = [
1035 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001036 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001037 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1038 '''
1039 [plugin "git-numberer"]
1040 validate-enabled-refglob = refs/else/*
1041 validate-enabled-refglob = refs/heads/*
1042 validate-disabled-refglob = refs/heads/disabled
1043 validate-disabled-refglob = refs/branch-heads/*
1044 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001045 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1046 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001047 'refs/else/*\n'
1048 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001049 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1050 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001051 'refs/heads/disabled\n'
1052 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001053 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001054
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001055 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001056 remote_url='https://chromium.googlesource.com/chromium/src',
1057 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001058 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001059
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001060 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001061 remote_url='https://chromium.googlesource.com/chromium/src',
1062 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001063 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001064
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001065 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001066 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001067 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001068 remote_url='https://chromium.googlesource.com/chromium/src',
1069 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001070 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001071
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001072 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001073 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001074 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001075 if skip_auth_check:
1076 return [((cmd, ), 'true')]
1077
tandrii5d48c322016-08-18 16:19:37 -07001078 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001079 if issue:
1080 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001081 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001082 ])
1083 calls.extend([
1084 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1085 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1086 ((['git', 'config', 'remote.origin.url'],),
1087 'https://chromium.googlesource.com/my/repo'),
1088 ((['git', 'config', 'remote.origin.url'],),
1089 'https://chromium.googlesource.com/my/repo'),
1090 ])
1091 return calls
1092
1093 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001094 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001095 fetched_status=None, other_cl_owner=None,
1096 custom_cl_base=None):
Aaron Gable13101a62018-02-09 13:20:41 -08001097 calls = cls._is_gerrit_calls(True)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001098 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001099 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1100 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1101 ((['git', 'config', 'branch.master.gerritissue'],),
1102 CERR1 if issue is None else str(issue)),
1103 ]
1104
1105 if custom_cl_base:
1106 ancestor_revision = custom_cl_base
1107 else:
1108 # Determine ancestor_revision to be merge base.
1109 ancestor_revision = 'fake_ancestor_sha'
1110 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001111 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001112 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001113 ((['get_or_create_merge_base', 'master',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001114 'refs/remotes/origin/master'],), ancestor_revision),
1115 ]
1116
1117 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001118 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1119
1120 if issue:
1121 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001122 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001123 '123456',
1124 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001125 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001126 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001127 'change_id': '123456789',
1128 'current_revision': 'sha1_of_current_revision',
1129 'revisions': { 'sha1_of_current_revision': {
1130 'commit': {'message': fetched_description},
1131 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001132 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001133 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001134 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001135 if fetched_status == 'ABANDONED':
1136 calls += [
1137 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1138 '123456 has been abandoned, new uploads are not '
1139 'allowed'), SystemExitMock()),
1140 ]
1141 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001142 if other_cl_owner:
1143 calls += [
1144 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1145 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001146
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001147 calls += cls._git_sanity_checks(ancestor_revision, 'master',
1148 get_remote_branch=False)
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001149 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001150 ((['git', 'rev-parse', '--show-cdup'],), ''),
1151 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001152
Aaron Gable7817f022017-12-12 09:43:17 -08001153 ((['git', '-c', 'core.quotePath=false', 'diff', '--name-status',
1154 '--no-renames', '-r', ancestor_revision + '...', '.'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001155 'M\t.gitignore\n'),
1156 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001157 ]
1158
1159 if not issue:
1160 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001161 ((['git', 'log', '--pretty=format:%s%n%n%b',
1162 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001163 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001164 ]
1165
1166 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001167 ((['git', 'config', 'user.email'],), 'me@example.com'),
1168 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
1169 ([custom_cl_base] if custom_cl_base else
1170 [ancestor_revision, 'HEAD']),),
1171 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001172 ]
1173 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001174
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001175 @classmethod
1176 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001177 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001178 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001179 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001180 post_amend_description=None, issue=None, cc=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001181 git_mirror=None, custom_cl_base=None, tbr=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001182 if post_amend_description is None:
1183 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -07001184 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001185 # Determined in `_gerrit_base_calls`.
1186 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
1187
1188 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001189
tandriia60502f2016-06-20 02:01:53 -07001190 if squash_mode == 'default':
1191 calls.extend([
1192 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1193 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1194 ])
1195 elif squash_mode in ('override_squash', 'override_nosquash'):
1196 calls.extend([
1197 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1198 'true' if squash_mode == 'override_squash' else 'false'),
1199 ])
1200 else:
1201 assert squash_mode in ('squash', 'nosquash')
1202
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001203 # If issue is given, then description is fetched from Gerrit instead.
1204 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001205 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001206 ((['git', 'log', '--pretty=format:%s\n\n%b',
1207 ((custom_cl_base + '..') if custom_cl_base else
1208 'fake_ancestor_sha..HEAD')],),
1209 description),
1210 ]
Aaron Gableb56ad332017-01-06 15:24:31 -08001211 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001212 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001213 else:
1214 if not title:
1215 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001216 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1217 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001218 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001219 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001220 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001221 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001222 (('DownloadGerritHook', False), ''),
1223 # Amending of commit message to get the Change-Id.
1224 ((['git', 'log', '--pretty=format:%s\n\n%b',
1225 determined_ancestor_revision + '..HEAD'],),
1226 description),
1227 ((['git', 'commit', '--amend', '-m', description],), ''),
1228 ((['git', 'log', '--pretty=format:%s\n\n%b',
1229 determined_ancestor_revision + '..HEAD'],),
1230 post_amend_description)
1231 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001232 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001233 if not issue:
1234 # Prompting to edit description on first upload.
1235 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001236 ((['git', 'config', 'core.editor'],), ''),
1237 ((['RunEditor'],), description),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001238 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001239 ref_to_push = 'abcdef0123456789'
1240 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001241 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1242 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1243 ]
1244
1245 if custom_cl_base is None:
1246 calls += [
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001247 ((['get_or_create_merge_base', 'master',
1248 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001249 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001250 ]
1251 parent = 'origin/master'
1252 else:
1253 calls += [
1254 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
1255 'refs/remotes/origin/master'],),
1256 callError(1)), # Means not ancenstor.
1257 (('ask_for_data',
1258 'Do you take responsibility for cleaning up potential mess '
1259 'resulting from proceeding with upload? Press Enter to upload, '
1260 'or Ctrl+C to abort'), ''),
1261 ]
1262 parent = custom_cl_base
1263
1264 calls += [
1265 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
1266 '0123456789abcdef'),
1267 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -07001268 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001269 ref_to_push),
1270 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001271 else:
1272 ref_to_push = 'HEAD'
1273
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001274 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001275 ((['git', 'rev-list',
1276 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
1277 ref_to_push],),
1278 '1hashPerLine\n'),
1279 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001280
Aaron Gableafd52772017-06-27 16:40:10 -07001281 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -07001282 ref_suffix = '%ready,notify=ALL'
1283 else:
1284 if not issue:
1285 ref_suffix = '%wip'
1286 else:
1287 ref_suffix = '%notify=NONE'
Aaron Gable9b713dd2016-12-14 16:04:21 -08001288
Aaron Gable70f4e242017-06-26 10:45:59 -07001289 if title:
Aaron Gableafd52772017-06-27 16:40:10 -07001290 ref_suffix += ',m=' + title
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001291
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001292 if git_mirror is None:
1293 calls += [
1294 ((['git', 'config', 'remote.origin.url'],),
1295 'https://chromium.googlesource.com/yyy/zzz'),
1296 ]
1297 else:
1298 calls += [
1299 ((['git', 'config', 'remote.origin.url'],),
1300 '/cache/this-dir-exists'),
1301 (('os.path.isdir', '/cache/this-dir-exists'),
1302 True),
1303 # Runs in /cache/this-dir-exists.
1304 ((['git', 'config', 'remote.origin.url'],),
1305 'https://chromium.googlesource.com/yyy/zzz'),
1306 ]
1307
ukai@chromium.orge8077812012-02-03 03:41:46 +00001308 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001309 ((['git', 'push',
1310 'https://chromium.googlesource.com/yyy/zzz',
1311 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001312 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001313 'remote: Processing changes: (\)\n'
1314 'remote: Processing changes: (|)\n'
1315 'remote: Processing changes: (/)\n'
1316 'remote: Processing changes: (-)\n'
1317 'remote: Processing changes: new: 1 (/)\n'
1318 'remote: Processing changes: new: 1, done\n'
1319 'remote:\n'
1320 'remote: New Changes:\n'
Aaron Gable289b4312017-09-13 14:06:16 -07001321 'remote: https://chromium-review.googlesource.com/#/c/foo/+/123456 '
1322 'XXX\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001323 'remote:\n'
1324 'To https://chromium.googlesource.com/yyy/zzz\n'
1325 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001326 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001327 if squash:
1328 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001329 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001330 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001331 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001332 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001333 ((['git', 'config', 'branch.master.gerritsquashhash',
1334 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001335 ]
tandrii88189772016-09-29 04:29:57 -07001336 calls += [
1337 ((['git', 'config', 'rietveld.cc'],), ''),
Daniel Cheng7227d212017-11-17 08:12:37 -08001338 (('AddReviewers', 'chromium-review.googlesource.com', 123456
1339 if squash else None, sorted(reviewers),
1340 ['joe@example.com', 'chromium-reviews+test-more-cc@chromium.org'] +
1341 cc, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001342 ]
Aaron Gablefd238082017-06-07 13:42:34 -07001343 if tbr:
1344 calls += [
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001345 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
1346 ['LABELS']), {
1347 'labels': {
1348 'Code-Review': {
1349 'default_value': 0,
1350 'all': [],
1351 'values': {
1352 '+2': 'lgtm, approved',
1353 '+1': 'lgtm, but someone else must approve',
1354 ' 0': 'No score',
1355 '-1': 'Don\'t submit as-is',
1356 }
1357 }
1358 }
1359 }),
Aaron Gablefd238082017-06-07 13:42:34 -07001360 (('SetReview', 'chromium-review.googlesource.com',
Aaron Gablefc62f762017-07-17 11:12:07 -07001361 123456 if squash else None, 'Self-approving for TBR',
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001362 {'Code-Review': 2}, None), ''),
Aaron Gablefd238082017-06-07 13:42:34 -07001363 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001364 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001365 return calls
1366
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001367 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001368 self,
1369 upload_args,
1370 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001371 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001372 squash=True,
1373 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001374 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001375 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001376 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001377 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001378 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001379 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001380 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001381 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001382 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001383 custom_cl_base=None,
1384 tbr=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001385 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001386 if squash_mode is None:
1387 if '--no-squash' in upload_args:
1388 squash_mode = 'nosquash'
1389 elif '--squash' in upload_args:
1390 squash_mode = 'squash'
1391 else:
1392 squash_mode = 'default'
1393
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001394 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001395 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001396 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001397 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001398 CookiesAuthenticatorMockFactory(
1399 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001400 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1401 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001402 self.mock(git_cl.gclient_utils, 'RunEditor',
1403 lambda *_, **__: self._mocked_call(['RunEditor']))
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001404 self.mock(git_cl, 'DownloadGerritHook', lambda force: self._mocked_call(
1405 'DownloadGerritHook', force))
tandriia60502f2016-06-20 02:01:53 -07001406
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001407 original_os_path_isdir = os.path.isdir
1408 def selective_os_path_isdir_mock(path):
1409 if path == '/cache/this-dir-exists':
1410 return self._mocked_call('os.path.isdir', path)
1411 return original_os_path_isdir(path)
1412 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1413
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001414 self.calls = self._gerrit_base_calls(
1415 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001416 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001417 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001418 other_cl_owner=other_cl_owner,
1419 custom_cl_base=custom_cl_base)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001420 if fetched_status != 'ABANDONED':
Aaron Gable9a03ae02017-11-03 11:31:07 -07001421 self.mock(tempfile, 'NamedTemporaryFile', MakeNamedTemporaryFileMock(
1422 expected_content=description))
1423 self.mock(os, 'remove', lambda _: True)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001424 self.calls += self._gerrit_upload_calls(
1425 description, reviewers, squash,
1426 squash_mode=squash_mode,
1427 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001428 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001429 post_amend_description=post_amend_description,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001430 issue=issue, cc=cc, git_mirror=git_mirror,
Aaron Gablefd238082017-06-07 13:42:34 -07001431 custom_cl_base=custom_cl_base, tbr=tbr)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001432 # Uncomment when debugging.
1433 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001434 git_cl.main(['upload'] + upload_args)
1435
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001436 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001437 self._run_gerrit_upload_test(
1438 ['--no-squash'],
1439 'desc\n\nBUG=\n',
1440 [],
1441 squash=False,
1442 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1443
1444 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001445 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001446 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001447 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001448 [],
tandriia60502f2016-06-20 02:01:53 -07001449 squash=False,
1450 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001451 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001452
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001453 def test_gerrit_no_reviewer(self):
1454 self._run_gerrit_upload_test(
1455 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001456 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001457 [],
1458 squash=False,
1459 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001460
Nick Carter8692b182017-11-06 16:30:38 -08001461 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001462 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1463 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001464 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001465 'desc\n\nBUG=\n\nChange-Id: I123456789',
1466 squash=False,
1467 squash_mode='override_nosquash',
Nick Carter8692b182017-11-06 16:30:38 -08001468 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001469
ukai@chromium.orge8077812012-02-03 03:41:46 +00001470 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001471 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001472 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001473 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001474 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001475 squash=False,
1476 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001477 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001478
1479 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001480 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001481 [],
bradnelsond975b302016-10-23 12:20:23 -07001482 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1483 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001484 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001485 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001486 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001487 cc=['more@example.com', 'people@example.com'],
1488 tbr='reviewer@example.com')
tandriia60502f2016-06-20 02:01:53 -07001489
1490 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001491 self._run_gerrit_upload_test(
1492 [],
1493 'desc\nBUG=\n\nChange-Id: 123456789',
1494 [],
1495 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001496
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001497 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001498 self._run_gerrit_upload_test(
1499 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001500 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001501 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001502 squash=True,
1503 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001504
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001505 def test_gerrit_upload_squash_first_against_rev(self):
1506 custom_cl_base = 'custom_cl_base_rev_or_branch'
1507 self._run_gerrit_upload_test(
1508 ['--squash', custom_cl_base],
1509 'desc\nBUG=\n\nChange-Id: 123456789',
1510 [],
1511 squash=True,
1512 expected_upstream_ref='origin/master',
1513 custom_cl_base=custom_cl_base)
1514 self.assertIn(
1515 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1516 sys.stdout.getvalue())
1517
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001518 def test_gerrit_upload_squash_first_with_mirror(self):
1519 self._run_gerrit_upload_test(
1520 ['--squash'],
1521 'desc\nBUG=\n\nChange-Id: 123456789',
1522 [],
1523 squash=True,
1524 expected_upstream_ref='origin/master',
1525 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1526
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001527 def test_gerrit_upload_squash_reupload(self):
1528 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001529 self._run_gerrit_upload_test(
1530 ['--squash'],
1531 description,
1532 [],
1533 squash=True,
1534 expected_upstream_ref='origin/master',
1535 issue=123456)
1536
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001537 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1538 self.mock(git_cl, 'DieWithError',
1539 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1540 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1541 with self.assertRaises(SystemExitMock):
1542 self._run_gerrit_upload_test(
1543 ['--squash'],
1544 description,
1545 [],
1546 squash=True,
1547 expected_upstream_ref='origin/master',
1548 issue=123456,
1549 fetched_status='ABANDONED')
1550
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001551 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1552 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1553 lambda *_, **__: {'email': 'yet-another@example.com'})
1554 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1555 self._run_gerrit_upload_test(
1556 ['--squash'],
1557 description,
1558 [],
1559 squash=True,
1560 expected_upstream_ref='origin/master',
1561 issue=123456,
1562 other_cl_owner='other@example.com')
1563 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001564 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001565 'authenticate to Gerrit as yet-another@example.com.\n'
1566 'Uploading may fail due to lack of permissions',
1567 git_cl.sys.stdout.getvalue())
1568
rmistry@google.com2dd99862015-06-22 12:22:18 +00001569 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001570 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001571 def mock_run_git(*args, **_kwargs):
1572 if args[0] == ['for-each-ref',
1573 '--format=%(refname:short) %(upstream:short)',
1574 'refs/heads']:
1575 # Create a local branch dependency tree that looks like this:
1576 # test1 -> test2 -> test3 -> test4 -> test5
1577 # -> test3.1
1578 # test6 -> test0
1579 branch_deps = [
1580 'test2 test1', # test1 -> test2
1581 'test3 test2', # test2 -> test3
1582 'test3.1 test2', # test2 -> test3.1
1583 'test4 test3', # test3 -> test4
1584 'test5 test4', # test4 -> test5
1585 'test6 test0', # test0 -> test6
1586 'test7', # test7
1587 ]
1588 return '\n'.join(branch_deps)
1589 self.mock(git_cl, 'RunGit', mock_run_git)
1590
1591 class RecordCalls:
1592 times_called = 0
1593 record_calls = RecordCalls()
1594 def mock_CMDupload(*args, **_kwargs):
1595 record_calls.times_called += 1
1596 return 0
1597 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1598
1599 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001600 (('ask_for_data', 'This command will checkout all dependent branches '
1601 'and run "git cl upload". Press Enter to continue, '
1602 'or Ctrl+C to abort'), ''),
1603 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001604
1605 class MockChangelist():
1606 def __init__(self):
1607 pass
1608 def GetBranch(self):
1609 return 'test1'
1610 def GetIssue(self):
1611 return '123'
1612 def GetPatchset(self):
1613 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001614 def IsGerrit(self):
1615 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001616
1617 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1618 # CMDupload should have been called 5 times because of 5 dependent branches.
1619 self.assertEquals(5, record_calls.times_called)
1620 self.assertEquals(0, ret)
1621
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001622 def test_gerrit_change_id(self):
1623 self.calls = [
1624 ((['git', 'write-tree'], ),
1625 'hashtree'),
1626 ((['git', 'rev-parse', 'HEAD~0'], ),
1627 'branch-parent'),
1628 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1629 'A B <a@b.org> 1456848326 +0100'),
1630 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1631 'C D <c@d.org> 1456858326 +0100'),
1632 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1633 'hashchange'),
1634 ]
1635 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1636 self.assertEqual(change_id, 'Ihashchange')
1637
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001638 def test_desecription_append_footer(self):
1639 for init_desc, footer_line, expected_desc in [
1640 # Use unique desc first lines for easy test failure identification.
1641 ('foo', 'R=one', 'foo\n\nR=one'),
1642 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1643 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1644 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1645 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1646 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1647 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1648 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1649 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1650 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1651 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1652 ]:
1653 desc = git_cl.ChangeDescription(init_desc)
1654 desc.append_footer(footer_line)
1655 self.assertEqual(desc.description, expected_desc)
1656
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001657 def test_update_reviewers(self):
1658 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001659 ('foo', [], [],
1660 'foo'),
1661 ('foo\nR=xx', [], [],
1662 'foo\nR=xx'),
1663 ('foo\nTBR=xx', [], [],
1664 'foo\nTBR=xx'),
1665 ('foo', ['a@c'], [],
1666 'foo\n\nR=a@c'),
1667 ('foo\nR=xx', ['a@c'], [],
1668 'foo\n\nR=a@c, xx'),
1669 ('foo\nTBR=xx', ['a@c'], [],
1670 'foo\n\nR=a@c\nTBR=xx'),
1671 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1672 'foo\n\nR=a@c, yy\nTBR=xx'),
1673 ('foo\nBUG=', ['a@c'], [],
1674 'foo\nBUG=\nR=a@c'),
1675 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1676 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1677 ('foo', ['a@c', 'b@c'], [],
1678 'foo\n\nR=a@c, b@c'),
1679 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1680 'foo\nBar\n\nR=c@c\nBUG='),
1681 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1682 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001683 # Same as the line before, but full of whitespaces.
1684 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001685 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001686 'foo\nBar\n\nR=c@c\n BUG =',
1687 ),
1688 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001689 ('foo BUG=allo R=joe ', ['c@c'], [],
1690 'foo BUG=allo R=joe\n\nR=c@c'),
1691 # Redundant TBRs get promoted to Rs
1692 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1693 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001694 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001695 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001696 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001697 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001698 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001699 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001700 actual.append(obj.description)
1701 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001702
Nodir Turakulov23b82142017-11-16 11:04:25 -08001703 def test_get_hash_tags(self):
1704 cases = [
1705 ('', []),
1706 ('a', []),
1707 ('[a]', ['a']),
1708 ('[aa]', ['aa']),
1709 ('[a ]', ['a']),
1710 ('[a- ]', ['a']),
1711 ('[a- b]', ['a-b']),
1712 ('[a--b]', ['a-b']),
1713 ('[a', []),
1714 ('[a]x', ['a']),
1715 ('[aa]x', ['aa']),
1716 ('[a b]', ['a-b']),
1717 ('[a b]', ['a-b']),
1718 ('[a__b]', ['a-b']),
1719 ('[a] x', ['a']),
1720 ('[a][b]', ['a', 'b']),
1721 ('[a] [b]', ['a', 'b']),
1722 ('[a][b]x', ['a', 'b']),
1723 ('[a][b] x', ['a', 'b']),
1724 ('[a]\n[b]', ['a']),
1725 ('[a\nb]', []),
1726 ('[a][', ['a']),
1727 ('Revert "[a] feature"', ['a']),
1728 ('Reland "[a] feature"', ['a']),
1729 ('Revert: [a] feature', ['a']),
1730 ('Reland: [a] feature', ['a']),
1731 ('Revert "Reland: [a] feature"', ['a']),
1732 ('Foo: feature', ['foo']),
1733 ('Foo Bar: feature', ['foo-bar']),
1734 ('Revert "Foo bar: feature"', ['foo-bar']),
1735 ('Reland "Foo bar: feature"', ['foo-bar']),
1736 ]
1737 for desc, expected in cases:
1738 change_desc = git_cl.ChangeDescription(desc)
1739 actual = change_desc.get_hash_tags()
1740 self.assertEqual(
1741 actual,
1742 expected,
1743 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1744
wittman@chromium.org455dc922015-01-26 20:15:50 +00001745 def test_get_target_ref(self):
1746 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001747 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001748 self.assertEqual(None, git_cl.GetTargetRef(None,
1749 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001750 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001751
wittman@chromium.org455dc922015-01-26 20:15:50 +00001752 # Check default target refs for branches.
1753 self.assertEqual('refs/heads/master',
1754 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001755 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001756 self.assertEqual('refs/heads/master',
1757 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001758 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001759 self.assertEqual('refs/heads/master',
1760 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001761 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001762 self.assertEqual('refs/branch-heads/123',
1763 git_cl.GetTargetRef('origin',
1764 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001765 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001766 self.assertEqual('refs/diff/test',
1767 git_cl.GetTargetRef('origin',
1768 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001769 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001770 self.assertEqual('refs/heads/chrome/m42',
1771 git_cl.GetTargetRef('origin',
1772 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001773 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001774
1775 # Check target refs for user-specified target branch.
1776 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1777 'refs/remotes/branch-heads/123'):
1778 self.assertEqual('refs/branch-heads/123',
1779 git_cl.GetTargetRef('origin',
1780 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001781 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001782 for branch in ('origin/master', 'remotes/origin/master',
1783 'refs/remotes/origin/master'):
1784 self.assertEqual('refs/heads/master',
1785 git_cl.GetTargetRef('origin',
1786 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001787 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001788 for branch in ('master', 'heads/master', 'refs/heads/master'):
1789 self.assertEqual('refs/heads/master',
1790 git_cl.GetTargetRef('origin',
1791 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001792 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001793
wychen@chromium.orga872e752015-04-28 23:42:18 +00001794 def test_patch_when_dirty(self):
1795 # Patch when local tree is dirty
1796 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1797 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1798
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001799 @staticmethod
1800 def _get_gerrit_codereview_server_calls(branch, value=None,
1801 git_short_host='host',
Aaron Gable697a91b2018-01-19 15:20:15 -08001802 detect_branch=True,
1803 detect_server=True):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001804 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1805
1806 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1807 """
1808 calls = []
1809 if detect_branch:
1810 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
Aaron Gable697a91b2018-01-19 15:20:15 -08001811 if detect_server:
1812 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1813 CERR1 if value is None else value))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001814 if value is None:
1815 calls += [
1816 ((['git', 'config', 'branch.' + branch + '.merge'],),
1817 'refs/heads' + branch),
1818 ((['git', 'config', 'branch.' + branch + '.remote'],),
1819 'origin'),
1820 ((['git', 'config', 'remote.origin.url'],),
1821 'https://%s.googlesource.com/my/repo' % git_short_host),
1822 ]
1823 return calls
1824
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001825 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001826 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001827 detect_gerrit_server=True,
1828 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001829 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001830 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1831 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001832 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001833 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001834 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1835
tandriidf09a462016-08-18 16:23:55 -07001836 if new_branch:
1837 self.calls = [((['git', 'new-branch', 'master'],), ''),]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001838
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001839 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001840 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001841 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001842 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001843 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1844 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1845 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1846 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001847 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001848 if default_codereview == 'gerrit':
1849 if not force_codereview:
1850 self.calls += [
1851 ((['git', 'config', 'gerrit.host'],), 'true'),
1852 ]
1853 if detect_gerrit_server:
1854 self.calls += self._get_gerrit_codereview_server_calls(
1855 'master', git_short_host=git_short_host,
1856 detect_branch=not new_branch and force_codereview)
1857 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001858
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001859 elif default_codereview == 'rietveld':
1860 self.calls += [
1861 ((['git', 'config', 'gerrit.host'],), CERR1),
1862 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1863 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
1864 ]
1865 actual_codereview = 'rietveld'
1866
1867 if actual_codereview == 'rietveld':
1868 self.calls += [
1869 ((['git', 'rev-parse', '--show-cdup'],), ''),
1870 ]
1871 if not default_codereview:
1872 self.calls += [
1873 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1874 ]
1875 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001876 self.calls += [
1877 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001878 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001879 {
1880 'current_revision': '7777777777',
1881 'revisions': {
1882 '1111111111': {
1883 '_number': 1,
1884 'fetch': {'http': {
1885 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1886 'ref': 'refs/changes/56/123456/1',
1887 }},
1888 },
1889 '7777777777': {
1890 '_number': 7,
1891 'fetch': {'http': {
1892 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1893 'ref': 'refs/changes/56/123456/7',
1894 }},
1895 },
1896 },
1897 }),
1898 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001899
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001900 def _common_patch_rietveld_successful(self, **kwargs):
1901 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001902 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001903 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001904 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001905 ((['git', 'config', 'branch.master.rietveldserver',
1906 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001907 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001908 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07001909 ((['git', 'commit', '-m',
1910 'Description\n\n' +
1911 'patch from issue 123456 at patchset 60001 ' +
1912 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001913 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001914
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001915 def test_patch_rietveld_default(self):
1916 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001917 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1918
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001919 def test_patch_rietveld_successful_new_branch(self):
1920 self._common_patch_rietveld_successful(default_codereview='rietveld',
1921 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001922 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1923
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001924 def test_patch_rietveld_guess_by_url(self):
1925 self._common_patch_rietveld_successful(
1926 default_codereview=None, # It doesn't matter.
1927 actual_codereview='rietveld')
1928 self.assertEqual(git_cl.main(
1929 ['patch', 'https://codereview.example.com/123456']), 0)
1930
1931 def test_patch_rietveld_conflict(self):
1932 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07001933 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001934 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001935
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001936 def test_patch_gerrit_default(self):
1937 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001938 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001939 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08001940 ((['git', 'config', 'remote.origin.url'],),
1941 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001942 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1943 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001944 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001945 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
Aaron Gable697a91b2018-01-19 15:20:15 -08001946 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001947 ((['git', 'config', 'branch.master.gerritserver',
1948 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001949 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001950 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1951 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1952 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001953 ]
1954 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1955
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001956 def test_patch_gerrit_force(self):
1957 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001958 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001959 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08001960 ((['git', 'config', 'remote.origin.url'],),
1961 'https://host.googlesource.com/my/repo'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001962 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001963 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001964 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001965 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001966 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001967 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001968 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001969 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001970 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1971 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1972 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001973 ]
Aaron Gable62619a32017-06-16 08:22:09 -07001974 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456', '--force']), 0)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001975
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001976 def test_patch_gerrit_guess_by_url(self):
1977 self._patch_common(
1978 default_codereview=None, # It doesn't matter what's default.
1979 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08001980 git_short_host='else')
1981 self.calls += self._get_gerrit_codereview_server_calls(
1982 'master', git_short_host='else', detect_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001983 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001984 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001985 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001986 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001987 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001988 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001989 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001990 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001991 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001992 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
1993 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
1994 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001995 ]
1996 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001997 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001998
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001999 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2000 self._patch_common(
2001 default_codereview=None, # It doesn't matter what's default.
2002 actual_codereview='gerrit',
Aaron Gable697a91b2018-01-19 15:20:15 -08002003 git_short_host='else')
2004 self.calls += self._get_gerrit_codereview_server_calls(
2005 'master', git_short_host='else', detect_server=False)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002006 self.calls += [
2007 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2008 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07002009 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002010 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2011 ''),
2012 ((['git', 'config', 'branch.master.gerritserver',
2013 'https://else-review.googlesource.com'],), ''),
2014 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07002015 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2016 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2017 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002018 ]
2019 self.assertEqual(git_cl.main(
2020 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2021
Aaron Gable697a91b2018-01-19 15:20:15 -08002022 def test_patch_gerrit_guess_by_url_with_repo(self):
2023 self._patch_common(
2024 default_codereview=None, # It doesn't matter what's default.
2025 actual_codereview='gerrit',
2026 git_short_host='else')
2027 self.calls += self._get_gerrit_codereview_server_calls(
2028 'master', git_short_host='else', detect_server=False)
2029 self.calls += [
2030 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2031 'refs/changes/56/123456/1'],), ''),
2032 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2033 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2034 ''),
2035 ((['git', 'config', 'branch.master.gerritserver',
2036 'https://else-review.googlesource.com'],), ''),
2037 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2038 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
2039 ((['git', 'config', 'branch.master.last-upload-hash', 'deadbeef'],), ''),
2040 ((['git', 'config', 'branch.master.gerritsquashhash', 'deadbeef'],), ''),
2041 ]
2042 self.assertEqual(git_cl.main(
2043 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
2044 0)
2045
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002046 def test_patch_gerrit_conflict(self):
2047 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002048 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002049 self.calls += [
Aaron Gable697a91b2018-01-19 15:20:15 -08002050 ((['git', 'config', 'remote.origin.url'],),
2051 'https://chromium.googlesource.com/my/repo'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002052 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002053 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002054 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2055 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2056 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002057 ]
2058 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002059 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002060
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002061 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002062 def notExists(_issue, *_, **kwargs):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002063 raise git_cl.gerrit_util.GerritError(404, '')
2064 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2065
tandriic2405f52016-10-10 08:13:15 -07002066 self.calls = [
2067 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandriic2405f52016-10-10 08:13:15 -07002068 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2069 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2070 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2071 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002072 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2073 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2074 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2075 ((['git', 'config', 'remote.origin.url'],),
2076 'https://chromium.googlesource.com/my/repo'),
2077 ((['DieWithError',
2078 'change 123456 at https://chromium-review.googlesource.com does not '
2079 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002080 ]
2081 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002082 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002083
Aaron Gable697a91b2018-01-19 15:20:15 -08002084 def test_patch_gerrit_wrong_repo(self):
2085 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
2086 detect_gerrit_server=True)
2087 self.calls += [
2088 ((['git', 'config', 'remote.origin.url'],),
2089 'https://chromium.googlesource.com/wrong/repo'),
2090 ((['DieWithError',
2091 'Trying to patch a change from '
2092 'https://chromium.googlesource.com/my/repo but this repo appears '
2093 'to be https://chromium.googlesource.com/wrong/repo.'],),
2094 SystemExitMock()),
2095 ]
2096 with self.assertRaises(SystemExitMock):
2097 self.assertEqual(1, git_cl.main(['patch', '123456']))
2098
2099
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002100 def _checkout_calls(self):
2101 return [
2102 ((['git', 'config', '--local', '--get-regexp',
2103 'branch\\..*\\.rietveldissue'], ),
2104 ('branch.retrying.rietveldissue 1111111111\n'
2105 'branch.some-fix.rietveldissue 2222222222\n')),
2106 ((['git', 'config', '--local', '--get-regexp',
2107 'branch\\..*\\.gerritissue'], ),
2108 ('branch.ger-branch.gerritissue 123456\n'
2109 'branch.gbranch654.gerritissue 654321\n')),
2110 ]
2111
2112 def test_checkout_gerrit(self):
2113 """Tests git cl checkout <issue>."""
2114 self.calls = self._checkout_calls()
2115 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2116 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2117
2118 def test_checkout_rietveld(self):
2119 """Tests git cl checkout <issue>."""
2120 self.calls = self._checkout_calls()
2121 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2122 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2123
2124 def test_checkout_not_found(self):
2125 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002126 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002127 self.calls = self._checkout_calls()
2128 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2129
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002130 def test_checkout_no_branch_issues(self):
2131 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002132 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002133 self.calls = [
2134 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002135 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002136 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002137 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002138 ]
2139 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2140
tandrii@chromium.org28253532016-04-14 13:46:56 +00002141 def _test_gerrit_ensure_authenticated_common(self, auth,
2142 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002143 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2144 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2145 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002146 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002147 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002148 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002149 cl.branch = 'master'
2150 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002151 cl.lookedup_issue = True
2152 return cl
2153
2154 def test_gerrit_ensure_authenticated_missing(self):
2155 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002156 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002157 })
2158 self.calls.append(
2159 ((['DieWithError',
2160 'Credentials for the following hosts are required:\n'
2161 ' chromium-review.googlesource.com\n'
2162 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002163 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002164 'https://chromium-review.googlesource.com/new-password'],), ''),)
2165 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2166
2167 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002168 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002169 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002170 'chromium.googlesource.com':
2171 ('git-one.example.com', None, 'secret1'),
2172 'chromium-review.googlesource.com':
2173 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002174 })
2175 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002176 (('ask_for_data', 'If you know what you are doing '
2177 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002178 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2179
2180 def test_gerrit_ensure_authenticated_ok(self):
2181 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002182 'chromium.googlesource.com':
2183 ('git-same.example.com', None, 'secret'),
2184 'chromium-review.googlesource.com':
2185 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002186 })
2187 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2188
tandrii@chromium.org28253532016-04-14 13:46:56 +00002189 def test_gerrit_ensure_authenticated_skipped(self):
2190 cl = self._test_gerrit_ensure_authenticated_common(
2191 auth={}, skip_auth_check=True)
2192 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2193
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002194 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002195 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2196 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002197 self.calls = [
2198 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002199 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002200 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2201 ((['git', 'config', 'rietveld.server'],), ''),
2202 ((['git', 'config', 'rietveld.server'],), ''),
2203 ((['git', 'config', 'branch.feature.rietveldserver'],),
2204 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002205 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002206 ]
2207 self.assertEqual(0, git_cl.main(['set-commit']))
2208
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002209 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002210 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002211 lambda h, i, labels, notify=None:
2212 self._mocked_call(['SetReview', h, i, labels, notify]))
2213
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002214 self.calls = [
2215 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002216 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2217 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002218 ((['git', 'config', 'branch.feature.gerritserver'],),
2219 'https://chromium-review.googlesource.com'),
2220 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002221 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002222 ]
tandriid9e5ce52016-07-13 02:32:59 -07002223
2224 def test_cmd_set_commit_gerrit_clear(self):
2225 self._cmd_set_commit_gerrit_common(0)
2226 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2227
2228 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002229 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002230 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2231
tandriid9e5ce52016-07-13 02:32:59 -07002232 def test_cmd_set_commit_gerrit(self):
2233 self._cmd_set_commit_gerrit_common(2)
2234 self.assertEqual(0, git_cl.main(['set-commit']))
2235
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002236 def test_description_display(self):
2237 out = StringIO.StringIO()
2238 self.mock(git_cl.sys, 'stdout', out)
2239
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002240 self.mock(git_cl, 'Changelist', ChangelistMock)
2241 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002242
2243 self.assertEqual(0, git_cl.main(['description', '-d']))
2244 self.assertEqual('foo\n', out.getvalue())
2245
2246 def test_description_rietveld(self):
2247 out = StringIO.StringIO()
2248 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002249 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002250
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002251 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002252 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002253 self.assertEqual('foobar\n', out.getvalue())
2254
iannucci3c972b92016-08-17 13:24:10 -07002255 def test_StatusFieldOverrideIssueMissingArgs(self):
2256 out = StringIO.StringIO()
2257 self.mock(git_cl.sys, 'stderr', out)
2258
2259 try:
2260 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2261 except SystemExit as ex:
2262 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002263 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002264
2265 out = StringIO.StringIO()
2266 self.mock(git_cl.sys, 'stderr', out)
2267
2268 try:
2269 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2270 except SystemExit as ex:
2271 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002272 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002273
2274 def test_StatusFieldOverrideIssue(self):
2275 out = StringIO.StringIO()
2276 self.mock(git_cl.sys, 'stdout', out)
2277
2278 def assertIssue(cl_self, *_args):
2279 self.assertEquals(cl_self.issue, 1)
2280 return 'foobar'
2281
2282 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2283 self.calls = [
2284 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2285 ((['git', 'config', 'rietveld.server'],), ''),
2286 ((['git', 'config', 'rietveld.server'],), ''),
2287 ]
iannuccie53c9352016-08-17 14:40:40 -07002288 self.assertEqual(
2289 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2290 0)
iannucci3c972b92016-08-17 13:24:10 -07002291 self.assertEqual(out.getvalue(), 'foobar\n')
2292
iannuccie53c9352016-08-17 14:40:40 -07002293 def test_SetCloseOverrideIssue(self):
2294 def assertIssue(cl_self, *_args):
2295 self.assertEquals(cl_self.issue, 1)
2296 return 'foobar'
2297
2298 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2299 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2300 self.calls = [
2301 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2302 ((['git', 'config', 'rietveld.server'],), ''),
2303 ((['git', 'config', 'rietveld.server'],), ''),
2304 ]
2305 self.assertEqual(
2306 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2307
2308 def test_SetCommitOverrideIssue(self):
2309 def assertIssue(cl_self, *_args):
2310 self.assertEquals(cl_self.issue, 1)
2311 return 'foobar'
2312
2313 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2314 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2315 self.calls = [
2316 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2317 ((['git', 'config', 'rietveld.server'],), ''),
2318 ((['git', 'config', 'rietveld.server'],), ''),
2319 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2320 ((['git', 'config', 'rietveld.server'],), ''),
2321 ((['git', 'config', 'rietveld.server'],), ''),
2322 ]
2323 self.assertEqual(
2324 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2325
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002326 def test_description_gerrit(self):
2327 out = StringIO.StringIO()
2328 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002329 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002330 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002331 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2332 {
2333 'current_revision': 'sha1',
2334 'revisions': {'sha1': {
2335 'commit': {'message': 'foobar'},
2336 }},
2337 }),
2338 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002339 self.assertEqual(0, git_cl.main([
2340 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2341 self.assertEqual('foobar\n', out.getvalue())
2342
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002343 def test_description_set_raw(self):
2344 out = StringIO.StringIO()
2345 self.mock(git_cl.sys, 'stdout', out)
2346
2347 self.mock(git_cl, 'Changelist', ChangelistMock)
2348 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2349
2350 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2351 self.assertEqual('hihi', ChangelistMock.desc)
2352
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002353 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002354 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002355
2356 def RunEditor(desc, _, **kwargs):
2357 self.assertEquals(
2358 '# Enter a description of the change.\n'
2359 '# This will be displayed on the codereview site.\n'
2360 '# The first line will also be used as the subject of the review.\n'
2361 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002362 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002363 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002364 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002365 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002366 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002367
dsansomee2d6fd92016-09-08 00:10:47 -07002368 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002369 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002370
2371 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2372 self.mock(git_cl.Changelist, 'GetDescription',
2373 lambda *args: current_desc)
2374 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2375 UpdateDescriptionRemote)
2376 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2377
2378 self.calls = [
2379 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002380 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002381 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2382 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002383 ((['git', 'config', 'core.editor'],), 'vi'),
2384 ]
2385 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2386
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002387 def test_description_set_stdin(self):
2388 out = StringIO.StringIO()
2389 self.mock(git_cl.sys, 'stdout', out)
2390
2391 self.mock(git_cl, 'Changelist', ChangelistMock)
2392 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2393
2394 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2395 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2396
kmarshall3bff56b2016-06-06 18:31:47 -07002397 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002398 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2399
kmarshall3bff56b2016-06-06 18:31:47 -07002400 self.calls = \
2401 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2402 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002403 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002404 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2405 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002406 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2407 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2408 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002409 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2410 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2411 ((['git', 'branch', '-D', 'foo'],), '')]
2412
kmarshall3bff56b2016-06-06 18:31:47 -07002413 self.mock(git_cl, 'get_cl_statuses',
2414 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002415 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2416 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2417 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002418
2419 self.assertEqual(0, git_cl.main(['archive', '-f']))
2420
2421 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002422 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002423 self.calls = \
2424 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2425 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002426 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002427 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2428 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002429 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2430
kmarshall9249e012016-08-23 12:02:16 -07002431 self.mock(git_cl, 'get_cl_statuses',
2432 lambda branches, fine_grained, max_processes:
2433 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2434
2435 self.assertEqual(1, git_cl.main(['archive', '-f']))
2436
2437 def test_archive_dry_run(self):
2438 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2439
2440 self.calls = \
2441 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2442 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2443 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2444 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2445 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2446 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2447 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2448 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2449 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002450
2451 self.mock(git_cl, 'get_cl_statuses',
2452 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002453 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2454 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2455 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002456
kmarshall9249e012016-08-23 12:02:16 -07002457 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2458
2459 def test_archive_no_tags(self):
2460 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2461
2462 self.calls = \
2463 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2464 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2465 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2466 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2467 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2468 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2469 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2470 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2471 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2472 ((['git', 'branch', '-D', 'foo'],), '')]
2473
2474 self.mock(git_cl, 'get_cl_statuses',
2475 lambda branches, fine_grained, max_processes:
2476 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2477 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2478 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2479
2480 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002481
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002482 def test_cmd_issue_erase_existing(self):
2483 out = StringIO.StringIO()
2484 self.mock(git_cl.sys, 'stdout', out)
2485 self.calls = [
2486 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002487 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2488 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002489 # Let this command raise exception (retcode=1) - it should be ignored.
2490 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002491 CERR1),
2492 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2493 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002494 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2495 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2496 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002497 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002498 ]
2499 self.assertEqual(0, git_cl.main(['issue', '0']))
2500
Aaron Gable400e9892017-07-12 15:31:21 -07002501 def test_cmd_issue_erase_existing_with_change_id(self):
2502 out = StringIO.StringIO()
2503 self.mock(git_cl.sys, 'stdout', out)
2504 self.mock(git_cl.Changelist, 'GetDescription',
2505 lambda _: 'This is a description\n\nChange-Id: Ideadbeef')
2506 self.calls = [
2507 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2508 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2509 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
Aaron Gable400e9892017-07-12 15:31:21 -07002510 # Let this command raise exception (retcode=1) - it should be ignored.
2511 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
2512 CERR1),
2513 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2514 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
2515 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2516 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2517 ''),
Aaron Gableca01e2c2017-07-19 11:16:02 -07002518 ((['git', 'log', '-1', '--format=%B'],),
2519 'This is a description\n\nChange-Id: Ideadbeef'),
2520 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002521 ]
2522 self.assertEqual(0, git_cl.main(['issue', '0']))
2523
phajdan.jre328cf92016-08-22 04:12:17 -07002524 def test_cmd_issue_json(self):
2525 out = StringIO.StringIO()
2526 self.mock(git_cl.sys, 'stdout', out)
2527 self.calls = [
2528 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002529 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002530 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2531 ((['git', 'config', 'rietveld.server'],),
2532 'https://codereview.chromium.org'),
2533 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2534 (('write_json', 'output.json',
2535 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2536 ''),
2537 ]
2538 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2539
tandriide281ae2016-10-12 06:02:30 -07002540 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002541 self.mock(git_cl.Changelist, 'GetChange',
2542 lambda _, *a: (
2543 self._mocked_call(['GetChange']+list(a))))
2544 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2545 lambda *_, **__: (
2546 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002547 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2548 lambda _, s: self._mocked_call(['SetCQState', s]))
2549 self.calls = [
2550 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002551 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002552 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2553 ((['git', 'config', 'rietveld.server'],),
2554 'https://codereview.chromium.org'),
2555 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2556 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2557 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2558 ((['get_or_create_merge_base', 'feature', 'feature'],),
2559 'fake_ancestor_sha'),
2560 ((['GetChange', 'fake_ancestor_sha', None], ),
2561 git_cl.presubmit_support.GitChange(
2562 '', '', '', '', '', '', '', '')),
2563 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2564 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002565 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2566 ]
2567 out = StringIO.StringIO()
2568 self.mock(git_cl.sys, 'stdout', out)
2569 self.assertEqual(0, git_cl.main(['try']))
2570 self.assertEqual(
2571 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002572 'Scheduling CQ dry run on: https://codereview.chromium.org/123\n')
tandrii9de9ec62016-07-13 03:01:59 -07002573
tandrii8c5a3532016-11-04 07:52:02 -07002574 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2575 self.mock(git_cl.Changelist, 'GetChange',
2576 lambda _, *a: (
2577 self._mocked_call(['GetChange']+list(a))))
2578 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2579 lambda *_, **__: (
2580 self._mocked_call(['DoGetTryMasters'])))
2581 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2582 lambda _, s: self._mocked_call(['SetCQState', s]))
2583
tandrii8c5a3532016-11-04 07:52:02 -07002584 self.calls = [
2585 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2586 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2587 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2588 ((['git', 'config', 'branch.feature.gerritserver'],),
2589 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002590 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2591 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2592 'project': 'depot_tools',
2593 'status': 'OPEN',
2594 'owner': {'email': 'owner@e.mail'},
2595 'revisions': {
2596 'deadbeaf': {
2597 '_number': 6,
2598 },
2599 'beeeeeef': {
2600 '_number': 7,
2601 'fetch': {'http': {
2602 'url': 'https://chromium.googlesource.com/depot_tools',
2603 'ref': 'refs/changes/56/123456/7'
2604 }},
2605 },
2606 },
2607 }),
tandrii8c5a3532016-11-04 07:52:02 -07002608 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2609 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2610 ((['get_or_create_merge_base', 'feature', 'feature'],),
2611 'fake_ancestor_sha'),
2612 ((['GetChange', 'fake_ancestor_sha', None], ),
2613 git_cl.presubmit_support.GitChange(
2614 '', '', '', '', '', '', '', '')),
2615 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2616 ((['DoGetTryMasters'], ), None),
2617 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2618 ]
2619 out = StringIO.StringIO()
2620 self.mock(git_cl.sys, 'stdout', out)
2621 self.assertEqual(0, git_cl.main(['try']))
2622 self.assertEqual(
2623 out.getvalue(),
Quinten Yearsleyfc5fd922017-05-31 11:50:52 -07002624 'Scheduling CQ dry run on: '
tandrii8c5a3532016-11-04 07:52:02 -07002625 'https://chromium-review.googlesource.com/123456\n')
2626
2627 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2628 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2629 lambda _: {
2630 'owner_email': 'owner@e.mail',
2631 'private': False,
2632 'closed': False,
2633 'project': 'depot_tools',
2634 'patchsets': [20001],
2635 })
tandriide281ae2016-10-12 06:02:30 -07002636 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2637 self.calls = [
2638 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2639 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2640 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2641 ((['git', 'config', 'rietveld.server'],),
2642 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002643 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002644 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002645 ]
2646
2647 def _buildbucket_retry(*_, **kw):
2648 # self.maxDiff = 10000
2649 body = json.loads(kw['body'])
2650 self.assertEqual(len(body['builds']), 1)
2651 build = body['builds'][0]
2652 params = json.loads(build.pop('parameters_json'))
2653 self.assertEqual(params, {
2654 u'builder_name': u'win',
2655 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2656 u'revision': None}],
2657 u'properties': {
2658 u'category': u'git_cl_try',
2659 u'issue': 123,
2660 u'key': u'val',
2661 u'json': [{u'a': 1}, None],
2662 u'master': u'tryserver.chromium',
2663 u'patch_project': u'depot_tools',
2664 u'patch_storage': u'rietveld',
2665 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002666 u'rietveld': u'https://codereview.chromium.org',
2667 }
2668 })
2669 self.assertEqual(build, {
2670 u'bucket': u'master.tryserver.chromium',
2671 u'client_operation_id': u'uuid4',
2672 u'tags': [u'builder:win',
2673 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002674 u'user_agent:git_cl_try',
2675 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002676 })
2677
2678 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2679
2680 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2681 self.assertEqual(0, git_cl.main([
2682 'try', '-m', 'tryserver.chromium', '-b', 'win',
2683 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2684 self.assertRegexpMatches(
2685 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002686 'Tried jobs on:\nBucket: master.tryserver.chromium')
2687
tandrii8c5a3532016-11-04 07:52:02 -07002688 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2689 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2690 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2691
tandrii8c5a3532016-11-04 07:52:02 -07002692 self.calls = [
2693 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2694 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2695 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2696 ((['git', 'config', 'branch.feature.gerritserver'],),
2697 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002698 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002699 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002700 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002701 'status': 'OPEN',
2702 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002703 'revisions': {
2704 'deadbeaf': {
2705 '_number': 6,
2706 },
2707 'beeeeeef': {
2708 '_number': 7,
2709 'fetch': {'http': {
2710 'url': 'https://chromium.googlesource.com/depot_tools',
2711 'ref': 'refs/changes/56/123456/7'
2712 }},
2713 },
2714 },
2715 }),
2716 ]
2717
2718 def _buildbucket_retry(*_, **kw):
2719 # self.maxDiff = 10000
2720 body = json.loads(kw['body'])
2721 self.assertEqual(len(body['builds']), 1)
2722 build = body['builds'][0]
2723 params = json.loads(build.pop('parameters_json'))
2724 self.assertEqual(params, {
2725 u'builder_name': u'win',
2726 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2727 u'revision': None}],
2728 u'properties': {
2729 u'category': u'git_cl_try',
2730 u'key': u'val',
2731 u'json': [{u'a': 1}, None],
2732 u'master': u'tryserver.chromium',
2733
2734 u'patch_gerrit_url':
2735 u'https://chromium-review.googlesource.com',
2736 u'patch_issue': 123456,
2737 u'patch_project': u'depot_tools',
2738 u'patch_ref': u'refs/changes/56/123456/7',
2739 u'patch_repository_url':
2740 u'https://chromium.googlesource.com/depot_tools',
2741 u'patch_set': 7,
2742 u'patch_storage': u'gerrit',
2743 }
2744 })
2745 self.assertEqual(build, {
2746 u'bucket': u'master.tryserver.chromium',
2747 u'client_operation_id': u'uuid4',
2748 u'tags': [
2749 u'builder:win',
2750 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2751 u'user_agent:git_cl_try',
2752 u'master:tryserver.chromium'],
2753 })
2754
2755 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2756
2757 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2758 self.assertEqual(0, git_cl.main([
2759 'try', '-m', 'tryserver.chromium', '-b', 'win',
2760 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2761 self.assertRegexpMatches(
2762 git_cl.sys.stdout.getvalue(),
2763 'Tried jobs on:\nBucket: master.tryserver.chromium')
2764
borenet6c0efe62016-10-19 08:13:29 -07002765 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002766 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2767 lambda _: {
2768 'owner_email': 'owner@e.mail',
2769 'private': False,
2770 'closed': False,
2771 'project': 'depot_tools',
2772 'patchsets': [20001],
2773 })
borenet6c0efe62016-10-19 08:13:29 -07002774 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2775 self.calls = [
2776 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2777 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2778 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2779 ((['git', 'config', 'rietveld.server'],),
2780 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002781 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002782 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002783 ]
2784
2785 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002786 body = json.loads(kw['body'])
2787 self.assertEqual(len(body['builds']), 1)
2788 build = body['builds'][0]
2789 params = json.loads(build.pop('parameters_json'))
2790 self.assertEqual(params, {
2791 u'builder_name': u'win',
2792 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2793 u'revision': None}],
2794 u'properties': {
2795 u'category': u'git_cl_try',
2796 u'issue': 123,
2797 u'patch_project': u'depot_tools',
2798 u'patch_storage': u'rietveld',
2799 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002800 u'rietveld': u'https://codereview.chromium.org',
2801 }
2802 })
2803 self.assertEqual(build, {
2804 u'bucket': u'test.bucket',
2805 u'client_operation_id': u'uuid4',
2806 u'tags': [u'builder:win',
2807 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2808 u'user_agent:git_cl_try'],
2809 })
2810
2811 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2812
2813 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2814 self.assertEqual(0, git_cl.main([
2815 'try', '-B', 'test.bucket', '-b', 'win']))
2816 self.assertRegexpMatches(
2817 git_cl.sys.stdout.getvalue(),
2818 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002819
qyearsley123a4682016-10-26 09:12:17 -07002820 def test_git_cl_try_bots_on_multiple_masters(self):
2821 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2822 self.calls = [
2823 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2824 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2825 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2826 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002827 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002828 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2829 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2830 ]
2831
2832 def _buildbucket_retry(*_, **kw):
2833 body = json.loads(kw['body'])
2834 self.assertEqual(len(body['builds']), 2)
2835
Nodir Turakulovb422e682018-02-20 22:51:30 -08002836 self.assertEqual(body['builds'][0]['bucket'], 'bucket1')
2837 params = json.loads(body['builds'][0]['parameters_json'])
2838 self.assertEqual(params['builder_name'], 'builder1')
qyearsley123a4682016-10-26 09:12:17 -07002839
Nodir Turakulovb422e682018-02-20 22:51:30 -08002840 self.assertEqual(body['builds'][1]['bucket'], 'bucket2')
2841 params = json.loads(body['builds'][1]['parameters_json'])
2842 self.assertEqual(params['builder_name'], 'builder2')
qyearsley123a4682016-10-26 09:12:17 -07002843
2844 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2845
2846 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
Nodir Turakulovb422e682018-02-20 22:51:30 -08002847 json.dumps({
2848 'builder1': {'bucket': 'bucket1'},
2849 'builder2': {'bucket': 'bucket2'},
2850 })))
qyearsley123a4682016-10-26 09:12:17 -07002851
2852 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2853 self.assertEqual(
2854 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2855 self.assertEqual(
2856 git_cl.sys.stdout.getvalue(),
2857 'Tried jobs on:\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002858 'Bucket: bucket1\n'
qyearsley123a4682016-10-26 09:12:17 -07002859 ' builder1: []\n'
Nodir Turakulovb422e682018-02-20 22:51:30 -08002860 'Bucket: bucket2\n'
qyearsley123a4682016-10-26 09:12:17 -07002861 ' builder2: []\n'
2862 'To see results here, run: git cl try-results\n'
2863 'To see results in browser, run: git cl web\n')
2864
tandrii16e0b4e2016-06-07 10:34:28 -07002865 def _common_GerritCommitMsgHookCheck(self):
2866 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2867 self.mock(git_cl.os.path, 'abspath',
2868 lambda path: self._mocked_call(['abspath', path]))
2869 self.mock(git_cl.os.path, 'exists',
2870 lambda path: self._mocked_call(['exists', path]))
2871 self.mock(git_cl.gclient_utils, 'FileRead',
2872 lambda path: self._mocked_call(['FileRead', path]))
2873 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2874 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2875 self.calls = [
2876 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2877 ((['abspath', '../'],), '/abs/git_repo_root'),
2878 ]
2879 return git_cl.Changelist(codereview='gerrit', issue=123)
2880
2881 def test_GerritCommitMsgHookCheck_custom_hook(self):
2882 cl = self._common_GerritCommitMsgHookCheck()
2883 self.calls += [
2884 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2885 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2886 '#!/bin/sh\necho "custom hook"')
2887 ]
2888 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2889
2890 def test_GerritCommitMsgHookCheck_not_exists(self):
2891 cl = self._common_GerritCommitMsgHookCheck()
2892 self.calls += [
2893 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2894 ]
2895 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2896
2897 def test_GerritCommitMsgHookCheck(self):
2898 cl = self._common_GerritCommitMsgHookCheck()
2899 self.calls += [
2900 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2901 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2902 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002903 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002904 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2905 ''),
2906 ]
2907 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2908
tandriic4344b52016-08-29 06:04:54 -07002909 def test_GerritCmdLand(self):
2910 self.calls += [
2911 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2912 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2913 'deadbeaf'),
2914 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2915 ((['git', 'config', 'branch.feature.gerritserver'],),
2916 'chromium-review.googlesource.com'),
2917 ]
2918 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2919 cl._codereview_impl._GetChangeDetail = lambda _: {
2920 'labels': {},
2921 'current_revision': 'deadbeaf',
2922 }
agable32978d92016-11-01 12:55:02 -07002923 cl._codereview_impl._GetChangeCommit = lambda: {
2924 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002925 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002926 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2927 }
tandriic4344b52016-08-29 06:04:54 -07002928 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002929 out = StringIO.StringIO()
2930 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002931 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002932 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002933 self.assertRegexpMatches(out.getvalue(), 'Landed as: .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002934
tandrii221ab252016-10-06 08:12:04 -07002935 BUILDBUCKET_BUILDS_MAP = {
Quinten Yearsleya563d722017-12-11 16:36:54 -08002936 '9000': {
2937 'id': '9000',
2938 'bucket': 'master.x.y',
2939 'created_by': 'user:someone@chromium.org',
2940 'created_ts': '147200002222000',
2941 'experimental': False,
2942 'parameters_json': json.dumps({
2943 'builder_name': 'my-bot',
2944 'properties': {'category': 'cq'},
2945 }),
2946 'status': 'STARTED',
2947 'tags': [
2948 'build_address:x.y/my-bot/2',
2949 'builder:my-bot',
2950 'experimental:false',
2951 'user_agent:cq',
2952 ],
2953 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
2954 },
2955 '8000': {
2956 'id': '8000',
2957 'bucket': 'master.x.y',
2958 'created_by': 'user:someone@chromium.org',
2959 'created_ts': '147200001111000',
2960 'experimental': False,
2961 'failure_reason': 'BUILD_FAILURE',
2962 'parameters_json': json.dumps({
2963 'builder_name': 'my-bot',
2964 'properties': {'category': 'cq'},
2965 }),
2966 'result_details_json': json.dumps({
2967 'properties': {'buildnumber': 1},
2968 }),
2969 'result': 'FAILURE',
2970 'status': 'COMPLETED',
2971 'tags': [
2972 'build_address:x.y/my-bot/1',
2973 'builder:my-bot',
2974 'experimental:false',
2975 'user_agent:cq',
2976 ],
2977 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2978 },
2979 }
tandrii221ab252016-10-06 08:12:04 -07002980
2981 def test_write_try_results_json(self):
2982 expected_output = [
Quinten Yearsleya563d722017-12-11 16:36:54 -08002983 {
2984 'bucket': 'master.x.y',
2985 'buildbucket_id': '8000',
2986 'builder_name': 'my-bot',
2987 'created_ts': '147200001111000',
2988 'experimental': False,
2989 'failure_reason': 'BUILD_FAILURE',
2990 'result': 'FAILURE',
2991 'status': 'COMPLETED',
2992 'tags': [
2993 'build_address:x.y/my-bot/1',
2994 'builder:my-bot',
2995 'experimental:false',
2996 'user_agent:cq',
2997 ],
2998 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/1',
2999 },
3000 {
3001 'bucket': 'master.x.y',
3002 'buildbucket_id': '9000',
3003 'builder_name': 'my-bot',
3004 'created_ts': '147200002222000',
3005 'experimental': False,
3006 'failure_reason': None,
3007 'result': None,
3008 'status': 'STARTED',
3009 'tags': [
3010 'build_address:x.y/my-bot/2',
3011 'builder:my-bot',
3012 'experimental:false',
3013 'user_agent:cq',
3014 ],
3015 'url': 'http://build.cr.org/p/x.y/builders/my-bot/builds/2',
3016 },
tandrii221ab252016-10-06 08:12:04 -07003017 ]
3018 self.calls = [(('write_json', 'output.json', expected_output), '')]
3019 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3020
tandrii45b2a582016-10-11 03:14:16 -07003021 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003022 out = StringIO.StringIO()
3023 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003024 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3025 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003026 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3027 self._mocked_call(['get_authenticator_for_host', host]))
3028 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3029 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003030
3031 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3032 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003033 self.calls += [
3034 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3035 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3036 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3037 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3038 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3039 ((['git', 'config', 'branch.feature.rietveldserver'],),
3040 'codereview.example.com'),
3041 ((['get_authenticator_for_host', 'codereview.example.com'],),
3042 AuthenticatorMock()),
3043 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3044
3045 def test_fetch_try_jobs_none_rietveld(self):
3046 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003047 # Simulate that user isn't logged in.
3048 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003049 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003050 self.assertRegexpMatches(sys.stdout.getvalue(),
3051 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003052 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3053
3054 def test_fetch_try_jobs_some_rietveld(self):
3055 self._setup_fetch_try_jobs_rietveld({
3056 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3057 })
3058 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003059 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3060 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3061 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3062
3063 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3064 self._setup_fetch_try_jobs(most_recent_patchset=13)
3065 self.calls += [
3066 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3067 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3068 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003069 # TODO(tandrii): Uncomment the below if we decide to support checking
3070 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003071 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003072 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003073 ((['git', 'config', 'branch.feature.gerritserver'],),
3074 'https://x-review.googlesource.com'),
3075 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3076 AuthenticatorMock()),
3077 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3078
3079 def test_fetch_try_jobs_none_gerrit(self):
3080 self._setup_fetch_try_jobs_gerrit({})
3081 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003082 # TODO(tandrii): Uncomment the below if we decide to support checking
3083 # patchsets for Gerrit.
3084 # self.assertRegexpMatches(
3085 # sys.stdout.getvalue(),
3086 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003087 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3088
3089 def test_fetch_try_jobs_some_gerrit(self):
3090 self._setup_fetch_try_jobs_gerrit({
3091 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3092 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003093 # TODO(tandrii): Uncomment the below if we decide to support checking
3094 # patchsets for Gerrit.
3095 # self.calls.remove(
3096 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003097 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3098
3099 # ... and doesn't result in warning.
3100 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3101 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003102 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3103 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3104
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003105 def _mock_gerrit_changes_for_detail_cache(self):
3106 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003107
3108 def test_gerrit_change_detail_cache_normalize(self):
3109 self._mock_gerrit_changes_for_detail_cache()
3110 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003111 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003112 ]
3113 cl = git_cl.Changelist(codereview='gerrit')
3114 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3115 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3116 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3117 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3118
3119 def test_gerrit_change_detail_cache_simple(self):
3120 self._mock_gerrit_changes_for_detail_cache()
3121 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003122 (('GetChangeDetail', 'host', '1', []), 'a'),
3123 (('GetChangeDetail', 'host', '2', []), 'b'),
3124 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003125 ]
3126 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3127 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3128 self.assertEqual(cl._GetChangeDetail(), 'a')
3129 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003130 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003131 self.assertEqual(cl._GetChangeDetail(), 'a')
3132 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3133
3134 def test_gerrit_change_detail_cache_options(self):
3135 self._mock_gerrit_changes_for_detail_cache()
3136 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003137 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3138 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3139 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3140 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003141 ]
3142 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3143 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3144 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3145 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3146 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3147 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3148 self.assertEqual(cl._GetChangeDetail(), 'cab')
3149
3150 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3151 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3152 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3153 self.assertEqual(cl._GetChangeDetail(), 'cab')
3154
3155 # Finally, no_cache should invalidate all caches for given change.
3156 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3157 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3158
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003159 def test_gerrit_description_caching(self):
3160 def gen_detail(rev, desc):
3161 return {
3162 'current_revision': rev,
3163 'revisions': {rev: {'commit': {'message': desc}}}
3164 }
3165 self.calls = [
3166 (('GetChangeDetail', 'host', '1',
3167 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3168 gen_detail('rev1', 'desc1')),
3169 (('GetChangeDetail', 'host', '1',
3170 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3171 gen_detail('rev2', 'desc2')),
3172 ]
3173
3174 self._mock_gerrit_changes_for_detail_cache()
3175 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3176 self.assertEqual(cl.GetDescription(), 'desc1')
3177 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3178 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003179
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003180 def test_print_current_creds(self):
3181 class CookiesAuthenticatorMock(object):
3182 def __init__(self):
3183 self.gitcookies = {
3184 'host.googlesource.com': ('user', 'pass'),
3185 'host-review.googlesource.com': ('user', 'pass'),
3186 }
3187 self.netrc = self
3188 self.netrc.hosts = {
3189 'github.com': ('user2', None, 'pass2'),
3190 'host2.googlesource.com': ('user3', None, 'pass'),
3191 }
3192 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3193 CookiesAuthenticatorMock)
3194 self.mock(sys, 'stdout', StringIO.StringIO())
3195 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3196 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3197 ' Host\t User\t Which file',
3198 '============================\t=====\t===========',
3199 'host-review.googlesource.com\t user\t.gitcookies',
3200 ' host.googlesource.com\t user\t.gitcookies',
3201 ' host2.googlesource.com\tuser3\t .netrc',
3202 ])
3203 sys.stdout.buf = ''
3204 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3205 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3206 ' Host\tUser\t Which file',
3207 '============================\t====\t===========',
3208 'host-review.googlesource.com\tuser\t.gitcookies',
3209 ' host.googlesource.com\tuser\t.gitcookies',
3210 ])
3211
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003212 def _common_creds_check_mocks(self):
3213 def exists_mock(path):
3214 dirname = os.path.dirname(path)
3215 if dirname == os.path.expanduser('~'):
3216 dirname = '~'
3217 base = os.path.basename(path)
3218 if base in ('.netrc', '.gitcookies'):
3219 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3220 # git cl also checks for existence other files not relevant to this test.
3221 return None
3222 self.mock(os.path, 'exists', exists_mock)
3223 self.mock(sys, 'stdout', StringIO.StringIO())
3224
3225 def test_creds_check_gitcookies_not_configured(self):
3226 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003227 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003228 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003229 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003230 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003231 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3232 (('os.path.exists', '~/.netrc'), True),
3233 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3234 'or Ctrl+C to abort'), ''),
3235 ((['git', 'config', '--global', 'http.cookiefile',
3236 os.path.expanduser('~/.gitcookies')], ), ''),
3237 ]
3238 self.assertEqual(0, git_cl.main(['creds-check']))
3239 self.assertRegexpMatches(
3240 sys.stdout.getvalue(),
3241 '^You seem to be using outdated .netrc for git credentials:')
3242 self.assertRegexpMatches(
3243 sys.stdout.getvalue(),
3244 '\nConfigured git to use .gitcookies from')
3245
3246 def test_creds_check_gitcookies_configured_custom_broken(self):
3247 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003248 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003249 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003250 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08003251 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003252 ((['git', 'config', '--global', 'http.cookiefile'],),
3253 '/custom/.gitcookies'),
3254 (('os.path.exists', '/custom/.gitcookies'), False),
3255 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3256 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3257 ((['git', 'config', '--global', 'http.cookiefile',
3258 os.path.expanduser('~/.gitcookies')], ), ''),
3259 ]
3260 self.assertEqual(0, git_cl.main(['creds-check']))
3261 self.assertRegexpMatches(
3262 sys.stdout.getvalue(),
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003263 'WARNING: You have configured custom path to .gitcookies: ')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003264 self.assertRegexpMatches(
3265 sys.stdout.getvalue(),
3266 'However, your configured .gitcookies file is missing.')
3267
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003268 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003269 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
Aaron Gable636b13f2017-07-14 10:42:48 -07003270 lambda _, message, publish: self._mocked_call(
3271 'AddComment', message, publish))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003272 self.calls = [
3273 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3274 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003275 (('AddComment', 'msg', None), ''),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003276 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003277 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3278 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003279
3280 def test_git_cl_comment_add_gerrit(self):
3281 self.mock(git_cl.gerrit_util, 'SetReview',
Aaron Gable636b13f2017-07-14 10:42:48 -07003282 lambda host, change, msg, ready:
3283 self._mocked_call('SetReview', host, change, msg, ready))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003284 self.calls = [
3285 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3286 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3287 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3288 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3289 'origin/master'),
3290 ((['git', 'config', 'remote.origin.url'],),
3291 'https://chromium.googlesource.com/infra/infra'),
Aaron Gable636b13f2017-07-14 10:42:48 -07003292 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg', None),
3293 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003294 ]
3295 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3296 '-a', 'msg']))
3297
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003298 def test_git_cl_comments_fetch_rietveld(self):
3299 self.mock(sys, 'stdout', StringIO.StringIO())
3300 self.calls = [
3301 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3302 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3303 ] * 2
3304 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3305 'messages': [
3306 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3307 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3308 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3309 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3310 # Intentionally wrong order here.
3311 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3312 'disapproval': False, 'approval': False,
3313 'sender': 'owner@example.com'},
3314 ],
3315 'owner_email': 'owner@example.com',
3316 })
3317 expected_comments_summary = [
3318 git_cl._CommentSummary(
3319 message='lgtm',
3320 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3321 disapproval=False, approval=True, sender='r@example.com'),
3322 git_cl._CommentSummary(
3323 message='not lgtm',
3324 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3325 disapproval=True, approval=False, sender='r2@example.com'),
3326 # Note: same order as in whatever Rietveld returns.
3327 git_cl._CommentSummary(
3328 message='PTAL',
3329 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3330 disapproval=False, approval=False, sender='owner@example.com'),
3331 ]
3332 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3333 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3334
3335 with git_cl.gclient_utils.temporary_directory() as tempdir:
3336 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3337 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3338 '-j', out_file]))
3339 with open(out_file) as f:
3340 read = json.load(f)
3341 self.assertEqual(len(read), 3)
3342 self.assertEqual(read[0], {
3343 'date': '2000-03-13 20:49:34.515270',
3344 'message': 'PTAL',
3345 'approval': False,
3346 'disapproval': False,
3347 'sender': 'owner@example.com'})
3348 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3349 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3350
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003351 def test_git_cl_comments_fetch_gerrit(self):
3352 self.mock(sys, 'stdout', StringIO.StringIO())
3353 self.calls = [
3354 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3355 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3356 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3357 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3358 'origin/master'),
3359 ((['git', 'config', 'remote.origin.url'],),
3360 'https://chromium.googlesource.com/infra/infra'),
3361 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3362 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003363 'owner': {'email': 'owner@example.com'},
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003364 'messages': [
3365 {
3366 u'_revision_number': 1,
3367 u'author': {
3368 u'_account_id': 1111084,
3369 u'email': u'commit-bot@chromium.org',
3370 u'name': u'Commit Bot'
3371 },
3372 u'date': u'2017-03-15 20:08:45.000000000',
3373 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07003374 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003375 u'tag': u'autogenerated:cq:dry-run'
3376 },
3377 {
3378 u'_revision_number': 2,
3379 u'author': {
3380 u'_account_id': 11151243,
3381 u'email': u'owner@example.com',
3382 u'name': u'owner'
3383 },
3384 u'date': u'2017-03-16 20:00:41.000000000',
3385 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3386 u'message': u'PTAL',
3387 },
3388 {
3389 u'_revision_number': 2,
3390 u'author': {
3391 u'_account_id': 148512 ,
3392 u'email': u'reviewer@example.com',
3393 u'name': u'reviewer'
3394 },
3395 u'date': u'2017-03-17 05:19:37.500000000',
3396 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3397 u'message': u'Patch Set 2: Code-Review+1',
3398 },
3399 ]
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003400 }),
3401 (('GetChangeComments', 'chromium-review.googlesource.com', 1), {
3402 '/COMMIT_MSG': [
3403 {
3404 'author': {'email': u'reviewer@example.com'},
3405 'updated': u'2017-03-17 05:19:37.500000000',
3406 'patch_set': 2,
3407 'side': 'REVISION',
3408 'message': 'Please include a bug link',
3409 },
3410 ],
3411 'codereview.settings': [
3412 {
3413 'author': {'email': u'owner@example.com'},
3414 'updated': u'2017-03-16 20:00:41.000000000',
3415 'patch_set': 2,
3416 'side': 'PARENT',
3417 'line': 42,
3418 'message': 'I removed this because it is bad',
3419 },
3420 ]
3421 }),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003422 ] * 2
3423 expected_comments_summary = [
3424 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003425 message=(
3426 u'PTAL\n' +
3427 u'\n' +
3428 u'codereview.settings\n' +
3429 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3430 u'c/1/2/codereview.settings#b42\n' +
3431 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003432 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3433 disapproval=False, approval=False, sender=u'owner@example.com'),
3434 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003435 message=(
3436 u'Patch Set 2: Code-Review+1\n' +
3437 u'\n' +
3438 u'/COMMIT_MSG\n' +
3439 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3440 u'c/1/2//COMMIT_MSG#\n' +
3441 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003442 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3443 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3444 ]
3445 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3446 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3447
3448 with git_cl.gclient_utils.temporary_directory() as tempdir:
3449 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3450 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3451 '-j', out_file]))
3452 with open(out_file) as f:
3453 read = json.load(f)
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07003454 self.assertEqual(len(read), 2)
3455 self.assertEqual(read[0], {
3456 u'date': u'2017-03-16 20:00:41.000000',
3457 u'message': (
3458 u'PTAL\n' +
3459 u'\n' +
3460 u'codereview.settings\n' +
3461 u' Base, Line 42: https://chromium-review.googlesource.com/' +
3462 u'c/1/2/codereview.settings#b42\n' +
3463 u' I removed this because it is bad\n'),
3464 u'approval': False,
3465 u'disapproval': False,
3466 u'sender': u'owner@example.com'})
3467 self.assertEqual(read[1], {
3468 u'date': u'2017-03-17 05:19:37.500000',
3469 u'message': (
3470 u'Patch Set 2: Code-Review+1\n' +
3471 u'\n' +
3472 u'/COMMIT_MSG\n' +
3473 u' PS2, File comment: https://chromium-review.googlesource.com/' +
3474 u'c/1/2//COMMIT_MSG#\n' +
3475 u' Please include a bug link\n'),
3476 u'approval': False,
3477 u'disapproval': False,
3478 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003479
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003480
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003481if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003482 logging.basicConfig(
3483 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003484 unittest.main()