blob: 721719fe66836c0b778145cab9a5d940dc75b2cb [file] [log] [blame]
Edward Lemur0db01f02019-11-12 22:01:51 +00001#!/usr/bin/env vpython3
2# coding=utf-8
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00003# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00004# Use of this source code is governed by a BSD-style license that can be
5# found in the LICENSE file.
6
7"""Unit tests for git_cl.py."""
8
Edward Lemur85153282020-02-14 22:06:29 +00009from __future__ import print_function
Edward Lemur0db01f02019-11-12 22:01:51 +000010from __future__ import unicode_literals
11
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010012import datetime
tandriide281ae2016-10-12 06:02:30 -070013import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010014import logging
Edward Lemur61bf4172020-02-24 23:22:37 +000015import multiprocessing
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +000016import optparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000017import os
Edward Lemur85153282020-02-14 22:06:29 +000018import pprint
Brian Sheedy59b06a82019-10-14 17:03:29 +000019import shutil
maruel@chromium.orgddd59412011-11-30 14:20:38 +000020import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070021import tempfile
maruel@chromium.orgddd59412011-11-30 14:20:38 +000022import unittest
23
Edward Lemura8145022020-01-06 18:47:54 +000024if sys.version_info.major == 2:
25 from StringIO import StringIO
26 import mock
27else:
28 from io import StringIO
29 from unittest import mock
30
maruel@chromium.orgddd59412011-11-30 14:20:38 +000031sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
32
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000033import metrics
34# We have to disable monitoring before importing git_cl.
35metrics.DISABLE_METRICS_COLLECTION = True
36
Jamie Madill5e96ad12020-01-13 16:08:35 +000037import clang_format
Edward Lemur227d5102020-02-25 23:45:35 +000038import contextlib
Edward Lemur1773f372020-02-22 00:27:14 +000039import gclient_utils
Eric Boren2fb63102018-10-05 13:05:03 +000040import gerrit_util
maruel@chromium.orgddd59412011-11-30 14:20:38 +000041import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000042import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000043import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000044import git_new_branch
45import scm
maruel@chromium.orgddd59412011-11-30 14:20:38 +000046import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000047
Josip Sokcevic464e9ff2020-03-18 23:48:55 +000048NETRC_FILENAME = '_netrc' if sys.platform == 'win32' else '.netrc'
49
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000050
Edward Lemur0db01f02019-11-12 22:01:51 +000051def callError(code=1, cmd='', cwd='', stdout=b'', stderr=b''):
tandrii5d48c322016-08-18 16:19:37 -070052 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
53
tandrii5d48c322016-08-18 16:19:37 -070054CERR1 = callError(1)
55
56
Edward Lemur1773f372020-02-22 00:27:14 +000057class TemporaryFileMock(object):
58 def __init__(self):
59 self.suffix = 0
Aaron Gable9a03ae02017-11-03 11:31:07 -070060
Edward Lemur1773f372020-02-22 00:27:14 +000061 @contextlib.contextmanager
62 def __call__(self):
63 self.suffix += 1
64 yield '/tmp/fake-temp' + str(self.suffix)
Aaron Gable9a03ae02017-11-03 11:31:07 -070065
66
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000067class ChangelistMock(object):
68 # A class variable so we can access it when we don't have access to the
69 # instance that's being set.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000070 desc = ''
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +000071
72 def __init__(self, gerrit_change=None, **kwargs):
73 self._gerrit_change = gerrit_change
74
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000075 def GetIssue(self):
76 return 1
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +000077
Edward Lemur6c6827c2020-02-06 21:15:18 +000078 def FetchDescription(self):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000079 return ChangelistMock.desc
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +000080
dsansomee2d6fd92016-09-08 00:10:47 -070081 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000082 ChangelistMock.desc = desc
83
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +000084 def GetGerritChange(self, patchset=None, **kwargs):
85 del patchset
86 return self._gerrit_change
87
tandrii5d48c322016-08-18 16:19:37 -070088
Edward Lemur85153282020-02-14 22:06:29 +000089class GitMocks(object):
90 def __init__(self, config=None, branchref=None):
91 self.branchref = branchref or 'refs/heads/master'
92 self.config = config or {}
93
94 def GetBranchRef(self, _root):
95 return self.branchref
96
97 def NewBranch(self, branchref):
98 self.branchref = branchref
99
Edward Lemur26964072020-02-19 19:18:51 +0000100 def GetConfig(self, root, key, default=None):
101 if root != '':
102 key = '%s:%s' % (root, key)
Edward Lemur85153282020-02-14 22:06:29 +0000103 return self.config.get(key, default)
104
Edward Lemur26964072020-02-19 19:18:51 +0000105 def SetConfig(self, root, key, value=None):
106 if root != '':
107 key = '%s:%s' % (root, key)
Edward Lemur85153282020-02-14 22:06:29 +0000108 if value:
109 self.config[key] = value
110 return
111 if key not in self.config:
112 raise CERR1
113 del self.config[key]
114
115
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000116class WatchlistsMock(object):
117 def __init__(self, _):
118 pass
119 @staticmethod
120 def GetWatchersForPaths(_):
121 return ['joe@example.com']
122
123
Edward Lemur4c707a22019-09-24 21:13:43 +0000124class CodereviewSettingsFileMock(object):
125 def __init__(self):
126 pass
127 # pylint: disable=no-self-use
128 def read(self):
129 return ('CODE_REVIEW_SERVER: gerrit.chromium.org\n' +
130 'GERRIT_HOST: True\n')
131
132
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000133class AuthenticatorMock(object):
134 def __init__(self, *_args):
135 pass
136 def has_cached_credentials(self):
137 return True
tandrii221ab252016-10-06 08:12:04 -0700138 def authorize(self, http):
139 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000140
141
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100142def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000143 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
144
145 Usage:
146 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100147 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000148
149 OR
150 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100151 CookiesAuthenticatorMockFactory(
152 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000153 """
154 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800155 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000156 # Intentionally not calling super() because it reads actual cookie files.
157 pass
158 @classmethod
159 def get_gitcookies_path(cls):
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000160 return os.path.join('~', '.gitcookies')
161
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000162 @classmethod
163 def get_netrc_path(cls):
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000164 return os.path.join('~', NETRC_FILENAME)
165
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100166 def _get_auth_for_host(self, host):
167 if same_auth:
168 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000169 return (hosts_with_creds or {}).get(host)
170 return CookiesAuthenticatorMock
171
Aaron Gable9a03ae02017-11-03 11:31:07 -0700172
kmarshall9249e012016-08-23 12:02:16 -0700173class MockChangelistWithBranchAndIssue():
174 def __init__(self, branch, issue):
175 self.branch = branch
176 self.issue = issue
177 def GetBranch(self):
178 return self.branch
179 def GetIssue(self):
180 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000181
tandriic2405f52016-10-10 08:13:15 -0700182
183class SystemExitMock(Exception):
184 pass
185
186
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000187class TestGitClBasic(unittest.TestCase):
Josip Sokcevic953278a2020-02-28 19:46:36 +0000188 def setUp(self):
189 mock.patch('sys.exit', side_effect=SystemExitMock).start()
190 mock.patch('sys.stdout', StringIO()).start()
191 mock.patch('sys.stderr', StringIO()).start()
192 self.addCleanup(mock.patch.stopall)
193
194 def test_die_with_error(self):
195 with self.assertRaises(SystemExitMock):
196 git_cl.DieWithError('foo', git_cl.ChangeDescription('lorem ipsum'))
197 self.assertEqual(sys.stderr.getvalue(), 'foo\n')
198 self.assertTrue('saving CL description' in sys.stdout.getvalue())
199 self.assertTrue('Content of CL description' in sys.stdout.getvalue())
200 self.assertTrue('lorem ipsum' in sys.stdout.getvalue())
201 sys.exit.assert_called_once_with(1)
202
203 def test_die_with_error_no_desc(self):
204 with self.assertRaises(SystemExitMock):
205 git_cl.DieWithError('foo')
206 self.assertEqual(sys.stderr.getvalue(), 'foo\n')
207 self.assertEqual(sys.stdout.getvalue(), '')
208 sys.exit.assert_called_once_with(1)
209
Edward Lemur6c6827c2020-02-06 21:15:18 +0000210 def test_fetch_description(self):
Edward Lemurf38bc172019-09-03 21:02:13 +0000211 cl = git_cl.Changelist(issue=1, codereview_host='host')
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100212 cl.description = 'x'
Edward Lemur6c6827c2020-02-06 21:15:18 +0000213 self.assertEqual(cl.FetchDescription(), 'x')
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700214
Edward Lemur61bf4172020-02-24 23:22:37 +0000215 @mock.patch('git_cl.Changelist.EnsureAuthenticated')
216 @mock.patch('git_cl.Changelist.GetStatus', lambda cl: cl.status)
217 def test_get_cl_statuses(self, *_mocks):
218 statuses = [
219 'closed', 'commit', 'dry-run', 'lgtm', 'reply', 'unsent', 'waiting']
220 changes = []
221 for status in statuses:
222 cl = git_cl.Changelist()
223 cl.status = status
224 changes.append(cl)
225
226 actual = set(git_cl.get_cl_statuses(changes, True))
227 self.assertEqual(set(zip(changes, statuses)), actual)
228
229 def test_get_cl_statuses_no_changes(self):
230 self.assertEqual([], list(git_cl.get_cl_statuses([], True)))
231
232 @mock.patch('git_cl.Changelist.EnsureAuthenticated')
233 @mock.patch('multiprocessing.pool.ThreadPool')
234 def test_get_cl_statuses_timeout(self, *_mocks):
235 changes = [git_cl.Changelist() for _ in range(2)]
236 pool = multiprocessing.pool.ThreadPool()
237 it = pool.imap_unordered.return_value.__iter__ = mock.Mock()
238 it.return_value.next.side_effect = [
239 (changes[0], 'lgtm'),
240 multiprocessing.TimeoutError,
241 ]
242
243 actual = list(git_cl.get_cl_statuses(changes, True))
244 self.assertEqual([(changes[0], 'lgtm'), (changes[1], 'error')], actual)
245
246 @mock.patch('git_cl.Changelist.GetIssueURL')
247 def test_get_cl_statuses_not_finegrained(self, _mock):
248 changes = [git_cl.Changelist() for _ in range(2)]
249 urls = ['some-url', None]
250 git_cl.Changelist.GetIssueURL.side_effect = urls
251
252 actual = set(git_cl.get_cl_statuses(changes, False))
253 self.assertEqual(
254 set([(changes[0], 'waiting'), (changes[1], 'error')]), actual)
255
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000256 def test_get_issue_url(self):
257 cl = git_cl.Changelist(issue=123)
258 cl._gerrit_server = 'https://example.com'
259 self.assertEqual(cl.GetIssueURL(), 'https://example.com/123')
260 self.assertEqual(cl.GetIssueURL(short=True), 'https://example.com/123')
261
262 cl = git_cl.Changelist(issue=123)
263 cl._gerrit_server = 'https://chromium-review.googlesource.com'
264 self.assertEqual(cl.GetIssueURL(),
265 'https://chromium-review.googlesource.com/123')
266 self.assertEqual(cl.GetIssueURL(short=True), 'https://crrev.com/c/123')
267
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +0000268 def test_set_preserve_tryjobs(self):
269 d = git_cl.ChangeDescription('Simple.')
270 d.set_preserve_tryjobs()
271 self.assertEqual(d.description.splitlines(), [
272 'Simple.',
273 '',
274 'Cq-Do-Not-Cancel-Tryjobs: true',
275 ])
276 before = d.description
277 d.set_preserve_tryjobs()
278 self.assertEqual(before, d.description)
279
280 d = git_cl.ChangeDescription('\n'.join([
281 'One is enough',
282 '',
283 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
284 'Change-Id: Ideadbeef',
285 ]))
286 d.set_preserve_tryjobs()
287 self.assertEqual(d.description.splitlines(), [
288 'One is enough',
289 '',
290 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
291 'Change-Id: Ideadbeef',
292 'Cq-Do-Not-Cancel-Tryjobs: true',
293 ])
294
tandriif9aefb72016-07-01 09:06:51 -0700295 def test_get_bug_line_values(self):
296 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
297 self.assertEqual(f('', ''), [])
298 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
299 self.assertEqual(f('v8', '456'), ['v8:456'])
300 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
301 # Not nice, but not worth carying.
302 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
303 ['v8:456', 'chromium:123', 'v8:123'])
304
Edward Lesmescba46082020-03-25 00:29:06 +0000305 def _test_git_number(self, parent_msg, dest_ref, child_msg,
306 parent_hash='parenthash'):
307 desc = git_cl.ChangeDescription(child_msg)
308 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
309 return desc.description
310
311 def assertEqualByLine(self, actual, expected):
312 self.assertEqual(actual.splitlines(), expected.splitlines())
313
314 def test_git_number_bad_parent(self):
315 with self.assertRaises(ValueError):
316 self._test_git_number('Parent', 'refs/heads/master', 'Child')
317
318 def test_git_number_bad_parent_footer(self):
319 with self.assertRaises(AssertionError):
320 self._test_git_number(
321 'Parent\n'
322 '\n'
323 'Cr-Commit-Position: wrong',
324 'refs/heads/master', 'Child')
325
326 def test_git_number_bad_lineage_ignored(self):
327 actual = self._test_git_number(
328 'Parent\n'
329 '\n'
330 'Cr-Commit-Position: refs/heads/master@{#1}\n'
331 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
332 'refs/heads/master', 'Child')
333 self.assertEqualByLine(
334 actual,
335 'Child\n'
336 '\n'
337 'Cr-Commit-Position: refs/heads/master@{#2}\n'
338 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
339
340 def test_git_number_same_branch(self):
341 actual = self._test_git_number(
342 'Parent\n'
343 '\n'
344 'Cr-Commit-Position: refs/heads/master@{#12}',
345 dest_ref='refs/heads/master',
346 child_msg='Child')
347 self.assertEqualByLine(
348 actual,
349 'Child\n'
350 '\n'
351 'Cr-Commit-Position: refs/heads/master@{#13}')
352
353 def test_git_number_same_branch_mixed_footers(self):
354 actual = self._test_git_number(
355 'Parent\n'
356 '\n'
357 'Cr-Commit-Position: refs/heads/master@{#12}',
358 dest_ref='refs/heads/master',
359 child_msg='Child\n'
360 '\n'
361 'Broken-by: design\n'
362 'BUG=123')
363 self.assertEqualByLine(
364 actual,
365 'Child\n'
366 '\n'
367 'Broken-by: design\n'
368 'BUG=123\n'
369 'Cr-Commit-Position: refs/heads/master@{#13}')
370
371 def test_git_number_same_branch_with_originals(self):
372 actual = self._test_git_number(
373 'Parent\n'
374 '\n'
375 'Cr-Commit-Position: refs/heads/master@{#12}',
376 dest_ref='refs/heads/master',
377 child_msg='Child\n'
378 '\n'
379 'Some users are smart and insert their own footers\n'
380 '\n'
381 'Cr-Whatever: value\n'
382 'Cr-Commit-Position: refs/copy/paste@{#22}')
383 self.assertEqualByLine(
384 actual,
385 'Child\n'
386 '\n'
387 'Some users are smart and insert their own footers\n'
388 '\n'
389 'Cr-Original-Whatever: value\n'
390 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
391 'Cr-Commit-Position: refs/heads/master@{#13}')
392
393 def test_git_number_new_branch(self):
394 actual = self._test_git_number(
395 'Parent\n'
396 '\n'
397 'Cr-Commit-Position: refs/heads/master@{#12}',
398 dest_ref='refs/heads/branch',
399 child_msg='Child')
400 self.assertEqualByLine(
401 actual,
402 'Child\n'
403 '\n'
404 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
405 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
406
407 def test_git_number_lineage(self):
408 actual = self._test_git_number(
409 'Parent\n'
410 '\n'
411 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
412 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
413 dest_ref='refs/heads/branch',
414 child_msg='Child')
415 self.assertEqualByLine(
416 actual,
417 'Child\n'
418 '\n'
419 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
420 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
421
422 def test_git_number_moooooooore_lineage(self):
423 actual = self._test_git_number(
424 'Parent\n'
425 '\n'
426 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
427 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
428 dest_ref='refs/heads/mooore',
429 child_msg='Child')
430 self.assertEqualByLine(
431 actual,
432 'Child\n'
433 '\n'
434 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
435 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
436 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
437
438 def test_git_number_ever_moooooooore_lineage(self):
439 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
440 actual = self._test_git_number(
441 'CQ commit on fresh new branch + numbering.\n'
442 '\n'
443 'NOTRY=True\n'
444 'NOPRESUBMIT=True\n'
445 'BUG=\n'
446 '\n'
447 'Review-Url: https://codereview.chromium.org/2577703003\n'
448 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
449 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
450 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
451 dest_ref='refs/heads/gnumb-test/cl',
452 child_msg='git cl on fresh new branch + numbering.\n'
453 '\n'
454 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
455 self.assertEqualByLine(
456 actual,
457 'git cl on fresh new branch + numbering.\n'
458 '\n'
459 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
460 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
461 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
462 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
463 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
464
465 def test_git_number_cherry_pick(self):
466 actual = self._test_git_number(
467 'Parent\n'
468 '\n'
469 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
470 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
471 dest_ref='refs/heads/branch',
472 child_msg='Child, which is cherry-pick from master\n'
473 '\n'
474 'Cr-Commit-Position: refs/heads/master@{#100}\n'
475 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
476 self.assertEqualByLine(
477 actual,
478 'Child, which is cherry-pick from master\n'
479 '\n'
480 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
481 '\n'
482 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
483 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
484 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
485
Edward Lemurda4b6c62020-02-13 00:28:40 +0000486 @mock.patch('gerrit_util.GetAccountDetails')
487 def test_valid_accounts(self, mockGetAccountDetails):
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000488 mock_per_account = {
489 'u1': None, # 404, doesn't exist.
490 'u2': {
491 '_account_id': 123124,
492 'avatars': [],
493 'email': 'u2@example.com',
494 'name': 'User Number 2',
495 'status': 'OOO',
496 },
497 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('),
498 }
499 def GetAccountDetailsMock(_, account):
500 # Poor-man's mock library's side_effect.
501 v = mock_per_account.pop(account)
502 if isinstance(v, Exception):
503 raise v
504 return v
505
Edward Lemurda4b6c62020-02-13 00:28:40 +0000506 mockGetAccountDetails.side_effect = GetAccountDetailsMock
507 actual = git_cl.gerrit_util.ValidAccounts(
508 'host', ['u1', 'u2', 'u3'], max_threads=1)
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000509 self.assertEqual(actual, {
510 'u2': {
511 '_account_id': 123124,
512 'avatars': [],
513 'email': 'u2@example.com',
514 'name': 'User Number 2',
515 'status': 'OOO',
516 },
517 })
518
519
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200520class TestParseIssueURL(unittest.TestCase):
521 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
Edward Lemurf38bc172019-09-03 21:02:13 +0000522 fail=False):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200523 self.assertIsNotNone(parsed)
524 if fail:
525 self.assertFalse(parsed.valid)
526 return
527 self.assertTrue(parsed.valid)
528 self.assertEqual(parsed.issue, issue)
529 self.assertEqual(parsed.patchset, patchset)
530 self.assertEqual(parsed.hostname, hostname)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200531
Edward Lemur678a6842019-10-03 22:25:05 +0000532 def test_ParseIssueNumberArgument(self):
533 def test(arg, *args, **kwargs):
534 self._validate(git_cl.ParseIssueNumberArgument(arg), *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200535
Edward Lemur678a6842019-10-03 22:25:05 +0000536 test('123', 123)
537 test('', fail=True)
538 test('abc', fail=True)
539 test('123/1', fail=True)
540 test('123a', fail=True)
541 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200542
Edward Lemur678a6842019-10-03 22:25:05 +0000543 test('https://codereview.source.com/123',
544 123, None, 'codereview.source.com')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200545 test('http://chrome-review.source.com/c/123',
546 123, None, 'chrome-review.source.com')
547 test('https://chrome-review.source.com/c/123/',
548 123, None, 'chrome-review.source.com')
549 test('https://chrome-review.source.com/c/123/4',
550 123, 4, 'chrome-review.source.com')
551 test('https://chrome-review.source.com/#/c/123/4',
552 123, 4, 'chrome-review.source.com')
553 test('https://chrome-review.source.com/c/123/4',
554 123, 4, 'chrome-review.source.com')
555 test('https://chrome-review.source.com/123',
556 123, None, 'chrome-review.source.com')
557 test('https://chrome-review.source.com/123/4',
558 123, 4, 'chrome-review.source.com')
559
Edward Lemur678a6842019-10-03 22:25:05 +0000560 test('https://chrome-review.source.com/bad/123/4', fail=True)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200561 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
562 test('https://chrome-review.source.com/c/abc/', fail=True)
563 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
564
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200565
566
Edward Lemurda4b6c62020-02-13 00:28:40 +0000567class GitCookiesCheckerTest(unittest.TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100568 def setUp(self):
569 super(GitCookiesCheckerTest, self).setUp()
570 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100571 self.c._all_hosts = []
Edward Lemurda4b6c62020-02-13 00:28:40 +0000572 mock.patch('sys.stdout', StringIO()).start()
573 self.addCleanup(mock.patch.stopall)
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100574
575 def mock_hosts_creds(self, subhost_identity_pairs):
576 def ensure_googlesource(h):
577 if not h.endswith(self.c._GOOGLESOURCE):
578 assert not h.endswith('.')
579 return h + '.' + self.c._GOOGLESOURCE
580 return h
581 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
582 for h, i in subhost_identity_pairs]
583
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200584 def test_identity_parsing(self):
585 self.assertEqual(self.c._parse_identity('ldap.google.com'),
586 ('ldap', 'google.com'))
587 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
588 ('ldap', 'example.com'))
589 # Specical case because we know there are no subdomains in chromium.org.
590 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
591 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800592 # Pathological: ".period." can be either username OR domain, more likely
593 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200594 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
595 ('note', 'period.example.com'))
596
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100597 def test_analysis_nothing(self):
598 self.c._all_hosts = []
599 self.assertFalse(self.c.has_generic_host())
600 self.assertEqual(set(), self.c.get_conflicting_hosts())
601 self.assertEqual(set(), self.c.get_duplicated_hosts())
602 self.assertEqual(set(), self.c.get_partially_configured_hosts())
603 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
604
605 def test_analysis(self):
606 self.mock_hosts_creds([
607 ('.googlesource.com', 'git-example.chromium.org'),
608
609 ('chromium', 'git-example.google.com'),
610 ('chromium-review', 'git-example.google.com'),
611 ('chrome-internal', 'git-example.chromium.org'),
612 ('chrome-internal-review', 'git-example.chromium.org'),
613 ('conflict', 'git-example.google.com'),
614 ('conflict-review', 'git-example.chromium.org'),
615 ('dup', 'git-example.google.com'),
616 ('dup', 'git-example.google.com'),
617 ('dup-review', 'git-example.google.com'),
618 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200619 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100620 ])
621 self.assertTrue(self.c.has_generic_host())
622 self.assertEqual(set(['conflict.googlesource.com']),
623 self.c.get_conflicting_hosts())
624 self.assertEqual(set(['dup.googlesource.com']),
625 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200626 self.assertEqual(set(['partial.googlesource.com',
627 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100628 self.c.get_partially_configured_hosts())
629 self.assertEqual(set(['chromium.googlesource.com',
630 'chrome-internal.googlesource.com']),
631 self.c.get_hosts_with_wrong_identities())
632
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100633 def test_report_no_problems(self):
634 self.test_analysis_nothing()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100635 self.assertFalse(self.c.find_and_report_problems())
636 self.assertEqual(sys.stdout.getvalue(), '')
637
Edward Lemurda4b6c62020-02-13 00:28:40 +0000638 @mock.patch(
639 'git_cl.gerrit_util.CookiesAuthenticator.get_gitcookies_path',
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000640 return_value=os.path.join('~', '.gitcookies'))
Edward Lemurda4b6c62020-02-13 00:28:40 +0000641 def test_report(self, *_mocks):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100642 self.test_analysis()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100643 self.assertTrue(self.c.find_and_report_problems())
644 with open(os.path.join(os.path.dirname(__file__),
645 'git_cl_creds_check_report.txt')) as f:
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000646 expected = f.read() % {
647 'sep': os.sep,
648 }
649
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100650 def by_line(text):
651 return [l.rstrip() for l in text.rstrip().splitlines()]
Robert Iannucci456b0d62018-03-13 19:15:50 -0700652 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200653 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100654
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800655
Edward Lemurda4b6c62020-02-13 00:28:40 +0000656class TestGitCl(unittest.TestCase):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000657 def setUp(self):
658 super(TestGitCl, self).setUp()
659 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700660 self._calls_done = []
Edward Lemurda4b6c62020-02-13 00:28:40 +0000661 mock.patch('sys.stdout', StringIO()).start()
662 mock.patch(
663 'git_cl.time_time',
664 lambda: self._mocked_call('time.time')).start()
665 mock.patch(
666 'git_cl.metrics.collector.add_repeated',
667 lambda *a: self._mocked_call('add_repeated', *a)).start()
668 mock.patch('subprocess2.call', self._mocked_call).start()
669 mock.patch('subprocess2.check_call', self._mocked_call).start()
670 mock.patch('subprocess2.check_output', self._mocked_call).start()
671 mock.patch(
672 'subprocess2.communicate',
673 lambda *a, **_k: ([self._mocked_call(*a), ''], 0)).start()
674 mock.patch(
675 'git_cl.gclient_utils.CheckCallAndFilter',
676 self._mocked_call).start()
677 mock.patch('git_common.is_dirty_git_tree', lambda x: False).start()
678 mock.patch(
679 'git_common.get_or_create_merge_base',
680 lambda *a: self._mocked_call('get_or_create_merge_base', *a)).start()
Edward Lesmescba46082020-03-25 00:29:06 +0000681 mock.patch('git_cl.BranchExists', return_value=True).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +0000682 mock.patch('git_cl.FindCodereviewSettingsFile', return_value='').start()
683 mock.patch(
684 'git_cl.SaveDescriptionBackup',
685 lambda _: self._mocked_call('SaveDescriptionBackup')).start()
686 mock.patch(
Edward Lemurda4b6c62020-02-13 00:28:40 +0000687 'git_cl.write_json',
688 lambda *a: self._mocked_call('write_json', *a)).start()
689 mock.patch(
Edward Lemur227d5102020-02-25 23:45:35 +0000690 'git_cl.Changelist.RunHook',
691 return_value={'more_cc': ['test-more-cc@chromium.org']}).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +0000692 mock.patch('git_cl.watchlists.Watchlists', WatchlistsMock).start()
693 mock.patch('git_cl.auth.Authenticator', AuthenticatorMock).start()
Edward Lesmes7677e5c2020-02-19 20:39:03 +0000694 mock.patch('gerrit_util.GetChangeDetail').start()
Edward Lemurda4b6c62020-02-13 00:28:40 +0000695 mock.patch(
696 'git_cl.gerrit_util.GetChangeComments',
697 lambda *a: self._mocked_call('GetChangeComments', *a)).start()
698 mock.patch(
699 'git_cl.gerrit_util.GetChangeRobotComments',
700 lambda *a: self._mocked_call('GetChangeRobotComments', *a)).start()
701 mock.patch(
702 'git_cl.gerrit_util.AddReviewers',
703 lambda *a: self._mocked_call('AddReviewers', *a)).start()
704 mock.patch(
705 'git_cl.gerrit_util.SetReview',
706 lambda h, i, msg=None, labels=None, notify=None, ready=None: (
707 self._mocked_call(
708 'SetReview', h, i, msg, labels, notify, ready))).start()
709 mock.patch(
710 'git_cl.gerrit_util.LuciContextAuthenticator.is_luci',
711 return_value=False).start()
712 mock.patch(
713 'git_cl.gerrit_util.GceAuthenticator.is_gce',
714 return_value=False).start()
715 mock.patch(
716 'git_cl.gerrit_util.ValidAccounts',
717 lambda *a: self._mocked_call('ValidAccounts', *a)).start()
Edward Lemurd55c5072020-02-20 01:09:07 +0000718 mock.patch('sys.exit', side_effect=SystemExitMock).start()
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000719 mock.patch('git_cl.Settings.GetRoot', return_value='').start()
Edward Lemur85153282020-02-14 22:06:29 +0000720 self.mockGit = GitMocks()
721 mock.patch('scm.GIT.GetBranchRef', self.mockGit.GetBranchRef).start()
722 mock.patch('scm.GIT.GetConfig', self.mockGit.GetConfig).start()
723 mock.patch('scm.GIT.SetConfig', self.mockGit.SetConfig).start()
Edward Lemur84101642020-02-21 21:40:34 +0000724 mock.patch(
725 'git_new_branch.create_new_branch', self.mockGit.NewBranch).start()
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000726 mock.patch(
Edward Lemur85153282020-02-14 22:06:29 +0000727 'scm.GIT.FetchUpstreamTuple',
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000728 return_value=('origin', 'refs/heads/master')).start()
Edward Lemur85153282020-02-14 22:06:29 +0000729 mock.patch(
730 'scm.GIT.CaptureStatus', return_value=[('M', 'foo.txt')]).start()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000731 # It's important to reset settings to not have inter-tests interference.
732 git_cl.settings = None
Edward Lemurda4b6c62020-02-13 00:28:40 +0000733 self.addCleanup(mock.patch.stopall)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000734
735 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000736 try:
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +0000737 self.assertEqual([], self.calls)
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100738 except AssertionError:
Edward Lemur85153282020-02-14 22:06:29 +0000739 calls = ''.join(' %s\n' % str(call) for call in self.calls[:5])
740 if len(self.calls) > 5:
741 calls += ' ...\n'
742 self.fail(
743 '\n'
744 'There are un-consumed calls after this test has finished:\n' +
745 calls)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000746 finally:
747 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000748
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000749 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000750 self.assertTrue(
751 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700752 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000753 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000754 expected_args, result = top
755
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000756 # Also logs otherwise it could get caught in a try/finally and be hard to
757 # diagnose.
758 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700759 N = 5
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000760 prior_calls = '\n '.join(
tandrii9d206752016-06-20 11:32:47 -0700761 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
762 for i, c in enumerate(self._calls_done[-N:]))
763 following_calls = '\n '.join(
764 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
765 for i, c in enumerate(self.calls[:N]))
766 extended_msg = (
767 'A few prior calls:\n %s\n\n'
768 'This (expected):\n @%d: %r\n'
769 'This (actual):\n @%d: %r\n\n'
770 'A few following expected calls:\n %s' %
771 (prior_calls, len(self._calls_done), expected_args,
772 len(self._calls_done), args, following_calls))
tandrii9d206752016-06-20 11:32:47 -0700773
tandrii99a72f22016-08-17 14:33:24 -0700774 self.fail('@%d\n'
775 ' Expected: %r\n'
Edward Lemur26964072020-02-19 19:18:51 +0000776 ' Actual: %r\n'
777 '\n'
778 '%s' % (
779 len(self._calls_done), expected_args, args, extended_msg))
tandrii9d206752016-06-20 11:32:47 -0700780
781 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700782 if isinstance(result, Exception):
783 raise result
Edward Lemur0db01f02019-11-12 22:01:51 +0000784 # stdout from git commands is supposed to be a bytestream. Convert it here
785 # instead of converting all test output in this file to bytes.
786 if args[0][0] == 'git' and not isinstance(result, bytes):
787 result = result.encode('utf-8')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000788 return result
789
Edward Lemur1a83da12020-03-04 21:18:36 +0000790 @mock.patch('sys.stdin', StringIO('blah\nye\n'))
791 @mock.patch('sys.stdout', StringIO())
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100792 def test_ask_for_explicit_yes_true(self):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100793 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
Edward Lemur1a83da12020-03-04 21:18:36 +0000794 self.assertEqual(
795 'prompt [Yes/No]: Please, type yes or no: ',
796 sys.stdout.getvalue())
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100797
tandrii48df5812016-10-17 03:55:37 -0700798 def test_LoadCodereviewSettingsFromFile_gerrit(self):
Edward Lemur79d4f992019-11-11 23:49:02 +0000799 codereview_file = StringIO('GERRIT_HOST: true')
tandrii48df5812016-10-17 03:55:37 -0700800 self.calls = [
801 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700802 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
803 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
804 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
805 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700806 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
807 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700808 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
809 CERR1),
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000810 ((['git', 'config', '--unset-all', 'rietveld.format-full-by-default'],),
811 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700812 ((['git', 'config', 'gerrit.host', 'true'],), ''),
813 ]
814 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
815
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000816 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100817 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200818 fetched_status=None, other_cl_owner=None,
Anthony Polito8b955342019-09-24 19:01:36 +0000819 custom_cl_base=None, short_hostname='chromium',
820 change_id=None):
Edward Lemur26964072020-02-19 19:18:51 +0000821 calls = []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200822 if custom_cl_base:
823 ancestor_revision = custom_cl_base
824 else:
825 # Determine ancestor_revision to be merge base.
826 ancestor_revision = 'fake_ancestor_sha'
827 calls += [
Edward Lemurda4b6c62020-02-13 00:28:40 +0000828 (('get_or_create_merge_base', 'master', 'refs/remotes/origin/master'),
829 ancestor_revision),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200830 ]
831
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100832 if issue:
Edward Lesmes7677e5c2020-02-19 20:39:03 +0000833 gerrit_util.GetChangeDetail.return_value = {
834 'owner': {'email': (other_cl_owner or 'owner@example.com')},
835 'change_id': (change_id or '123456789'),
836 'current_revision': 'sha1_of_current_revision',
837 'revisions': {'sha1_of_current_revision': {
838 'commit': {'message': fetched_description},
839 }},
840 'status': fetched_status or 'NEW',
841 }
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100842 if fetched_status == 'ABANDONED':
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100843 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100844 if other_cl_owner:
845 calls += [
846 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
847 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100848
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100849 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200850 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
851 ([custom_cl_base] if custom_cl_base else
852 [ancestor_revision, 'HEAD']),),
853 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100854 ]
Edward Lemur2c62b332020-03-12 22:12:33 +0000855
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100856 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +0000857
Edward Lemur26964072020-02-19 19:18:51 +0000858 def _gerrit_upload_calls(self, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700859 squash_mode='default',
Aaron Gablefd238082017-06-07 13:42:34 -0700860 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +0100861 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000862 custom_cl_base=None, tbr=None,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +0000863 short_hostname='chromium',
Edward Lemur5a644f82020-03-18 16:44:57 +0000864 labels=None, change_id=None,
Anthony Polito8b955342019-09-24 19:01:36 +0000865 final_description=None, gitcookies_exists=True,
Josipe827b0f2020-01-30 00:07:20 +0000866 force=False, edit_description=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000867 if post_amend_description is None:
868 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -0700869 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200870
871 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000872
Edward Lemur26964072020-02-19 19:18:51 +0000873 if squash_mode in ('override_squash', 'override_nosquash'):
874 self.mockGit.config['gerrit.override-squash-uploads'] = (
875 'true' if squash_mode == 'override_squash' else 'false')
tandriia60502f2016-06-20 02:01:53 -0700876
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000877 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000878 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200879 (('DownloadGerritHook', False), ''),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200880 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000881 if squash:
Edward Lemur5a644f82020-03-18 16:44:57 +0000882 if not issue and not force:
Edward Lemur5fb22242020-03-12 22:05:13 +0000883 calls += [
884 ((['RunEditor'],), description),
885 ]
Josipe827b0f2020-01-30 00:07:20 +0000886 # user wants to edit description
887 if edit_description:
888 calls += [
Josipe827b0f2020-01-30 00:07:20 +0000889 ((['RunEditor'],), edit_description),
890 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000891 ref_to_push = 'abcdef0123456789'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200892
893 if custom_cl_base is None:
894 calls += [
Edward Lemurda4b6c62020-02-13 00:28:40 +0000895 (('get_or_create_merge_base', 'master', 'refs/remotes/origin/master'),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000896 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200897 ]
898 parent = 'origin/master'
899 else:
900 calls += [
901 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
902 'refs/remotes/origin/master'],),
903 callError(1)), # Means not ancenstor.
904 (('ask_for_data',
905 'Do you take responsibility for cleaning up potential mess '
906 'resulting from proceeding with upload? Press Enter to upload, '
907 'or Ctrl+C to abort'), ''),
908 ]
909 parent = custom_cl_base
910
911 calls += [
912 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
913 '0123456789abcdef'),
Edward Lemur1773f372020-02-22 00:27:14 +0000914 ((['FileWrite', '/tmp/fake-temp1', description],), None),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200915 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Edward Lemur1773f372020-02-22 00:27:14 +0000916 '-F', '/tmp/fake-temp1'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200917 ref_to_push),
918 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000919 else:
920 ref_to_push = 'HEAD'
Edward Lemur5a644f82020-03-18 16:44:57 +0000921 parent = 'origin/refs/heads/master'
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000922
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000923 calls += [
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000924 (('SaveDescriptionBackup',), None),
Edward Lemur5a644f82020-03-18 16:44:57 +0000925 ((['git', 'rev-list', parent + '..' + ref_to_push],),'1hashPerLine\n'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200926 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000927
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000928 metrics_arguments = []
929
Aaron Gableafd52772017-06-27 16:40:10 -0700930 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -0700931 ref_suffix = '%ready,notify=ALL'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000932 metrics_arguments += ['ready', 'notify=ALL']
Aaron Gable844cf292017-06-28 11:32:59 -0700933 else:
Jamie Madill276da0b2018-04-27 14:41:20 -0400934 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -0700935 ref_suffix = '%wip'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000936 metrics_arguments.append('wip')
Aaron Gable844cf292017-06-28 11:32:59 -0700937 else:
938 ref_suffix = '%notify=NONE'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000939 metrics_arguments.append('notify=NONE')
Aaron Gable9b713dd2016-12-14 16:04:21 -0800940
Edward Lemur5a644f82020-03-18 16:44:57 +0000941 # If issue is given, then description is fetched from Gerrit instead.
942 if issue is None:
943 if squash:
944 title = 'Initial upload'
945 else:
946 if not title:
947 calls += [
948 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
949 (('ask_for_data', 'Title for patchset []: '), 'User input'),
950 ]
951 title = 'User input'
Aaron Gable70f4e242017-06-26 10:45:59 -0700952 if title:
Edward Lemur5a644f82020-03-18 16:44:57 +0000953 ref_suffix += ',m=' + gerrit_util.PercentEncodeForGitRef(title)
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000954 metrics_arguments.append('m')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000955
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000956 if short_hostname == 'chromium':
957 # All reviwers and ccs get into ref_suffix.
958 for r in sorted(reviewers):
959 ref_suffix += ',r=%s' % r
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000960 metrics_arguments.append('r')
Edward Lemur4508b422019-10-03 21:56:35 +0000961 if issue is None:
Edward Lemur227d5102020-02-25 23:45:35 +0000962 cc += ['test-more-cc@chromium.org', 'joe@example.com']
Edward Lemur4508b422019-10-03 21:56:35 +0000963 for c in sorted(cc):
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000964 ref_suffix += ',cc=%s' % c
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000965 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000966 reviewers, cc = [], []
967 else:
968 # TODO(crbug/877717): remove this case.
969 calls += [
970 (('ValidAccounts', '%s-review.googlesource.com' % short_hostname,
971 sorted(reviewers) + ['joe@example.com',
Edward Lemur227d5102020-02-25 23:45:35 +0000972 'test-more-cc@chromium.org'] + cc),
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000973 {
974 e: {'email': e}
975 for e in (reviewers + ['joe@example.com'] + cc)
976 })
977 ]
978 for r in sorted(reviewers):
979 if r != 'bad-account-or-email':
980 ref_suffix += ',r=%s' % r
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000981 metrics_arguments.append('r')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000982 reviewers.remove(r)
Edward Lemur4508b422019-10-03 21:56:35 +0000983 if issue is None:
984 cc += ['joe@example.com']
985 for c in sorted(cc):
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000986 ref_suffix += ',cc=%s' % c
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000987 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000988 if c in cc:
989 cc.remove(c)
Andrii Shyshkalov76988a82018-10-15 03:12:25 +0000990
Edward Lemur687ca902018-12-05 02:30:30 +0000991 for k, v in sorted((labels or {}).items()):
992 ref_suffix += ',l=%s+%d' % (k, v)
993 metrics_arguments.append('l=%s+%d' % (k, v))
994
995 if tbr:
996 calls += [
997 (('GetCodeReviewTbrScore',
998 '%s-review.googlesource.com' % short_hostname,
999 'my/repo'),
1000 2,),
1001 ]
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001002
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001003 calls += [
1004 (('time.time',), 1000,),
1005 ((['git', 'push',
1006 'https://%s.googlesource.com/my/repo' % short_hostname,
1007 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
1008 (('remote:\n'
1009 'remote: Processing changes: (\)\n'
1010 'remote: Processing changes: (|)\n'
1011 'remote: Processing changes: (/)\n'
1012 'remote: Processing changes: (-)\n'
1013 'remote: Processing changes: new: 1 (/)\n'
1014 'remote: Processing changes: new: 1, done\n'
1015 'remote:\n'
1016 'remote: New Changes:\n'
1017 'remote: https://%s-review.googlesource.com/#/c/my/repo/+/123456'
1018 ' XXX\n'
1019 'remote:\n'
1020 'To https://%s.googlesource.com/my/repo\n'
1021 ' * [new branch] hhhh -> refs/for/refs/heads/master\n'
1022 ) % (short_hostname, short_hostname)),),
1023 (('time.time',), 2000,),
1024 (('add_repeated',
1025 'sub_commands',
1026 {
1027 'execution_time': 1000,
1028 'command': 'git push',
1029 'exit_code': 0,
1030 'arguments': sorted(metrics_arguments),
1031 }),
1032 None,),
1033 ]
1034
Edward Lemur1b52d872019-05-09 21:12:12 +00001035 final_description = final_description or post_amend_description.strip()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001036
1037 date_format = ('03/16/17 20:00:41'
1038 if sys.platform == 'win32' and sys.version_info.major == 2
1039 else 'Thu Mar 16 20:00:41 2017')
1040 trace_name = os.path.join('TRACES_DIR', '20170316T200041.000000')
1041
Edward Lemur1b52d872019-05-09 21:12:12 +00001042 # Trace-related calls
1043 calls += [
1044 # Write a description with context for the current trace.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001045 (
1046 ([
1047 'FileWrite', trace_name + '-README',
1048 '%(date)s\n'
1049 '%(short_hostname)s-review.googlesource.com\n'
1050 '%(change_id)s\n'
1051 '%(title)s\n'
1052 '%(description)s\n'
1053 '1000\n'
1054 '0\n'
1055 '%(trace_name)s' % {
1056 'date': date_format,
1057 'short_hostname': short_hostname,
1058 'change_id': change_id,
1059 'description': final_description,
1060 'title': title or '<untitled>',
1061 'trace_name': trace_name,
1062 }
1063 ], ),
1064 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001065 ),
1066 # Read traces and shorten git hashes.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001067 (
1068 (['os.path.isfile',
1069 os.path.join('TEMP_DIR', 'trace-packet')], ),
1070 True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001071 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001072 (
1073 (['FileRead', os.path.join('TEMP_DIR', 'trace-packet')], ),
1074 ('git-hash: 0123456789012345678901234567890123456789\n'
1075 'git-hash: abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde\n'),
Edward Lemur1b52d872019-05-09 21:12:12 +00001076 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001077 (
1078 ([
1079 'FileWrite',
1080 os.path.join('TEMP_DIR', 'trace-packet'), 'git-hash: 012345\n'
1081 'git-hash: abcdea\n'
1082 ], ),
1083 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001084 ),
1085 # Make zip file for the git traces.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001086 (
1087 (['make_archive', trace_name + '-traces', 'zip', 'TEMP_DIR'], ),
1088 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001089 ),
1090 # Collect git config and gitcookies.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001091 (
1092 (['git', 'config', '-l'], ),
1093 'git-config-output',
Edward Lemur1b52d872019-05-09 21:12:12 +00001094 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001095 (
1096 ([
1097 'FileWrite',
1098 os.path.join('TEMP_DIR', 'git-config'), 'git-config-output'
1099 ], ),
1100 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001101 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001102 (
1103 (['os.path.isfile',
1104 os.path.join('~', '.gitcookies')], ),
1105 gitcookies_exists,
Edward Lemur1b52d872019-05-09 21:12:12 +00001106 ),
1107 ]
1108 if gitcookies_exists:
1109 calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001110 (
1111 (['FileRead', os.path.join('~', '.gitcookies')], ),
1112 'gitcookies 1/SECRET',
Edward Lemur1b52d872019-05-09 21:12:12 +00001113 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001114 (
1115 ([
1116 'FileWrite',
1117 os.path.join('TEMP_DIR', 'gitcookies'), 'gitcookies REDACTED'
1118 ], ),
1119 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001120 ),
1121 ]
1122 calls += [
1123 # Make zip file for the git config and gitcookies.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001124 (
1125 (['make_archive', trace_name + '-git-info', 'zip', 'TEMP_DIR'], ),
1126 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001127 ),
1128 ]
1129
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001130 # TODO(crbug/877717): this should never be used.
1131 if squash and short_hostname != 'chromium':
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001132 calls += [
1133 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001134 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001135 sorted(reviewers),
Edward Lemur227d5102020-02-25 23:45:35 +00001136 cc + ['test-more-cc@chromium.org'],
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00001137 notify),
1138 ''),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001139 ]
Edward Lesmescba46082020-03-25 00:29:06 +00001140 calls += [
1141 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
1142 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001143 return calls
1144
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001145 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001146 self,
1147 upload_args,
1148 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001149 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001150 squash=True,
1151 squash_mode=None,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001152 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001153 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001154 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001155 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001156 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001157 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001158 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001159 custom_cl_base=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001160 tbr=None,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001161 short_hostname='chromium',
Edward Lemur1b52d872019-05-09 21:12:12 +00001162 labels=None,
1163 change_id=None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001164 final_description=None,
Anthony Polito8b955342019-09-24 19:01:36 +00001165 gitcookies_exists=True,
1166 force=False,
Josipe827b0f2020-01-30 00:07:20 +00001167 edit_description=None,
Anthony Polito8b955342019-09-24 19:01:36 +00001168 fetched_description=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001169 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001170 if squash_mode is None:
1171 if '--no-squash' in upload_args:
1172 squash_mode = 'nosquash'
1173 elif '--squash' in upload_args:
1174 squash_mode = 'squash'
1175 else:
1176 squash_mode = 'default'
1177
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001178 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001179 cc = cc or []
Edward Lemurda4b6c62020-02-13 00:28:40 +00001180 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001181 CookiesAuthenticatorMockFactory(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001182 same_auth=('git-owner.example.com', '', 'pass'))).start()
1183 mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck',
1184 lambda _, offer_removal: None).start()
1185 mock.patch('git_cl.gclient_utils.RunEditor',
1186 lambda *_, **__: self._mocked_call(['RunEditor'])).start()
1187 mock.patch('git_cl.DownloadGerritHook', lambda force: self._mocked_call(
1188 'DownloadGerritHook', force)).start()
1189 mock.patch('git_cl.gclient_utils.FileRead',
1190 lambda path: self._mocked_call(['FileRead', path])).start()
1191 mock.patch('git_cl.gclient_utils.FileWrite',
Edward Lemur1b52d872019-05-09 21:12:12 +00001192 lambda path, contents: self._mocked_call(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001193 ['FileWrite', path, contents])).start()
1194 mock.patch('git_cl.datetime_now',
1195 lambda: datetime.datetime(2017, 3, 16, 20, 0, 41, 0)).start()
1196 mock.patch('git_cl.tempfile.mkdtemp', lambda: 'TEMP_DIR').start()
1197 mock.patch('git_cl.TRACES_DIR', 'TRACES_DIR').start()
1198 mock.patch('git_cl.TRACES_README_FORMAT',
Edward Lemur75391d42019-05-14 23:35:56 +00001199 '%(now)s\n'
1200 '%(gerrit_host)s\n'
1201 '%(change_id)s\n'
1202 '%(title)s\n'
1203 '%(description)s\n'
1204 '%(execution_time)s\n'
1205 '%(exit_code)s\n'
Edward Lemurda4b6c62020-02-13 00:28:40 +00001206 '%(trace_name)s').start()
1207 mock.patch('git_cl.shutil.make_archive',
1208 lambda *args: self._mocked_call(['make_archive'] +
1209 list(args))).start()
1210 mock.patch('os.path.isfile',
1211 lambda path: self._mocked_call(['os.path.isfile', path])).start()
Edward Lesmescba46082020-03-25 00:29:06 +00001212 mock.patch('git_cl.Changelist.GitSanityChecks', return_value=True).start()
Edward Lemur9aa1a962020-02-25 00:58:38 +00001213 mock.patch(
Edward Lemura12175c2020-03-09 16:58:26 +00001214 'git_cl._create_description_from_log', return_value=description).start()
1215 mock.patch(
1216 'git_cl.Changelist._AddChangeIdToCommitMessage',
1217 return_value=post_amend_description or description).start()
Edward Lemur1a83da12020-03-04 21:18:36 +00001218 mock.patch(
Edward Lemur5a644f82020-03-18 16:44:57 +00001219 'git_cl.GenerateGerritChangeId', return_value=change_id).start()
1220 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00001221 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00001222 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
tandriia60502f2016-06-20 02:01:53 -07001223
Edward Lemur26964072020-02-19 19:18:51 +00001224 self.mockGit.config['gerrit.host'] = 'true'
Edward Lemur85153282020-02-14 22:06:29 +00001225 self.mockGit.config['branch.master.gerritissue'] = (
1226 str(issue) if issue else None)
1227 self.mockGit.config['remote.origin.url'] = (
1228 'https://%s.googlesource.com/my/repo' % short_hostname)
Edward Lemur9aa1a962020-02-25 00:58:38 +00001229 self.mockGit.config['user.email'] = 'me@example.com'
Edward Lemur85153282020-02-14 22:06:29 +00001230
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001231 self.calls = self._gerrit_base_calls(
1232 issue=issue,
Anthony Polito8b955342019-09-24 19:01:36 +00001233 fetched_description=fetched_description or description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001234 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001235 other_cl_owner=other_cl_owner,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001236 custom_cl_base=custom_cl_base,
Anthony Polito8b955342019-09-24 19:01:36 +00001237 short_hostname=short_hostname,
1238 change_id=change_id)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001239 if fetched_status != 'ABANDONED':
Edward Lemurda4b6c62020-02-13 00:28:40 +00001240 mock.patch(
Edward Lemur1773f372020-02-22 00:27:14 +00001241 'gclient_utils.temporary_file', TemporaryFileMock()).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00001242 mock.patch('os.remove', return_value=True).start()
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001243 self.calls += self._gerrit_upload_calls(
1244 description, reviewers, squash,
1245 squash_mode=squash_mode,
Aaron Gablefd238082017-06-07 13:42:34 -07001246 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001247 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001248 issue=issue, cc=cc,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001249 custom_cl_base=custom_cl_base, tbr=tbr,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001250 short_hostname=short_hostname,
Edward Lemur1b52d872019-05-09 21:12:12 +00001251 labels=labels,
1252 change_id=change_id,
Edward Lemur1b52d872019-05-09 21:12:12 +00001253 final_description=final_description,
Anthony Polito8b955342019-09-24 19:01:36 +00001254 gitcookies_exists=gitcookies_exists,
Josipe827b0f2020-01-30 00:07:20 +00001255 force=force,
1256 edit_description=edit_description)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001257 # Uncomment when debugging.
Raul Tambre80ee78e2019-05-06 22:41:05 +00001258 # print('\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001259 git_cl.main(['upload'] + upload_args)
Edward Lemur85153282020-02-14 22:06:29 +00001260 if squash:
Edward Lemur26964072020-02-19 19:18:51 +00001261 self.assertIssueAndPatchset(patchset=None)
Edward Lemur85153282020-02-14 22:06:29 +00001262 self.assertEqual(
1263 'abcdef0123456789',
Edward Lemur26964072020-02-19 19:18:51 +00001264 scm.GIT.GetBranchConfig('', 'master', 'gerritsquashhash'))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001265
Edward Lemur1b52d872019-05-09 21:12:12 +00001266 def test_gerrit_upload_traces_no_gitcookies(self):
1267 self._run_gerrit_upload_test(
1268 ['--no-squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001269 'desc ✔\n\nBUG=\n',
Edward Lemur1b52d872019-05-09 21:12:12 +00001270 [],
1271 squash=False,
Edward Lemur0db01f02019-11-12 22:01:51 +00001272 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001273 change_id='Ixxx',
1274 gitcookies_exists=False)
1275
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001276 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001277 self._run_gerrit_upload_test(
Edward Lemur5a644f82020-03-18 16:44:57 +00001278 [],
1279 'desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
1280 [],
1281 change_id='Ixxx')
1282
1283 def test_gerrit_upload_without_change_id_nosquash(self):
1284 self._run_gerrit_upload_test(
tandriia60502f2016-06-20 02:01:53 -07001285 ['--no-squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001286 'desc ✔\n\nBUG=\n',
tandriia60502f2016-06-20 02:01:53 -07001287 [],
1288 squash=False,
Edward Lemur0db01f02019-11-12 22:01:51 +00001289 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001290 change_id='Ixxx')
tandriia60502f2016-06-20 02:01:53 -07001291
1292 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001293 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001294 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001295 'desc ✔\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001296 [],
tandriia60502f2016-06-20 02:01:53 -07001297 squash=False,
1298 squash_mode='override_nosquash',
Edward Lemur0db01f02019-11-12 22:01:51 +00001299 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001300 change_id='Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001301
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001302 def test_gerrit_no_reviewer(self):
1303 self._run_gerrit_upload_test(
1304 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001305 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001306 [],
1307 squash=False,
Edward Lemur1b52d872019-05-09 21:12:12 +00001308 squash_mode='override_nosquash',
1309 change_id='I123456789')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001310
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001311 def test_gerrit_no_reviewer_non_chromium_host(self):
1312 # TODO(crbug/877717): remove this test case.
1313 self._run_gerrit_upload_test(
1314 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001315 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001316 [],
1317 squash=False,
1318 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001319 short_hostname='other',
1320 change_id='I123456789')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001321
Nick Carter8692b182017-11-06 16:30:38 -08001322 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001323 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001324 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001325 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001326 squash=False,
1327 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001328 change_id='I123456789',
Edward Lemur5a644f82020-03-18 16:44:57 +00001329 title='We\'ll escape ^_ ^ special chars...@{u}')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001330
ukai@chromium.orge8077812012-02-03 03:41:46 +00001331 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001332 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001333 ['-r', 'foo@example.com', '--send-mail'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001334 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
Edward Lemur5a644f82020-03-18 16:44:57 +00001335 reviewers=['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001336 squash=False,
1337 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001338 notify=True,
1339 change_id='I123456789',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001340 final_description=(
Edward Lemur0db01f02019-11-12 22:01:51 +00001341 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001342
Anthony Polito8b955342019-09-24 19:01:36 +00001343 def test_gerrit_upload_force_sets_bug(self):
1344 self._run_gerrit_upload_test(
1345 ['-b', '10000', '-f'],
1346 u'desc=\n\nBug: 10000\nChange-Id: Ixxx',
1347 [],
1348 force=True,
Anthony Polito8b955342019-09-24 19:01:36 +00001349 fetched_description='desc=\n\nChange-Id: Ixxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001350 change_id='Ixxx')
1351
Edward Lemur5fb22242020-03-12 22:05:13 +00001352 def test_gerrit_upload_corrects_wrong_change_id(self):
Anthony Polito8b955342019-09-24 19:01:36 +00001353 self._run_gerrit_upload_test(
Edward Lemur5fb22242020-03-12 22:05:13 +00001354 ['-b', '10000', '-m', 'Title', '--edit-description'],
1355 u'desc=\n\nBug: 10000\nChange-Id: Ixxxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001356 [],
Anthony Polito8b955342019-09-24 19:01:36 +00001357 issue='123456',
Edward Lemur5fb22242020-03-12 22:05:13 +00001358 edit_description='desc=\n\nBug: 10000\nChange-Id: Izzzz',
Anthony Polito8b955342019-09-24 19:01:36 +00001359 fetched_description='desc=\n\nChange-Id: Ixxxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001360 title='Title',
Edward Lemur5fb22242020-03-12 22:05:13 +00001361 change_id='Ixxxx')
Anthony Polito8b955342019-09-24 19:01:36 +00001362
Dan Beamd8b04ca2019-10-10 21:23:26 +00001363 def test_gerrit_upload_force_sets_fixed(self):
1364 self._run_gerrit_upload_test(
1365 ['-x', '10000', '-f'],
1366 u'desc=\n\nFixed: 10000\nChange-Id: Ixxx',
1367 [],
1368 force=True,
Dan Beamd8b04ca2019-10-10 21:23:26 +00001369 fetched_description='desc=\n\nChange-Id: Ixxx',
Dan Beamd8b04ca2019-10-10 21:23:26 +00001370 change_id='Ixxx')
1371
ukai@chromium.orge8077812012-02-03 03:41:46 +00001372 def test_gerrit_reviewer_multiple(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001373 mock.patch('git_cl.gerrit_util.GetCodeReviewTbrScore',
1374 lambda *a: self._mocked_call('GetCodeReviewTbrScore', *a)).start()
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001375 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001376 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001377 'desc ✔\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
bradnelsond975b302016-10-23 12:20:23 -07001378 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001379 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001380 ['reviewer@example.com', 'another@example.com'],
Aaron Gablefd238082017-06-07 13:42:34 -07001381 cc=['more@example.com', 'people@example.com'],
Edward Lemur687ca902018-12-05 02:30:30 +00001382 tbr='reviewer@example.com',
Edward Lemur1b52d872019-05-09 21:12:12 +00001383 labels={'Code-Review': 2},
Edward Lemur5a644f82020-03-18 16:44:57 +00001384 change_id='123456789')
tandriia60502f2016-06-20 02:01:53 -07001385
1386 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001387 self._run_gerrit_upload_test(
1388 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001389 'desc ✔\nBUG=\n\nChange-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001390 [],
Edward Lemur5a644f82020-03-18 16:44:57 +00001391 change_id='123456789')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001392
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001393 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001394 self._run_gerrit_upload_test(
1395 ['--squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001396 'desc ✔\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001397 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001398 squash=True,
Edward Lemur5a644f82020-03-18 16:44:57 +00001399 change_id='123456789')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001400
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001401 def test_gerrit_upload_squash_first_with_labels(self):
1402 self._run_gerrit_upload_test(
1403 ['--squash', '--cq-dry-run', '--enable-auto-submit'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001404 'desc ✔\nBUG=\n\nChange-Id: 123456789',
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001405 [],
1406 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001407 labels={'Commit-Queue': 1, 'Auto-Submit': 1},
Edward Lemur5a644f82020-03-18 16:44:57 +00001408 change_id='123456789')
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001409
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001410 def test_gerrit_upload_squash_first_against_rev(self):
1411 custom_cl_base = 'custom_cl_base_rev_or_branch'
1412 self._run_gerrit_upload_test(
1413 ['--squash', custom_cl_base],
Edward Lemur0db01f02019-11-12 22:01:51 +00001414 'desc ✔\nBUG=\n\nChange-Id: 123456789',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001415 [],
1416 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001417 custom_cl_base=custom_cl_base,
Edward Lemur5a644f82020-03-18 16:44:57 +00001418 change_id='123456789')
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001419 self.assertIn(
1420 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1421 sys.stdout.getvalue())
1422
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001423 def test_gerrit_upload_squash_reupload(self):
Edward Lemur0db01f02019-11-12 22:01:51 +00001424 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001425 self._run_gerrit_upload_test(
1426 ['--squash'],
1427 description,
1428 [],
1429 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001430 issue=123456,
Edward Lemur5a644f82020-03-18 16:44:57 +00001431 change_id='123456789')
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001432
Edward Lemurd55c5072020-02-20 01:09:07 +00001433 @mock.patch('sys.stderr', StringIO())
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001434 def test_gerrit_upload_squash_reupload_to_abandoned(self):
Edward Lemur0db01f02019-11-12 22:01:51 +00001435 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001436 with self.assertRaises(SystemExitMock):
1437 self._run_gerrit_upload_test(
1438 ['--squash'],
1439 description,
1440 [],
1441 squash=True,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001442 issue=123456,
Edward Lemur1b52d872019-05-09 21:12:12 +00001443 fetched_status='ABANDONED',
1444 change_id='123456789')
Edward Lemurd55c5072020-02-20 01:09:07 +00001445 self.assertEqual(
1446 'Change https://chromium-review.googlesource.com/123456 has been '
1447 'abandoned, new uploads are not allowed\n',
1448 sys.stderr.getvalue())
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001449
Edward Lemurda4b6c62020-02-13 00:28:40 +00001450 @mock.patch(
1451 'gerrit_util.GetAccountDetails',
1452 return_value={'email': 'yet-another@example.com'})
1453 def test_gerrit_upload_squash_reupload_to_not_owned(self, _mock):
Edward Lemur0db01f02019-11-12 22:01:51 +00001454 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001455 self._run_gerrit_upload_test(
1456 ['--squash'],
1457 description,
1458 [],
1459 squash=True,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001460 issue=123456,
Edward Lemur1b52d872019-05-09 21:12:12 +00001461 other_cl_owner='other@example.com',
Edward Lemur5a644f82020-03-18 16:44:57 +00001462 change_id='123456789')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001463 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001464 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001465 'authenticate to Gerrit as yet-another@example.com.\n'
1466 'Uploading may fail due to lack of permissions',
Edward Lemurda4b6c62020-02-13 00:28:40 +00001467 sys.stdout.getvalue())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001468
Josipe827b0f2020-01-30 00:07:20 +00001469 def test_upload_change_description_editor(self):
1470 fetched_description = 'foo\n\nChange-Id: 123456789'
1471 description = 'bar\n\nChange-Id: 123456789'
1472 self._run_gerrit_upload_test(
1473 ['--squash', '--edit-description'],
1474 description,
1475 [],
1476 fetched_description=fetched_description,
1477 squash=True,
Josipe827b0f2020-01-30 00:07:20 +00001478 issue=123456,
1479 change_id='123456789',
Josipe827b0f2020-01-30 00:07:20 +00001480 edit_description=description)
1481
Edward Lemurda4b6c62020-02-13 00:28:40 +00001482 @mock.patch('git_cl.RunGit')
1483 @mock.patch('git_cl.CMDupload')
Edward Lemur1a83da12020-03-04 21:18:36 +00001484 @mock.patch('sys.stdin', StringIO('\n'))
1485 @mock.patch('sys.stdout', StringIO())
Edward Lemurda4b6c62020-02-13 00:28:40 +00001486 def test_upload_branch_deps(self, *_mocks):
rmistry@google.com2dd99862015-06-22 12:22:18 +00001487 def mock_run_git(*args, **_kwargs):
1488 if args[0] == ['for-each-ref',
1489 '--format=%(refname:short) %(upstream:short)',
1490 'refs/heads']:
1491 # Create a local branch dependency tree that looks like this:
1492 # test1 -> test2 -> test3 -> test4 -> test5
1493 # -> test3.1
1494 # test6 -> test0
1495 branch_deps = [
1496 'test2 test1', # test1 -> test2
1497 'test3 test2', # test2 -> test3
1498 'test3.1 test2', # test2 -> test3.1
1499 'test4 test3', # test3 -> test4
1500 'test5 test4', # test4 -> test5
1501 'test6 test0', # test0 -> test6
1502 'test7', # test7
1503 ]
1504 return '\n'.join(branch_deps)
Edward Lemurda4b6c62020-02-13 00:28:40 +00001505 git_cl.RunGit.side_effect = mock_run_git
1506 git_cl.CMDupload.return_value = 0
rmistry@google.com2dd99862015-06-22 12:22:18 +00001507
1508 class MockChangelist():
1509 def __init__(self):
1510 pass
1511 def GetBranch(self):
1512 return 'test1'
1513 def GetIssue(self):
1514 return '123'
1515 def GetPatchset(self):
1516 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001517 def IsGerrit(self):
1518 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001519
1520 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1521 # CMDupload should have been called 5 times because of 5 dependent branches.
Edward Lemurda4b6c62020-02-13 00:28:40 +00001522 self.assertEqual(5, len(git_cl.CMDupload.mock_calls))
Edward Lemur1a83da12020-03-04 21:18:36 +00001523 self.assertIn(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001524 'This command will checkout all dependent branches '
1525 'and run "git cl upload". Press Enter to continue, '
Edward Lemur1a83da12020-03-04 21:18:36 +00001526 'or Ctrl+C to abort',
1527 sys.stdout.getvalue())
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001528 self.assertEqual(0, ret)
rmistry@google.com2dd99862015-06-22 12:22:18 +00001529
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001530 def test_gerrit_change_id(self):
1531 self.calls = [
1532 ((['git', 'write-tree'], ),
1533 'hashtree'),
1534 ((['git', 'rev-parse', 'HEAD~0'], ),
1535 'branch-parent'),
1536 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1537 'A B <a@b.org> 1456848326 +0100'),
1538 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1539 'C D <c@d.org> 1456858326 +0100'),
1540 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1541 'hashchange'),
1542 ]
1543 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1544 self.assertEqual(change_id, 'Ihashchange')
1545
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001546 def test_desecription_append_footer(self):
1547 for init_desc, footer_line, expected_desc in [
1548 # Use unique desc first lines for easy test failure identification.
1549 ('foo', 'R=one', 'foo\n\nR=one'),
1550 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1551 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1552 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1553 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1554 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1555 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1556 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1557 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1558 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1559 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1560 ]:
1561 desc = git_cl.ChangeDescription(init_desc)
1562 desc.append_footer(footer_line)
1563 self.assertEqual(desc.description, expected_desc)
1564
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001565 def test_update_reviewers(self):
1566 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001567 ('foo', [], [],
1568 'foo'),
1569 ('foo\nR=xx', [], [],
1570 'foo\nR=xx'),
1571 ('foo\nTBR=xx', [], [],
1572 'foo\nTBR=xx'),
1573 ('foo', ['a@c'], [],
1574 'foo\n\nR=a@c'),
1575 ('foo\nR=xx', ['a@c'], [],
1576 'foo\n\nR=a@c, xx'),
1577 ('foo\nTBR=xx', ['a@c'], [],
1578 'foo\n\nR=a@c\nTBR=xx'),
1579 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1580 'foo\n\nR=a@c, yy\nTBR=xx'),
1581 ('foo\nBUG=', ['a@c'], [],
1582 'foo\nBUG=\nR=a@c'),
1583 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1584 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1585 ('foo', ['a@c', 'b@c'], [],
1586 'foo\n\nR=a@c, b@c'),
1587 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1588 'foo\nBar\n\nR=c@c\nBUG='),
1589 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1590 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001591 # Same as the line before, but full of whitespaces.
1592 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001593 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001594 'foo\nBar\n\nR=c@c\n BUG =',
1595 ),
1596 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001597 ('foo BUG=allo R=joe ', ['c@c'], [],
1598 'foo BUG=allo R=joe\n\nR=c@c'),
1599 # Redundant TBRs get promoted to Rs
1600 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1601 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001602 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001603 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001604 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001605 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001606 obj = git_cl.ChangeDescription(orig)
Edward Lemur2c62b332020-03-12 22:12:33 +00001607 obj.update_reviewers(reviewers, tbrs, None, None, None)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001608 actual.append(obj.description)
1609 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001610
Nodir Turakulov23b82142017-11-16 11:04:25 -08001611 def test_get_hash_tags(self):
1612 cases = [
1613 ('', []),
1614 ('a', []),
1615 ('[a]', ['a']),
1616 ('[aa]', ['aa']),
1617 ('[a ]', ['a']),
1618 ('[a- ]', ['a']),
1619 ('[a- b]', ['a-b']),
1620 ('[a--b]', ['a-b']),
1621 ('[a', []),
1622 ('[a]x', ['a']),
1623 ('[aa]x', ['aa']),
1624 ('[a b]', ['a-b']),
1625 ('[a b]', ['a-b']),
1626 ('[a__b]', ['a-b']),
1627 ('[a] x', ['a']),
1628 ('[a][b]', ['a', 'b']),
1629 ('[a] [b]', ['a', 'b']),
1630 ('[a][b]x', ['a', 'b']),
1631 ('[a][b] x', ['a', 'b']),
1632 ('[a]\n[b]', ['a']),
1633 ('[a\nb]', []),
1634 ('[a][', ['a']),
1635 ('Revert "[a] feature"', ['a']),
1636 ('Reland "[a] feature"', ['a']),
1637 ('Revert: [a] feature', ['a']),
1638 ('Reland: [a] feature', ['a']),
1639 ('Revert "Reland: [a] feature"', ['a']),
1640 ('Foo: feature', ['foo']),
1641 ('Foo Bar: feature', ['foo-bar']),
Anthony Polito02b5af32019-12-02 19:49:47 +00001642 ('Change Foo::Bar', []),
1643 ('Foo: Change Foo::Bar', ['foo']),
Nodir Turakulov23b82142017-11-16 11:04:25 -08001644 ('Revert "Foo bar: feature"', ['foo-bar']),
1645 ('Reland "Foo bar: feature"', ['foo-bar']),
1646 ]
1647 for desc, expected in cases:
1648 change_desc = git_cl.ChangeDescription(desc)
1649 actual = change_desc.get_hash_tags()
1650 self.assertEqual(
1651 actual,
1652 expected,
1653 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1654
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001655 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001656 self.assertEqual(None, git_cl.GetTargetRef(None,
1657 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001658 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001659
wittman@chromium.org455dc922015-01-26 20:15:50 +00001660 # Check default target refs for branches.
1661 self.assertEqual('refs/heads/master',
1662 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001663 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001664 self.assertEqual('refs/heads/master',
1665 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001666 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001667 self.assertEqual('refs/heads/master',
1668 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001669 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001670 self.assertEqual('refs/branch-heads/123',
1671 git_cl.GetTargetRef('origin',
1672 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001673 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001674 self.assertEqual('refs/diff/test',
1675 git_cl.GetTargetRef('origin',
1676 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001677 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001678 self.assertEqual('refs/heads/chrome/m42',
1679 git_cl.GetTargetRef('origin',
1680 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001681 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001682
1683 # Check target refs for user-specified target branch.
1684 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1685 'refs/remotes/branch-heads/123'):
1686 self.assertEqual('refs/branch-heads/123',
1687 git_cl.GetTargetRef('origin',
1688 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001689 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001690 for branch in ('origin/master', 'remotes/origin/master',
1691 'refs/remotes/origin/master'):
1692 self.assertEqual('refs/heads/master',
1693 git_cl.GetTargetRef('origin',
1694 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001695 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001696 for branch in ('master', 'heads/master', 'refs/heads/master'):
1697 self.assertEqual('refs/heads/master',
1698 git_cl.GetTargetRef('origin',
1699 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001700 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001701
Edward Lemurda4b6c62020-02-13 00:28:40 +00001702 @mock.patch('git_common.is_dirty_git_tree', return_value=True)
1703 def test_patch_when_dirty(self, *_mocks):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001704 # Patch when local tree is dirty.
wychen@chromium.orga872e752015-04-28 23:42:18 +00001705 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1706
Edward Lemur85153282020-02-14 22:06:29 +00001707 def assertIssueAndPatchset(
1708 self, branch='master', issue='123456', patchset='7',
1709 git_short_host='chromium'):
1710 self.assertEqual(
Edward Lemur26964072020-02-19 19:18:51 +00001711 issue, scm.GIT.GetBranchConfig('', branch, 'gerritissue'))
Edward Lemur85153282020-02-14 22:06:29 +00001712 self.assertEqual(
Edward Lemur26964072020-02-19 19:18:51 +00001713 patchset, scm.GIT.GetBranchConfig('', branch, 'gerritpatchset'))
Edward Lemur85153282020-02-14 22:06:29 +00001714 self.assertEqual(
1715 'https://%s-review.googlesource.com' % git_short_host,
Edward Lemur26964072020-02-19 19:18:51 +00001716 scm.GIT.GetBranchConfig('', branch, 'gerritserver'))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001717
Edward Lemur85153282020-02-14 22:06:29 +00001718 def _patch_common(self, git_short_host='chromium'):
Edward Lesmescba46082020-03-25 00:29:06 +00001719 mock.patch('git_cl.IsGitVersionAtLeast', return_value=True).start()
Edward Lemur26964072020-02-19 19:18:51 +00001720 self.mockGit.config['remote.origin.url'] = (
1721 'https://%s.googlesource.com/my/repo' % git_short_host)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001722 gerrit_util.GetChangeDetail.return_value = {
1723 'current_revision': '7777777777',
1724 'revisions': {
1725 '1111111111': {
1726 '_number': 1,
1727 'fetch': {'http': {
1728 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1729 'ref': 'refs/changes/56/123456/1',
1730 }},
1731 },
1732 '7777777777': {
1733 '_number': 7,
1734 'fetch': {'http': {
1735 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1736 'ref': 'refs/changes/56/123456/7',
1737 }},
1738 },
1739 },
1740 }
wychen@chromium.orga872e752015-04-28 23:42:18 +00001741
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001742 def test_patch_gerrit_default(self):
Edward Lemur85153282020-02-14 22:06:29 +00001743 self._patch_common()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001744 self.calls += [
1745 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1746 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001747 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Edward Lesmescba46082020-03-25 00:29:06 +00001748 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001749 ]
1750 self.assertEqual(git_cl.main(['patch', '123456']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001751 self.assertIssueAndPatchset()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001752
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001753 def test_patch_gerrit_new_branch(self):
Edward Lemur85153282020-02-14 22:06:29 +00001754 self._patch_common()
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001755 self.calls += [
1756 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1757 'refs/changes/56/123456/7'],), ''),
1758 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Edward Lesmescba46082020-03-25 00:29:06 +00001759 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001760 ]
Edward Lemur85153282020-02-14 22:06:29 +00001761 self.assertEqual(git_cl.main(['patch', '-b', 'feature', '123456']), 0)
1762 self.assertIssueAndPatchset(branch='feature')
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001763
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001764 def test_patch_gerrit_force(self):
Edward Lemur85153282020-02-14 22:06:29 +00001765 self._patch_common('host')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001766 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001767 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001768 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001769 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
Edward Lesmescba46082020-03-25 00:29:06 +00001770 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001771 ]
Edward Lemur52969c92020-02-06 18:15:28 +00001772 self.assertEqual(git_cl.main(['patch', '123456', '--force']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001773 self.assertIssueAndPatchset(git_short_host='host')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001774
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001775 def test_patch_gerrit_guess_by_url(self):
Edward Lemur85153282020-02-14 22:06:29 +00001776 self._patch_common('else')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001777 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001778 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001779 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001780 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Edward Lesmescba46082020-03-25 00:29:06 +00001781 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001782 ]
1783 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001784 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001785 self.assertIssueAndPatchset(patchset='1', git_short_host='else')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001786
Aaron Gable697a91b2018-01-19 15:20:15 -08001787 def test_patch_gerrit_guess_by_url_with_repo(self):
Edward Lemur85153282020-02-14 22:06:29 +00001788 self._patch_common('else')
Aaron Gable697a91b2018-01-19 15:20:15 -08001789 self.calls += [
1790 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1791 'refs/changes/56/123456/1'],), ''),
1792 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Edward Lesmescba46082020-03-25 00:29:06 +00001793 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
Aaron Gable697a91b2018-01-19 15:20:15 -08001794 ]
1795 self.assertEqual(git_cl.main(
1796 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1797 0)
Edward Lemur85153282020-02-14 22:06:29 +00001798 self.assertIssueAndPatchset(patchset='1', git_short_host='else')
Aaron Gable697a91b2018-01-19 15:20:15 -08001799
Edward Lemurd55c5072020-02-20 01:09:07 +00001800 @mock.patch('sys.stderr', StringIO())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001801 def test_patch_gerrit_conflict(self):
Edward Lemur85153282020-02-14 22:06:29 +00001802 self._patch_common()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001803 self.calls += [
1804 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001805 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001806 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001807 ]
1808 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001809 git_cl.main(['patch', '123456'])
Edward Lemurd55c5072020-02-20 01:09:07 +00001810 self.assertEqual(
1811 'Command "git cherry-pick FETCH_HEAD" failed.\n\n',
1812 sys.stderr.getvalue())
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001813
Edward Lemurda4b6c62020-02-13 00:28:40 +00001814 @mock.patch(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001815 'gerrit_util.GetChangeDetail',
Edward Lemurda4b6c62020-02-13 00:28:40 +00001816 side_effect=gerrit_util.GerritError(404, ''))
Edward Lemurd55c5072020-02-20 01:09:07 +00001817 @mock.patch('sys.stderr', StringIO())
Edward Lemurda4b6c62020-02-13 00:28:40 +00001818 def test_patch_gerrit_not_exists(self, *_mocks):
Edward Lemur26964072020-02-19 19:18:51 +00001819 self.mockGit.config['remote.origin.url'] = (
1820 'https://chromium.googlesource.com/my/repo')
tandriic2405f52016-10-10 08:13:15 -07001821 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001822 self.assertEqual(1, git_cl.main(['patch', '123456']))
Edward Lemurd55c5072020-02-20 01:09:07 +00001823 self.assertEqual(
1824 'change 123456 at https://chromium-review.googlesource.com does not '
1825 'exist or you have no access to it\n',
1826 sys.stderr.getvalue())
tandriic2405f52016-10-10 08:13:15 -07001827
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001828 def _checkout_calls(self):
1829 return [
1830 ((['git', 'config', '--local', '--get-regexp',
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001831 'branch\\..*\\.gerritissue'], ),
1832 ('branch.ger-branch.gerritissue 123456\n'
1833 'branch.gbranch654.gerritissue 654321\n')),
1834 ]
1835
1836 def test_checkout_gerrit(self):
1837 """Tests git cl checkout <issue>."""
1838 self.calls = self._checkout_calls()
1839 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1840 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1841
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001842 def test_checkout_not_found(self):
1843 """Tests git cl checkout <issue>."""
1844 self.calls = self._checkout_calls()
1845 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1846
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001847 def test_checkout_no_branch_issues(self):
1848 """Tests git cl checkout <issue>."""
1849 self.calls = [
1850 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001851 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001852 ]
1853 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1854
Edward Lemur26964072020-02-19 19:18:51 +00001855 def _test_gerrit_ensure_authenticated_common(self, auth):
Edward Lemur1a83da12020-03-04 21:18:36 +00001856 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00001857 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00001858 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00001859 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
1860 CookiesAuthenticatorMockFactory(hosts_with_creds=auth)).start()
Edward Lemur26964072020-02-19 19:18:51 +00001861 self.mockGit.config['remote.origin.url'] = (
1862 'https://chromium.googlesource.com/my/repo')
Edward Lemurf38bc172019-09-03 21:02:13 +00001863 cl = git_cl.Changelist()
tandrii@chromium.org28253532016-04-14 13:46:56 +00001864 cl.branch = 'master'
1865 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001866 return cl
1867
Edward Lemurd55c5072020-02-20 01:09:07 +00001868 @mock.patch('sys.stderr', StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001869 def test_gerrit_ensure_authenticated_missing(self):
1870 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001871 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001872 })
Edward Lemurd55c5072020-02-20 01:09:07 +00001873 with self.assertRaises(SystemExitMock):
1874 cl.EnsureAuthenticated(force=False)
1875 self.assertEqual(
1876 'Credentials for the following hosts are required:\n'
1877 ' chromium-review.googlesource.com\n'
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001878 'These are read from ~%(sep)s.gitcookies '
1879 '(or legacy ~%(sep)s%(netrc)s)\n'
Edward Lemurd55c5072020-02-20 01:09:07 +00001880 'You can (re)generate your credentials by visiting '
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001881 'https://chromium-review.googlesource.com/new-password\n' % {
1882 'sep': os.sep,
1883 'netrc': NETRC_FILENAME,
1884 }, sys.stderr.getvalue())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001885
1886 def test_gerrit_ensure_authenticated_conflict(self):
1887 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001888 'chromium.googlesource.com':
1889 ('git-one.example.com', None, 'secret1'),
1890 'chromium-review.googlesource.com':
1891 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001892 })
1893 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001894 (('ask_for_data', 'If you know what you are doing '
1895 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001896 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1897
1898 def test_gerrit_ensure_authenticated_ok(self):
1899 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001900 'chromium.googlesource.com':
1901 ('git-same.example.com', None, 'secret'),
1902 'chromium-review.googlesource.com':
1903 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001904 })
1905 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1906
tandrii@chromium.org28253532016-04-14 13:46:56 +00001907 def test_gerrit_ensure_authenticated_skipped(self):
Edward Lemur26964072020-02-19 19:18:51 +00001908 self.mockGit.config['gerrit.skip-ensure-authenticated'] = 'true'
1909 cl = self._test_gerrit_ensure_authenticated_common(auth={})
tandrii@chromium.org28253532016-04-14 13:46:56 +00001910 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1911
Eric Boren2fb63102018-10-05 13:05:03 +00001912 def test_gerrit_ensure_authenticated_bearer_token(self):
1913 cl = self._test_gerrit_ensure_authenticated_common(auth={
1914 'chromium.googlesource.com':
1915 ('', None, 'secret'),
1916 'chromium-review.googlesource.com':
1917 ('', None, 'secret'),
1918 })
1919 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1920 header = gerrit_util.CookiesAuthenticator().get_auth_header(
1921 'chromium.googlesource.com')
1922 self.assertTrue('Bearer' in header)
1923
Daniel Chengcf6269b2019-05-18 01:02:12 +00001924 def test_gerrit_ensure_authenticated_non_https(self):
Edward Lemur26964072020-02-19 19:18:51 +00001925 self.mockGit.config['remote.origin.url'] = 'custom-scheme://repo'
Daniel Chengcf6269b2019-05-18 01:02:12 +00001926 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00001927 (('logging.warning',
1928 'Ignoring branch %(branch)s with non-https remote '
1929 '%(remote)s', {
1930 'branch': 'master',
1931 'remote': 'custom-scheme://repo'}
1932 ), None),
Daniel Chengcf6269b2019-05-18 01:02:12 +00001933 ]
Edward Lemurda4b6c62020-02-13 00:28:40 +00001934 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
1935 CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
1936 mock.patch('logging.warning',
1937 lambda *a: self._mocked_call('logging.warning', *a)).start()
Edward Lemurf38bc172019-09-03 21:02:13 +00001938 cl = git_cl.Changelist()
Daniel Chengcf6269b2019-05-18 01:02:12 +00001939 cl.branch = 'master'
1940 cl.branchref = 'refs/heads/master'
1941 cl.lookedup_issue = True
1942 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1943
Florian Mayerae510e82020-01-30 21:04:48 +00001944 def test_gerrit_ensure_authenticated_non_url(self):
Edward Lemur26964072020-02-19 19:18:51 +00001945 self.mockGit.config['remote.origin.url'] = (
1946 'git@somehost.example:foo/bar.git')
Florian Mayerae510e82020-01-30 21:04:48 +00001947 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00001948 (('logging.error',
1949 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1950 'but it doesn\'t exist.', {
1951 'remote': 'origin',
1952 'branch': 'master',
1953 'url': 'git@somehost.example:foo/bar.git'}
1954 ), None),
Florian Mayerae510e82020-01-30 21:04:48 +00001955 ]
Edward Lemurda4b6c62020-02-13 00:28:40 +00001956 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
1957 CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
1958 mock.patch('logging.error',
1959 lambda *a: self._mocked_call('logging.error', *a)).start()
Florian Mayerae510e82020-01-30 21:04:48 +00001960 cl = git_cl.Changelist()
1961 cl.branch = 'master'
1962 cl.branchref = 'refs/heads/master'
1963 cl.lookedup_issue = True
1964 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1965
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001966 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
Edward Lemur85153282020-02-14 22:06:29 +00001967 self.mockGit.config['branch.master.gerritissue'] = '123'
1968 self.mockGit.config['branch.master.gerritserver'] = (
1969 'https://chromium-review.googlesource.com')
Edward Lemur26964072020-02-19 19:18:51 +00001970 self.mockGit.config['remote.origin.url'] = (
1971 'https://chromium.googlesource.com/infra/infra')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001972 self.calls = [
Edward Lemurda4b6c62020-02-13 00:28:40 +00001973 (('SetReview', 'chromium-review.googlesource.com',
1974 'infra%2Finfra~123', None,
1975 {'Commit-Queue': vote}, notify, None), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001976 ]
tandriid9e5ce52016-07-13 02:32:59 -07001977
1978 def test_cmd_set_commit_gerrit_clear(self):
1979 self._cmd_set_commit_gerrit_common(0)
1980 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1981
1982 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07001983 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001984 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1985
tandriid9e5ce52016-07-13 02:32:59 -07001986 def test_cmd_set_commit_gerrit(self):
1987 self._cmd_set_commit_gerrit_common(2)
1988 self.assertEqual(0, git_cl.main(['set-commit']))
1989
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001990 def test_description_display(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001991 mock.patch('git_cl.Changelist', ChangelistMock).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001992 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001993
1994 self.assertEqual(0, git_cl.main(['description', '-d']))
Edward Lemurda4b6c62020-02-13 00:28:40 +00001995 self.assertEqual('foo\n', sys.stdout.getvalue())
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001996
Edward Lemurda4b6c62020-02-13 00:28:40 +00001997 @mock.patch('sys.stderr', StringIO())
iannucci3c972b92016-08-17 13:24:10 -07001998 def test_StatusFieldOverrideIssueMissingArgs(self):
iannucci3c972b92016-08-17 13:24:10 -07001999 try:
2000 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
Edward Lemurd55c5072020-02-20 01:09:07 +00002001 except SystemExitMock:
Edward Lemur6c6827c2020-02-06 21:15:18 +00002002 self.assertIn(
Edward Lemurda4b6c62020-02-13 00:28:40 +00002003 '--field must be given when --issue is set.', sys.stderr.getvalue())
iannucci3c972b92016-08-17 13:24:10 -07002004
2005 def test_StatusFieldOverrideIssue(self):
iannucci3c972b92016-08-17 13:24:10 -07002006 def assertIssue(cl_self, *_args):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002007 self.assertEqual(cl_self.issue, 1)
iannucci3c972b92016-08-17 13:24:10 -07002008 return 'foobar'
2009
Edward Lemurda4b6c62020-02-13 00:28:40 +00002010 mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
iannuccie53c9352016-08-17 14:40:40 -07002011 self.assertEqual(
Edward Lemur52969c92020-02-06 18:15:28 +00002012 git_cl.main(['status', '--issue', '1', '--field', 'desc']),
iannuccie53c9352016-08-17 14:40:40 -07002013 0)
Edward Lemurda4b6c62020-02-13 00:28:40 +00002014 self.assertEqual(sys.stdout.getvalue(), 'foobar\n')
iannucci3c972b92016-08-17 13:24:10 -07002015
iannuccie53c9352016-08-17 14:40:40 -07002016 def test_SetCloseOverrideIssue(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002017
iannuccie53c9352016-08-17 14:40:40 -07002018 def assertIssue(cl_self, *_args):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002019 self.assertEqual(cl_self.issue, 1)
iannuccie53c9352016-08-17 14:40:40 -07002020 return 'foobar'
2021
Edward Lemurda4b6c62020-02-13 00:28:40 +00002022 mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
2023 mock.patch('git_cl.Changelist.CloseIssue', lambda *_: None).start()
iannuccie53c9352016-08-17 14:40:40 -07002024 self.assertEqual(
Edward Lemur52969c92020-02-06 18:15:28 +00002025 git_cl.main(['set-close', '--issue', '1']), 0)
iannuccie53c9352016-08-17 14:40:40 -07002026
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00002027 def test_description(self):
Edward Lemur26964072020-02-19 19:18:51 +00002028 self.mockGit.config['remote.origin.url'] = (
2029 'https://chromium.googlesource.com/my/repo')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002030 gerrit_util.GetChangeDetail.return_value = {
2031 'current_revision': 'sha1',
2032 'revisions': {'sha1': {
2033 'commit': {'message': 'foobar'},
2034 }},
2035 }
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002036 self.assertEqual(0, git_cl.main([
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00002037 'description',
2038 'https://chromium-review.googlesource.com/c/my/repo/+/123123',
2039 '-d']))
Edward Lemurda4b6c62020-02-13 00:28:40 +00002040 self.assertEqual('foobar\n', sys.stdout.getvalue())
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002041
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002042 def test_description_set_raw(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002043 mock.patch('git_cl.Changelist', ChangelistMock).start()
2044 mock.patch('git_cl.sys.stdin', StringIO('hihi')).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002045
2046 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2047 self.assertEqual('hihi', ChangelistMock.desc)
2048
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002049 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002050 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002051
2052 def RunEditor(desc, _, **kwargs):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002053 self.assertEqual(
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002054 '# Enter a description of the change.\n'
2055 '# This will be displayed on the codereview site.\n'
2056 '# The first line will also be used as the subject of the review.\n'
2057 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002058 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002059 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002060 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002061 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002062 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002063
Edward Lemur6c6827c2020-02-06 21:15:18 +00002064 def UpdateDescription(_, desc, force=False):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002065 self.assertEqual(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002066
Edward Lemurda4b6c62020-02-13 00:28:40 +00002067 mock.patch('git_cl.Changelist.FetchDescription',
2068 lambda *args: current_desc).start()
2069 mock.patch('git_cl.Changelist.UpdateDescription',
2070 UpdateDescription).start()
2071 mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002072
Edward Lemur85153282020-02-14 22:06:29 +00002073 self.mockGit.config['branch.master.gerritissue'] = '123'
Edward Lemur52969c92020-02-06 18:15:28 +00002074 self.assertEqual(0, git_cl.main(['description']))
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002075
Dan Beamd8b04ca2019-10-10 21:23:26 +00002076 def test_description_does_not_append_bug_line_if_fixed_is_present(self):
2077 current_desc = 'Some.\n\nFixed: 123\nChange-Id: xxx'
2078
2079 def RunEditor(desc, _, **kwargs):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002080 self.assertEqual(
Dan Beamd8b04ca2019-10-10 21:23:26 +00002081 '# Enter a description of the change.\n'
2082 '# This will be displayed on the codereview site.\n'
2083 '# The first line will also be used as the subject of the review.\n'
2084 '#--------------------This line is 72 characters long'
2085 '--------------------\n'
2086 'Some.\n\nFixed: 123\nChange-Id: xxx',
2087 desc)
2088 return desc
2089
Edward Lemurda4b6c62020-02-13 00:28:40 +00002090 mock.patch('git_cl.Changelist.FetchDescription',
2091 lambda *args: current_desc).start()
2092 mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002093
Edward Lemur85153282020-02-14 22:06:29 +00002094 self.mockGit.config['branch.master.gerritissue'] = '123'
Edward Lemur52969c92020-02-06 18:15:28 +00002095 self.assertEqual(0, git_cl.main(['description']))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002096
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002097 def test_description_set_stdin(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002098 mock.patch('git_cl.Changelist', ChangelistMock).start()
2099 mock.patch('git_cl.sys.stdin', StringIO('hi \r\n\t there\n\nman')).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002100
2101 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2102 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2103
kmarshall3bff56b2016-06-06 18:31:47 -07002104 def test_archive(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002105 self.calls = [
2106 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
Edward Lemurf38bc172019-09-03 21:02:13 +00002107 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002108 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002109 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
Edward Lemurf38bc172019-09-03 21:02:13 +00002110 ((['git', 'branch', '-D', 'foo'],), '')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002111 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002112
Edward Lemurda4b6c62020-02-13 00:28:40 +00002113 mock.patch('git_cl.get_cl_statuses',
kmarshall3bff56b2016-06-06 18:31:47 -07002114 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002115 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2116 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002117 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall3bff56b2016-06-06 18:31:47 -07002118
2119 self.assertEqual(0, git_cl.main(['archive', '-f']))
2120
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002121 def test_archive_tag_collision(self):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002122 self.calls = [
2123 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2124 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2125 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],),
2126 'refs/tags/git-cl-archived-456-foo'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002127 ((['git', 'tag', 'git-cl-archived-456-foo-2', 'foo'],), ''),
2128 ((['git', 'branch', '-D', 'foo'],), '')
2129 ]
2130
Edward Lemurda4b6c62020-02-13 00:28:40 +00002131 mock.patch('git_cl.get_cl_statuses',
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002132 lambda branches, fine_grained, max_processes:
2133 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2134 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002135 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002136
2137 self.assertEqual(0, git_cl.main(['archive', '-f']))
2138
kmarshall3bff56b2016-06-06 18:31:47 -07002139 def test_archive_current_branch_fails(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002140 self.calls = [
2141 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2142 'refs/heads/master'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002143 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002144 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002145
Edward Lemurda4b6c62020-02-13 00:28:40 +00002146 mock.patch('git_cl.get_cl_statuses',
kmarshall9249e012016-08-23 12:02:16 -07002147 lambda branches, fine_grained, max_processes:
Edward Lemurda4b6c62020-02-13 00:28:40 +00002148 [(MockChangelistWithBranchAndIssue('master', 1),
2149 'closed')]).start()
kmarshall9249e012016-08-23 12:02:16 -07002150
2151 self.assertEqual(1, git_cl.main(['archive', '-f']))
2152
2153 def test_archive_dry_run(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002154 self.calls = [
2155 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2156 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002157 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002158 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002159
Edward Lemurda4b6c62020-02-13 00:28:40 +00002160 mock.patch('git_cl.get_cl_statuses',
kmarshall3bff56b2016-06-06 18:31:47 -07002161 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002162 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2163 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002164 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall3bff56b2016-06-06 18:31:47 -07002165
kmarshall9249e012016-08-23 12:02:16 -07002166 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2167
2168 def test_archive_no_tags(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002169 self.calls = [
2170 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2171 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002172 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002173 ((['git', 'branch', '-D', 'foo'],), '')
2174 ]
kmarshall9249e012016-08-23 12:02:16 -07002175
Edward Lemurda4b6c62020-02-13 00:28:40 +00002176 mock.patch('git_cl.get_cl_statuses',
kmarshall9249e012016-08-23 12:02:16 -07002177 lambda branches, fine_grained, max_processes:
2178 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2179 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002180 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall9249e012016-08-23 12:02:16 -07002181
2182 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002183
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002184 def test_archive_tag_cleanup_on_branch_deletion_error(self):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002185 self.calls = [
2186 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2187 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2188 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002189 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],),
2190 'refs/tags/git-cl-archived-456-foo'),
2191 ((['git', 'branch', '-D', 'foo'],), CERR1),
2192 ((['git', 'tag', '-d', 'git-cl-archived-456-foo'],),
2193 'refs/tags/git-cl-archived-456-foo'),
2194 ]
2195
Edward Lemurda4b6c62020-02-13 00:28:40 +00002196 mock.patch('git_cl.get_cl_statuses',
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002197 lambda branches, fine_grained, max_processes:
2198 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2199 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002200 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002201
2202 self.assertEqual(0, git_cl.main(['archive', '-f']))
2203
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00002204 def test_archive_with_format(self):
2205 self.calls = [
2206 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'], ),
2207 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2208 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'], ), ''),
2209 ((['git', 'tag', 'archived/12-foo', 'foo'], ), ''),
2210 ((['git', 'branch', '-D', 'foo'], ), ''),
2211 ]
2212
2213 mock.patch('git_cl.get_cl_statuses',
2214 lambda branches, fine_grained, max_processes:
2215 [(MockChangelistWithBranchAndIssue('foo', 12), 'closed')]).start()
2216
2217 self.assertEqual(
2218 0, git_cl.main(['archive', '-f', '-p', 'archived/{issue}-{branch}']))
2219
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002220 def test_cmd_issue_erase_existing(self):
Edward Lemur85153282020-02-14 22:06:29 +00002221 self.mockGit.config['branch.master.gerritissue'] = '123'
2222 self.mockGit.config['branch.master.gerritserver'] = (
2223 'https://chromium-review.googlesource.com')
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002224 self.calls = [
Aaron Gableca01e2c2017-07-19 11:16:02 -07002225 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002226 ]
2227 self.assertEqual(0, git_cl.main(['issue', '0']))
Edward Lemur85153282020-02-14 22:06:29 +00002228 self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
2229 self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002230
Aaron Gable400e9892017-07-12 15:31:21 -07002231 def test_cmd_issue_erase_existing_with_change_id(self):
Edward Lemur85153282020-02-14 22:06:29 +00002232 self.mockGit.config['branch.master.gerritissue'] = '123'
2233 self.mockGit.config['branch.master.gerritserver'] = (
2234 'https://chromium-review.googlesource.com')
Edward Lemurda4b6c62020-02-13 00:28:40 +00002235 mock.patch('git_cl.Changelist.FetchDescription',
2236 lambda _: 'This is a description\n\nChange-Id: Ideadbeef').start()
Aaron Gable400e9892017-07-12 15:31:21 -07002237 self.calls = [
Aaron Gableca01e2c2017-07-19 11:16:02 -07002238 ((['git', 'log', '-1', '--format=%B'],),
2239 'This is a description\n\nChange-Id: Ideadbeef'),
2240 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002241 ]
2242 self.assertEqual(0, git_cl.main(['issue', '0']))
Edward Lemur85153282020-02-14 22:06:29 +00002243 self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
2244 self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
Aaron Gable400e9892017-07-12 15:31:21 -07002245
phajdan.jre328cf92016-08-22 04:12:17 -07002246 def test_cmd_issue_json(self):
Edward Lemur85153282020-02-14 22:06:29 +00002247 self.mockGit.config['branch.master.gerritissue'] = '123'
2248 self.mockGit.config['branch.master.gerritserver'] = (
2249 'https://chromium-review.googlesource.com')
phajdan.jre328cf92016-08-22 04:12:17 -07002250 self.calls = [
phajdan.jre328cf92016-08-22 04:12:17 -07002251 (('write_json', 'output.json',
Andrii Shyshkalova185e2e2018-11-21 00:42:55 +00002252 {'issue': 123,
2253 'issue_url': 'https://chromium-review.googlesource.com/123'}),
phajdan.jre328cf92016-08-22 04:12:17 -07002254 ''),
2255 ]
2256 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2257
tandrii16e0b4e2016-06-07 10:34:28 -07002258 def _common_GerritCommitMsgHookCheck(self):
Edward Lemur15a9b8c2020-02-13 00:52:30 +00002259 mock.patch(
2260 'git_cl.os.path.abspath',
2261 lambda path: self._mocked_call(['abspath', path])).start()
2262 mock.patch(
2263 'git_cl.os.path.exists',
2264 lambda path: self._mocked_call(['exists', path])).start()
2265 mock.patch(
2266 'git_cl.gclient_utils.FileRead',
2267 lambda path: self._mocked_call(['FileRead', path])).start()
2268 mock.patch(
2269 'git_cl.gclient_utils.rm_file_or_tree',
2270 lambda path: self._mocked_call(['rm_file_or_tree', path])).start()
Edward Lemur1a83da12020-03-04 21:18:36 +00002271 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00002272 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00002273 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurf38bc172019-09-03 21:02:13 +00002274 return git_cl.Changelist(issue=123)
tandrii16e0b4e2016-06-07 10:34:28 -07002275
2276 def test_GerritCommitMsgHookCheck_custom_hook(self):
2277 cl = self._common_GerritCommitMsgHookCheck()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002278 self.calls += [((['exists',
2279 os.path.join('.git', 'hooks', 'commit-msg')], ), True),
2280 ((['FileRead',
2281 os.path.join('.git', 'hooks', 'commit-msg')], ),
2282 '#!/bin/sh\necho "custom hook"')]
Edward Lemur125d60a2019-09-13 18:25:41 +00002283 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002284
2285 def test_GerritCommitMsgHookCheck_not_exists(self):
2286 cl = self._common_GerritCommitMsgHookCheck()
2287 self.calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002288 ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), False),
tandrii16e0b4e2016-06-07 10:34:28 -07002289 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002290 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002291
2292 def test_GerritCommitMsgHookCheck(self):
2293 cl = self._common_GerritCommitMsgHookCheck()
2294 self.calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002295 ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), True),
2296 ((['FileRead', os.path.join('.git', 'hooks', 'commit-msg')], ),
tandrii16e0b4e2016-06-07 10:34:28 -07002297 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002298 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002299 ((['rm_file_or_tree',
2300 os.path.join('.git', 'hooks', 'commit-msg')], ), ''),
tandrii16e0b4e2016-06-07 10:34:28 -07002301 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002302 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002303
tandriic4344b52016-08-29 06:04:54 -07002304 def test_GerritCmdLand(self):
Edward Lemur85153282020-02-14 22:06:29 +00002305 self.mockGit.config['branch.master.gerritsquashhash'] = 'deadbeaf'
2306 self.mockGit.config['branch.master.gerritserver'] = (
2307 'chromium-review.googlesource.com')
tandriic4344b52016-08-29 06:04:54 -07002308 self.calls += [
tandriic4344b52016-08-29 06:04:54 -07002309 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
tandriic4344b52016-08-29 06:04:54 -07002310 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002311 cl = git_cl.Changelist(issue=123)
Edward Lemur125d60a2019-09-13 18:25:41 +00002312 cl._GetChangeDetail = lambda *args, **kwargs: {
tandriic4344b52016-08-29 06:04:54 -07002313 'labels': {},
2314 'current_revision': 'deadbeaf',
2315 }
Edward Lemur125d60a2019-09-13 18:25:41 +00002316 cl._GetChangeCommit = lambda: {
agable32978d92016-11-01 12:55:02 -07002317 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002318 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002319 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2320 }
Edward Lemur125d60a2019-09-13 18:25:41 +00002321 cl.SubmitIssue = lambda wait_for_merge: None
Olivier Robin75ee7252018-04-13 10:02:56 +02002322 self.assertEqual(0, cl.CMDLand(force=True,
2323 bypass_hooks=True,
2324 verbose=True,
2325 parallel=False))
Edward Lemur73c76702020-02-06 23:57:18 +00002326 self.assertIn(
2327 'Issue chromium-review.googlesource.com/123 has been submitted',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002328 sys.stdout.getvalue())
Edward Lemur73c76702020-02-06 23:57:18 +00002329 self.assertIn(
2330 'Landed as: https://git.googlesource.com/test/+/deadbeef',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002331 sys.stdout.getvalue())
tandriic4344b52016-08-29 06:04:54 -07002332
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002333 def _mock_gerrit_changes_for_detail_cache(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002334 mock.patch('git_cl.Changelist._GetGerritHost', lambda _: 'host').start()
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002335
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002336 def test_gerrit_change_detail_cache_simple(self):
2337 self._mock_gerrit_changes_for_detail_cache()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002338 gerrit_util.GetChangeDetail.side_effect = ['a', 'b']
Edward Lemurf38bc172019-09-03 21:02:13 +00002339 cl1 = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002340 cl1._cached_remote_url = (
2341 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemurf38bc172019-09-03 21:02:13 +00002342 cl2 = git_cl.Changelist(issue=2)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002343 cl2._cached_remote_url = (
2344 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002345 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
2346 self.assertEqual(cl1._GetChangeDetail(), 'a')
2347 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002348
2349 def test_gerrit_change_detail_cache_options(self):
2350 self._mock_gerrit_changes_for_detail_cache()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002351 gerrit_util.GetChangeDetail.side_effect = ['cab', 'ad']
Edward Lemurf38bc172019-09-03 21:02:13 +00002352 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002353 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002354 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2355 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2356 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2357 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2358 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2359 self.assertEqual(cl._GetChangeDetail(), 'cab')
2360
2361 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2362 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2363 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2364 self.assertEqual(cl._GetChangeDetail(), 'cab')
2365
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002366 def test_gerrit_description_caching(self):
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002367 gerrit_util.GetChangeDetail.return_value = {
2368 'current_revision': 'rev1',
2369 'revisions': {
2370 'rev1': {'commit': {'message': 'desc1'}},
2371 },
2372 }
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002373
2374 self._mock_gerrit_changes_for_detail_cache()
Edward Lemurf38bc172019-09-03 21:02:13 +00002375 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002376 cl._cached_remote_url = (
2377 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemur6c6827c2020-02-06 21:15:18 +00002378 self.assertEqual(cl.FetchDescription(), 'desc1')
2379 self.assertEqual(cl.FetchDescription(), 'desc1') # cache hit.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002380
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002381 def test_print_current_creds(self):
2382 class CookiesAuthenticatorMock(object):
2383 def __init__(self):
2384 self.gitcookies = {
2385 'host.googlesource.com': ('user', 'pass'),
2386 'host-review.googlesource.com': ('user', 'pass'),
2387 }
2388 self.netrc = self
2389 self.netrc.hosts = {
2390 'github.com': ('user2', None, 'pass2'),
2391 'host2.googlesource.com': ('user3', None, 'pass'),
2392 }
Edward Lemurda4b6c62020-02-13 00:28:40 +00002393 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2394 CookiesAuthenticatorMock).start()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002395 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
2396 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2397 ' Host\t User\t Which file',
2398 '============================\t=====\t===========',
2399 'host-review.googlesource.com\t user\t.gitcookies',
2400 ' host.googlesource.com\t user\t.gitcookies',
2401 ' host2.googlesource.com\tuser3\t .netrc',
2402 ])
Edward Lemur79d4f992019-11-11 23:49:02 +00002403 sys.stdout.seek(0)
2404 sys.stdout.truncate(0)
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002405 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
2406 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2407 ' Host\tUser\t Which file',
2408 '============================\t====\t===========',
2409 'host-review.googlesource.com\tuser\t.gitcookies',
2410 ' host.googlesource.com\tuser\t.gitcookies',
2411 ])
2412
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002413 def _common_creds_check_mocks(self):
2414 def exists_mock(path):
2415 dirname = os.path.dirname(path)
2416 if dirname == os.path.expanduser('~'):
2417 dirname = '~'
2418 base = os.path.basename(path)
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002419 if base in (NETRC_FILENAME, '.gitcookies'):
2420 return self._mocked_call('os.path.exists', os.path.join(dirname, base))
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002421 # git cl also checks for existence other files not relevant to this test.
2422 return None
Edward Lemur1a83da12020-03-04 21:18:36 +00002423 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00002424 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00002425 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002426 mock.patch('os.path.exists', exists_mock).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002427
2428 def test_creds_check_gitcookies_not_configured(self):
2429 self._common_creds_check_mocks()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002430 mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
2431 lambda _, include_netrc=False: []).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002432 self.calls = [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002433 ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
2434 ((['git', 'config', '--global', 'http.cookiefile'], ), CERR1),
2435 (('os.path.exists', os.path.join('~', NETRC_FILENAME)), True),
2436 (('ask_for_data', 'Press Enter to setup .gitcookies, '
2437 'or Ctrl+C to abort'), ''),
2438 (([
2439 'git', 'config', '--global', 'http.cookiefile',
2440 os.path.expanduser(os.path.join('~', '.gitcookies'))
2441 ], ), ''),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002442 ]
2443 self.assertEqual(0, git_cl.main(['creds-check']))
Edward Lemur73c76702020-02-06 23:57:18 +00002444 self.assertTrue(
2445 sys.stdout.getvalue().startswith(
2446 'You seem to be using outdated .netrc for git credentials:'))
2447 self.assertIn(
2448 '\nConfigured git to use .gitcookies from',
2449 sys.stdout.getvalue())
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002450
2451 def test_creds_check_gitcookies_configured_custom_broken(self):
2452 self._common_creds_check_mocks()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002453 mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
2454 lambda _, include_netrc=False: []).start()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002455 custom_cookie_path = ('C:\\.gitcookies'
2456 if sys.platform == 'win32' else '/custom/.gitcookies')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002457 self.calls = [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002458 ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
2459 ((['git', 'config', '--global', 'http.cookiefile'], ),
2460 custom_cookie_path),
2461 (('os.path.exists', custom_cookie_path), False),
2462 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
2463 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
2464 (([
2465 'git', 'config', '--global', 'http.cookiefile',
2466 os.path.expanduser(os.path.join('~', '.gitcookies'))
2467 ], ), ''),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002468 ]
2469 self.assertEqual(0, git_cl.main(['creds-check']))
Edward Lemur73c76702020-02-06 23:57:18 +00002470 self.assertIn(
2471 'WARNING: You have configured custom path to .gitcookies: ',
2472 sys.stdout.getvalue())
2473 self.assertIn(
2474 'However, your configured .gitcookies file is missing.',
2475 sys.stdout.getvalue())
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002476
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002477 def test_git_cl_comment_add_gerrit(self):
Edward Lemur85153282020-02-14 22:06:29 +00002478 self.mockGit.branchref = None
Edward Lemur26964072020-02-19 19:18:51 +00002479 self.mockGit.config['remote.origin.url'] = (
2480 'https://chromium.googlesource.com/infra/infra')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002481 self.calls = [
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002482 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002483 'msg', None, None, None),
Aaron Gable636b13f2017-07-14 10:42:48 -07002484 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002485 ]
Edward Lemur52969c92020-02-06 18:15:28 +00002486 self.assertEqual(0, git_cl.main(['comment', '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002487
Edward Lemurda4b6c62020-02-13 00:28:40 +00002488 @mock.patch('git_cl.Changelist.GetBranch', return_value='foo')
2489 def test_git_cl_comments_fetch_gerrit(self, *_mocks):
Edward Lemur26964072020-02-19 19:18:51 +00002490 self.mockGit.config['remote.origin.url'] = (
2491 'https://chromium.googlesource.com/infra/infra')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002492 gerrit_util.GetChangeDetail.return_value = {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002493 'owner': {'email': 'owner@example.com'},
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002494 'current_revision': 'ba5eba11',
2495 'revisions': {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002496 'deadbeaf': {
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002497 '_number': 1,
2498 },
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002499 'ba5eba11': {
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002500 '_number': 2,
2501 },
2502 },
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002503 'messages': [
2504 {
2505 u'_revision_number': 1,
2506 u'author': {
2507 u'_account_id': 1111084,
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002508 u'email': u'could-be-anything@example.com',
2509 u'name': u'LUCI CQ'
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002510 },
2511 u'date': u'2017-03-15 20:08:45.000000000',
2512 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07002513 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002514 u'tag': u'autogenerated:cq:dry-run'
2515 },
2516 {
2517 u'_revision_number': 2,
2518 u'author': {
2519 u'_account_id': 11151243,
2520 u'email': u'owner@example.com',
2521 u'name': u'owner'
2522 },
2523 u'date': u'2017-03-16 20:00:41.000000000',
2524 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2525 u'message': u'PTAL',
2526 },
2527 {
2528 u'_revision_number': 2,
2529 u'author': {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002530 u'_account_id': 148512,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002531 u'email': u'reviewer@example.com',
2532 u'name': u'reviewer'
2533 },
2534 u'date': u'2017-03-17 05:19:37.500000000',
2535 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2536 u'message': u'Patch Set 2: Code-Review+1',
2537 },
2538 ]
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002539 }
2540 self.calls = [
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002541 (('GetChangeComments', 'chromium-review.googlesource.com',
2542 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002543 '/COMMIT_MSG': [
2544 {
2545 'author': {'email': u'reviewer@example.com'},
2546 'updated': u'2017-03-17 05:19:37.500000000',
2547 'patch_set': 2,
2548 'side': 'REVISION',
2549 'message': 'Please include a bug link',
2550 },
2551 ],
2552 'codereview.settings': [
2553 {
2554 'author': {'email': u'owner@example.com'},
2555 'updated': u'2017-03-16 20:00:41.000000000',
2556 'patch_set': 2,
2557 'side': 'PARENT',
2558 'line': 42,
2559 'message': 'I removed this because it is bad',
2560 },
2561 ]
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002562 }),
2563 (('GetChangeRobotComments', 'chromium-review.googlesource.com',
2564 'infra%2Finfra~1'), {}),
Leszek Swirski45b20c42018-09-17 17:05:26 +00002565 ] * 2 + [
2566 (('write_json', 'output.json', [
2567 {
2568 u'date': u'2017-03-16 20:00:41.000000',
2569 u'message': (
2570 u'PTAL\n' +
2571 u'\n' +
2572 u'codereview.settings\n' +
2573 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2574 u'c/1/2/codereview.settings#b42\n' +
2575 u' I removed this because it is bad\n'),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002576 u'autogenerated': False,
Leszek Swirski45b20c42018-09-17 17:05:26 +00002577 u'approval': False,
2578 u'disapproval': False,
2579 u'sender': u'owner@example.com'
2580 }, {
2581 u'date': u'2017-03-17 05:19:37.500000',
2582 u'message': (
2583 u'Patch Set 2: Code-Review+1\n' +
2584 u'\n' +
2585 u'/COMMIT_MSG\n' +
2586 u' PS2, File comment: https://chromium-review.googlesource' +
2587 u'.com/c/1/2//COMMIT_MSG#\n' +
2588 u' Please include a bug link\n'),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002589 u'autogenerated': False,
Leszek Swirski45b20c42018-09-17 17:05:26 +00002590 u'approval': False,
2591 u'disapproval': False,
2592 u'sender': u'reviewer@example.com'
2593 }
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002594 ]), '')
Leszek Swirski45b20c42018-09-17 17:05:26 +00002595 ]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002596 expected_comments_summary = [
2597 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002598 message=(
2599 u'PTAL\n' +
2600 u'\n' +
2601 u'codereview.settings\n' +
2602 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2603 u'c/1/2/codereview.settings#b42\n' +
2604 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002605 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002606 autogenerated=False,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002607 disapproval=False, approval=False, sender=u'owner@example.com'),
2608 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002609 message=(
2610 u'Patch Set 2: Code-Review+1\n' +
2611 u'\n' +
2612 u'/COMMIT_MSG\n' +
2613 u' PS2, File comment: https://chromium-review.googlesource.com/' +
2614 u'c/1/2//COMMIT_MSG#\n' +
2615 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002616 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002617 autogenerated=False,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002618 disapproval=False, approval=False, sender=u'reviewer@example.com'),
2619 ]
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002620 cl = git_cl.Changelist(
Edward Lemurf38bc172019-09-03 21:02:13 +00002621 issue=1, branchref='refs/heads/foo')
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002622 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002623 self.assertEqual(
2624 0, git_cl.main(['comments', '-i', '1', '-j', 'output.json']))
2625
2626 def test_git_cl_comments_robot_comments(self):
2627 # git cl comments also fetches robot comments (which are considered a type
2628 # of autogenerated comment), and unlike other types of comments, only robot
2629 # comments from the latest patchset are shown.
Edward Lemur26964072020-02-19 19:18:51 +00002630 self.mockGit.config['remote.origin.url'] = (
2631 'https://chromium.googlesource.com/infra/infra')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002632 gerrit_util.GetChangeDetail.return_value = {
2633 'owner': {'email': 'owner@example.com'},
2634 'current_revision': 'ba5eba11',
2635 'revisions': {
2636 'deadbeaf': {
2637 '_number': 1,
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002638 },
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002639 'ba5eba11': {
2640 '_number': 2,
2641 },
2642 },
2643 'messages': [
2644 {
2645 u'_revision_number': 1,
2646 u'author': {
2647 u'_account_id': 1111084,
2648 u'email': u'commit-bot@chromium.org',
2649 u'name': u'Commit Bot'
2650 },
2651 u'date': u'2017-03-15 20:08:45.000000000',
2652 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
2653 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
2654 u'tag': u'autogenerated:cq:dry-run'
2655 },
2656 {
2657 u'_revision_number': 1,
2658 u'author': {
2659 u'_account_id': 123,
2660 u'email': u'tricium@serviceaccount.com',
2661 u'name': u'Tricium'
2662 },
2663 u'date': u'2017-03-16 20:00:41.000000000',
2664 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2665 u'message': u'(1 comment)',
2666 u'tag': u'autogenerated:tricium',
2667 },
2668 {
2669 u'_revision_number': 1,
2670 u'author': {
2671 u'_account_id': 123,
2672 u'email': u'tricium@serviceaccount.com',
2673 u'name': u'Tricium'
2674 },
2675 u'date': u'2017-03-16 20:00:41.000000000',
2676 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2677 u'message': u'(1 comment)',
2678 u'tag': u'autogenerated:tricium',
2679 },
2680 {
2681 u'_revision_number': 2,
2682 u'author': {
2683 u'_account_id': 123,
2684 u'email': u'tricium@serviceaccount.com',
2685 u'name': u'reviewer'
2686 },
2687 u'date': u'2017-03-17 05:30:37.000000000',
2688 u'tag': u'autogenerated:tricium',
2689 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2690 u'message': u'(1 comment)',
2691 },
2692 ]
2693 }
2694 self.calls = [
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002695 (('GetChangeComments', 'chromium-review.googlesource.com',
2696 'infra%2Finfra~1'), {}),
2697 (('GetChangeRobotComments', 'chromium-review.googlesource.com',
2698 'infra%2Finfra~1'), {
2699 'codereview.settings': [
2700 {
2701 u'author': {u'email': u'tricium@serviceaccount.com'},
2702 u'updated': u'2017-03-17 05:30:37.000000000',
2703 u'robot_run_id': u'5565031076855808',
2704 u'robot_id': u'Linter/Category',
2705 u'tag': u'autogenerated:tricium',
2706 u'patch_set': 2,
2707 u'side': u'REVISION',
2708 u'message': u'Linter warning message text',
2709 u'line': 32,
2710 },
2711 ],
2712 }),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002713 ]
2714 expected_comments_summary = [
2715 git_cl._CommentSummary(date=datetime.datetime(2017, 3, 17, 5, 30, 37),
2716 message=(
2717 u'(1 comment)\n\ncodereview.settings\n'
2718 u' PS2, Line 32: https://chromium-review.googlesource.com/'
2719 u'c/1/2/codereview.settings#32\n'
2720 u' Linter warning message text\n'),
2721 sender=u'tricium@serviceaccount.com',
2722 autogenerated=True, approval=False, disapproval=False)
2723 ]
2724 cl = git_cl.Changelist(
Edward Lemurf38bc172019-09-03 21:02:13 +00002725 issue=1, branchref='refs/heads/foo')
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002726 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002727
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002728 def test_get_remote_url_with_mirror(self):
2729 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002730
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002731 def selective_os_path_isdir_mock(path):
2732 if path == '/cache/this-dir-exists':
2733 return self._mocked_call('os.path.isdir', path)
2734 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002735
Edward Lemurda4b6c62020-02-13 00:28:40 +00002736 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002737
2738 url = 'https://chromium.googlesource.com/my/repo'
Edward Lemur26964072020-02-19 19:18:51 +00002739 self.mockGit.config['remote.origin.url'] = (
2740 '/cache/this-dir-exists')
2741 self.mockGit.config['/cache/this-dir-exists:remote.origin.url'] = (
2742 url)
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002743 self.calls = [
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002744 (('os.path.isdir', '/cache/this-dir-exists'),
2745 True),
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002746 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002747 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002748 self.assertEqual(cl.GetRemoteUrl(), url)
2749 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
2750
Edward Lemur298f2cf2019-02-22 21:40:39 +00002751 def test_get_remote_url_non_existing_mirror(self):
2752 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002753
Edward Lemur298f2cf2019-02-22 21:40:39 +00002754 def selective_os_path_isdir_mock(path):
2755 if path == '/cache/this-dir-doesnt-exist':
2756 return self._mocked_call('os.path.isdir', path)
2757 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002758
Edward Lemurda4b6c62020-02-13 00:28:40 +00002759 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
2760 mock.patch('logging.error',
2761 lambda *a: self._mocked_call('logging.error', *a)).start()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002762
Edward Lemur26964072020-02-19 19:18:51 +00002763 self.mockGit.config['remote.origin.url'] = (
2764 '/cache/this-dir-doesnt-exist')
Edward Lemur298f2cf2019-02-22 21:40:39 +00002765 self.calls = [
Edward Lemur298f2cf2019-02-22 21:40:39 +00002766 (('os.path.isdir', '/cache/this-dir-doesnt-exist'),
2767 False),
2768 (('logging.error',
Josip906bfde2020-01-31 22:38:49 +00002769 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2770 'but it doesn\'t exist.', {
2771 'remote': 'origin',
2772 'branch': 'master',
2773 'url': '/cache/this-dir-doesnt-exist'}
2774 ), None),
Edward Lemur298f2cf2019-02-22 21:40:39 +00002775 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002776 cl = git_cl.Changelist(issue=1)
Edward Lemur298f2cf2019-02-22 21:40:39 +00002777 self.assertIsNone(cl.GetRemoteUrl())
2778
2779 def test_get_remote_url_misconfigured_mirror(self):
2780 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002781
Edward Lemur298f2cf2019-02-22 21:40:39 +00002782 def selective_os_path_isdir_mock(path):
2783 if path == '/cache/this-dir-exists':
2784 return self._mocked_call('os.path.isdir', path)
2785 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002786
Edward Lemurda4b6c62020-02-13 00:28:40 +00002787 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
2788 mock.patch('logging.error',
2789 lambda *a: self._mocked_call('logging.error', *a)).start()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002790
Edward Lemur26964072020-02-19 19:18:51 +00002791 self.mockGit.config['remote.origin.url'] = (
2792 '/cache/this-dir-exists')
Edward Lemur298f2cf2019-02-22 21:40:39 +00002793 self.calls = [
Edward Lemur298f2cf2019-02-22 21:40:39 +00002794 (('os.path.isdir', '/cache/this-dir-exists'), True),
Edward Lemur298f2cf2019-02-22 21:40:39 +00002795 (('logging.error',
2796 'Remote "%(remote)s" for branch "%(branch)s" points to '
2797 '"%(cache_path)s", but it is misconfigured.\n'
2798 '"%(cache_path)s" must be a git repo and must have a remote named '
2799 '"%(remote)s" pointing to the git host.', {
2800 'remote': 'origin',
2801 'cache_path': '/cache/this-dir-exists',
2802 'branch': 'master'}
2803 ), None),
2804 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002805 cl = git_cl.Changelist(issue=1)
Edward Lemur298f2cf2019-02-22 21:40:39 +00002806 self.assertIsNone(cl.GetRemoteUrl())
2807
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002808 def test_gerrit_change_identifier_with_project(self):
Edward Lemur26964072020-02-19 19:18:51 +00002809 self.mockGit.config['remote.origin.url'] = (
2810 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemurf38bc172019-09-03 21:02:13 +00002811 cl = git_cl.Changelist(issue=123456)
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002812 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
2813
2814 def test_gerrit_change_identifier_without_project(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002815 mock.patch('logging.error',
2816 lambda *a: self._mocked_call('logging.error', *a)).start()
Josip906bfde2020-01-31 22:38:49 +00002817
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002818 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00002819 (('logging.error',
2820 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2821 'but it doesn\'t exist.', {
2822 'remote': 'origin',
2823 'branch': 'master',
2824 'url': ''}
2825 ), None),
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002826 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002827 cl = git_cl.Changelist(issue=123456)
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002828 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002829
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002830
Edward Lemur9aa1a962020-02-25 00:58:38 +00002831class ChangelistTest(unittest.TestCase):
Edward Lemur227d5102020-02-25 23:45:35 +00002832 def setUp(self):
2833 super(ChangelistTest, self).setUp()
2834 mock.patch('gclient_utils.FileRead').start()
2835 mock.patch('gclient_utils.FileWrite').start()
2836 mock.patch('gclient_utils.temporary_file', TemporaryFileMock()).start()
2837 mock.patch(
2838 'git_cl.Changelist.GetCodereviewServer',
2839 return_value='https://chromium-review.googlesource.com').start()
2840 mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start()
2841 mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
2842 mock.patch('git_cl.Changelist.GetPatchset', return_value=7).start()
2843 mock.patch('git_cl.PRESUBMIT_SUPPORT', 'PRESUBMIT_SUPPORT').start()
2844 mock.patch('git_cl.Settings.GetRoot', return_value='root').start()
2845 mock.patch('git_cl.time_time').start()
2846 mock.patch('metrics.collector').start()
2847 mock.patch('subprocess2.Popen').start()
2848 self.addCleanup(mock.patch.stopall)
2849 self.temp_count = 0
2850
Edward Lemur227d5102020-02-25 23:45:35 +00002851 def testRunHook(self):
2852 expected_results = {
2853 'more_cc': ['more@example.com', 'cc@example.com'],
2854 'should_continue': True,
2855 }
2856 gclient_utils.FileRead.return_value = json.dumps(expected_results)
2857 git_cl.time_time.side_effect = [100, 200]
2858 mockProcess = mock.Mock()
2859 mockProcess.wait.return_value = 0
2860 subprocess2.Popen.return_value = mockProcess
2861
2862 cl = git_cl.Changelist()
2863 results = cl.RunHook(
2864 committing=True,
2865 may_prompt=True,
2866 verbose=2,
2867 parallel=True,
2868 upstream='upstream',
2869 description='description',
2870 all_files=True)
2871
2872 self.assertEqual(expected_results, results)
2873 subprocess2.Popen.assert_called_once_with([
2874 'vpython', 'PRESUBMIT_SUPPORT',
Edward Lemur227d5102020-02-25 23:45:35 +00002875 '--root', 'root',
2876 '--upstream', 'upstream',
2877 '--verbose', '--verbose',
Edward Lemur99df04e2020-03-05 19:39:43 +00002878 '--author', 'author',
2879 '--gerrit_url', 'https://chromium-review.googlesource.com',
Edward Lemur227d5102020-02-25 23:45:35 +00002880 '--issue', '123456',
2881 '--patchset', '7',
Edward Lemur75526302020-02-27 22:31:05 +00002882 '--commit',
Edward Lemur227d5102020-02-25 23:45:35 +00002883 '--may_prompt',
2884 '--parallel',
2885 '--all_files',
2886 '--json_output', '/tmp/fake-temp2',
2887 '--description_file', '/tmp/fake-temp1',
2888 ])
2889 gclient_utils.FileWrite.assert_called_once_with(
Edward Lemur1a83da12020-03-04 21:18:36 +00002890 '/tmp/fake-temp1', 'description')
Edward Lemur227d5102020-02-25 23:45:35 +00002891 metrics.collector.add_repeated('sub_commands', {
2892 'command': 'presubmit',
2893 'execution_time': 100,
2894 'exit_code': 0,
2895 })
2896
Edward Lemur99df04e2020-03-05 19:39:43 +00002897 def testRunHook_FewerOptions(self):
2898 expected_results = {
2899 'more_cc': ['more@example.com', 'cc@example.com'],
2900 'should_continue': True,
2901 }
2902 gclient_utils.FileRead.return_value = json.dumps(expected_results)
2903 git_cl.time_time.side_effect = [100, 200]
2904 mockProcess = mock.Mock()
2905 mockProcess.wait.return_value = 0
2906 subprocess2.Popen.return_value = mockProcess
2907
2908 git_cl.Changelist.GetAuthor.return_value = None
2909 git_cl.Changelist.GetIssue.return_value = None
2910 git_cl.Changelist.GetPatchset.return_value = None
2911 git_cl.Changelist.GetCodereviewServer.return_value = None
2912
2913 cl = git_cl.Changelist()
2914 results = cl.RunHook(
2915 committing=False,
2916 may_prompt=False,
2917 verbose=0,
2918 parallel=False,
2919 upstream='upstream',
2920 description='description',
2921 all_files=False)
2922
2923 self.assertEqual(expected_results, results)
2924 subprocess2.Popen.assert_called_once_with([
2925 'vpython', 'PRESUBMIT_SUPPORT',
2926 '--root', 'root',
2927 '--upstream', 'upstream',
2928 '--upload',
2929 '--json_output', '/tmp/fake-temp2',
2930 '--description_file', '/tmp/fake-temp1',
2931 ])
2932 gclient_utils.FileWrite.assert_called_once_with(
2933 '/tmp/fake-temp1', 'description')
2934 metrics.collector.add_repeated('sub_commands', {
2935 'command': 'presubmit',
2936 'execution_time': 100,
2937 'exit_code': 0,
2938 })
2939
Edward Lemur227d5102020-02-25 23:45:35 +00002940 @mock.patch('sys.exit', side_effect=SystemExitMock)
2941 def testRunHook_Failure(self, _mock):
2942 git_cl.time_time.side_effect = [100, 200]
2943 mockProcess = mock.Mock()
2944 mockProcess.wait.return_value = 2
2945 subprocess2.Popen.return_value = mockProcess
2946
2947 cl = git_cl.Changelist()
2948 with self.assertRaises(SystemExitMock):
2949 cl.RunHook(
2950 committing=True,
2951 may_prompt=True,
2952 verbose=2,
2953 parallel=True,
2954 upstream='upstream',
2955 description='description',
2956 all_files=True)
2957
2958 sys.exit.assert_called_once_with(2)
2959
Edward Lemur75526302020-02-27 22:31:05 +00002960 def testRunPostUploadHook(self):
2961 cl = git_cl.Changelist()
2962 cl.RunPostUploadHook(2, 'upstream', 'description')
2963
2964 subprocess2.Popen.assert_called_once_with([
2965 'vpython', 'PRESUBMIT_SUPPORT',
Edward Lemur75526302020-02-27 22:31:05 +00002966 '--root', 'root',
2967 '--upstream', 'upstream',
2968 '--verbose', '--verbose',
Edward Lemur99df04e2020-03-05 19:39:43 +00002969 '--author', 'author',
2970 '--gerrit_url', 'https://chromium-review.googlesource.com',
Edward Lemur75526302020-02-27 22:31:05 +00002971 '--issue', '123456',
2972 '--patchset', '7',
Edward Lemur75526302020-02-27 22:31:05 +00002973 '--post_upload',
2974 '--description_file', '/tmp/fake-temp1',
2975 ])
2976 gclient_utils.FileWrite.assert_called_once_with(
Edward Lemur1a83da12020-03-04 21:18:36 +00002977 '/tmp/fake-temp1', 'description')
Edward Lemur75526302020-02-27 22:31:05 +00002978
Edward Lemur9aa1a962020-02-25 00:58:38 +00002979
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002980class CMDTestCaseBase(unittest.TestCase):
2981 _STATUSES = [
2982 'STATUS_UNSPECIFIED', 'SCHEDULED', 'STARTED', 'SUCCESS', 'FAILURE',
2983 'INFRA_FAILURE', 'CANCELED',
2984 ]
2985 _CHANGE_DETAIL = {
2986 'project': 'depot_tools',
2987 'status': 'OPEN',
2988 'owner': {'email': 'owner@e.mail'},
2989 'current_revision': 'beeeeeef',
2990 'revisions': {
2991 'deadbeaf': {'_number': 6},
2992 'beeeeeef': {
2993 '_number': 7,
2994 'fetch': {'http': {
2995 'url': 'https://chromium.googlesource.com/depot_tools',
2996 'ref': 'refs/changes/56/123456/7'
2997 }},
2998 },
2999 },
3000 }
3001 _DEFAULT_RESPONSE = {
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003002 'builds': [{
3003 'id': str(100 + idx),
3004 'builder': {
3005 'project': 'chromium',
3006 'bucket': 'try',
3007 'builder': 'bot_' + status.lower(),
3008 },
3009 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
3010 'tags': [],
3011 'status': status,
3012 } for idx, status in enumerate(_STATUSES)]
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003013 }
3014
Edward Lemur4c707a22019-09-24 21:13:43 +00003015 def setUp(self):
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003016 super(CMDTestCaseBase, self).setUp()
Edward Lemur79d4f992019-11-11 23:49:02 +00003017 mock.patch('git_cl.sys.stdout', StringIO()).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003018 mock.patch('git_cl.uuid.uuid4', return_value='uuid4').start()
3019 mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003020 mock.patch(
3021 'git_cl.Changelist.GetCodereviewServer',
3022 return_value='https://chromium-review.googlesource.com').start()
3023 mock.patch(
3024 'git_cl.Changelist._GetGerritHost',
3025 return_value='chromium-review.googlesource.com').start()
3026 mock.patch(
3027 'git_cl.Changelist.GetMostRecentPatchset',
3028 return_value=7).start()
3029 mock.patch(
3030 'git_cl.Changelist.GetRemoteUrl',
3031 return_value='https://chromium.googlesource.com/depot_tools').start()
3032 mock.patch(
3033 'auth.Authenticator',
3034 return_value=AuthenticatorMock()).start()
3035 mock.patch(
3036 'gerrit_util.GetChangeDetail',
3037 return_value=self._CHANGE_DETAIL).start()
3038 mock.patch(
3039 'git_cl._call_buildbucket',
3040 return_value = self._DEFAULT_RESPONSE).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003041 mock.patch('git_common.is_dirty_git_tree', return_value=False).start()
Edward Lemur4c707a22019-09-24 21:13:43 +00003042 self.addCleanup(mock.patch.stopall)
3043
Edward Lemur4c707a22019-09-24 21:13:43 +00003044
Edward Lemur9468eba2020-02-27 19:07:22 +00003045class CMDPresubmitTestCase(CMDTestCaseBase):
3046 def setUp(self):
3047 super(CMDPresubmitTestCase, self).setUp()
3048 mock.patch(
3049 'git_cl.Changelist.GetCommonAncestorWithUpstream',
3050 return_value='upstream').start()
3051 mock.patch(
3052 'git_cl.Changelist.FetchDescription',
3053 return_value='fetch description').start()
3054 mock.patch(
Edward Lemura12175c2020-03-09 16:58:26 +00003055 'git_cl._create_description_from_log',
Edward Lemur9468eba2020-02-27 19:07:22 +00003056 return_value='get description').start()
3057 mock.patch('git_cl.Changelist.RunHook').start()
3058
3059 def testDefaultCase(self):
3060 self.assertEqual(0, git_cl.main(['presubmit']))
3061 git_cl.Changelist.RunHook.assert_called_once_with(
3062 committing=True,
3063 may_prompt=False,
3064 verbose=0,
3065 parallel=None,
3066 upstream='upstream',
3067 description='fetch description',
3068 all_files=None)
3069
3070 def testNoIssue(self):
3071 git_cl.Changelist.GetIssue.return_value = None
3072 self.assertEqual(0, git_cl.main(['presubmit']))
3073 git_cl.Changelist.RunHook.assert_called_once_with(
3074 committing=True,
3075 may_prompt=False,
3076 verbose=0,
3077 parallel=None,
3078 upstream='upstream',
3079 description='get description',
3080 all_files=None)
3081
3082 def testCustomBranch(self):
3083 self.assertEqual(0, git_cl.main(['presubmit', 'custom_branch']))
3084 git_cl.Changelist.RunHook.assert_called_once_with(
3085 committing=True,
3086 may_prompt=False,
3087 verbose=0,
3088 parallel=None,
3089 upstream='custom_branch',
3090 description='fetch description',
3091 all_files=None)
3092
3093 def testOptions(self):
3094 self.assertEqual(
3095 0, git_cl.main(['presubmit', '-v', '-v', '--all', '--parallel', '-u']))
3096 git_cl.Changelist.RunHook.assert_called_once_with(
3097 committing=False,
3098 may_prompt=False,
3099 verbose=2,
3100 parallel=True,
3101 upstream='upstream',
3102 description='fetch description',
3103 all_files=True)
3104
3105
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003106class CMDTryResultsTestCase(CMDTestCaseBase):
3107 _DEFAULT_REQUEST = {
3108 'predicate': {
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003109 "gerritChanges": [{
3110 "project": "depot_tools",
3111 "host": "chromium-review.googlesource.com",
3112 "patchset": 7,
3113 "change": 123456,
3114 }],
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003115 },
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003116 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
3117 ',builds.*.createTime,builds.*.tags'),
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003118 }
3119
3120 def testNoJobs(self):
3121 git_cl._call_buildbucket.return_value = {}
3122
3123 self.assertEqual(0, git_cl.main(['try-results']))
3124 self.assertEqual('No tryjobs scheduled.\n', sys.stdout.getvalue())
3125 git_cl._call_buildbucket.assert_called_once_with(
3126 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3127 self._DEFAULT_REQUEST)
3128
3129 def testPrintToStdout(self):
3130 self.assertEqual(0, git_cl.main(['try-results']))
3131 self.assertEqual([
3132 'Successes:',
3133 ' bot_success https://ci.chromium.org/b/103',
3134 'Infra Failures:',
3135 ' bot_infra_failure https://ci.chromium.org/b/105',
3136 'Failures:',
3137 ' bot_failure https://ci.chromium.org/b/104',
3138 'Canceled:',
3139 ' bot_canceled ',
3140 'Started:',
3141 ' bot_started https://ci.chromium.org/b/102',
3142 'Scheduled:',
3143 ' bot_scheduled id=101',
3144 'Other:',
3145 ' bot_status_unspecified id=100',
3146 'Total: 7 tryjobs',
3147 ], sys.stdout.getvalue().splitlines())
3148 git_cl._call_buildbucket.assert_called_once_with(
3149 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3150 self._DEFAULT_REQUEST)
3151
3152 def testPrintToStdoutWithMasters(self):
3153 self.assertEqual(0, git_cl.main(['try-results', '--print-master']))
3154 self.assertEqual([
3155 'Successes:',
3156 ' try bot_success https://ci.chromium.org/b/103',
3157 'Infra Failures:',
3158 ' try bot_infra_failure https://ci.chromium.org/b/105',
3159 'Failures:',
3160 ' try bot_failure https://ci.chromium.org/b/104',
3161 'Canceled:',
3162 ' try bot_canceled ',
3163 'Started:',
3164 ' try bot_started https://ci.chromium.org/b/102',
3165 'Scheduled:',
3166 ' try bot_scheduled id=101',
3167 'Other:',
3168 ' try bot_status_unspecified id=100',
3169 'Total: 7 tryjobs',
3170 ], sys.stdout.getvalue().splitlines())
3171 git_cl._call_buildbucket.assert_called_once_with(
3172 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3173 self._DEFAULT_REQUEST)
3174
3175 @mock.patch('git_cl.write_json')
3176 def testWriteToJson(self, mockJsonDump):
3177 self.assertEqual(0, git_cl.main(['try-results', '--json', 'file.json']))
3178 git_cl._call_buildbucket.assert_called_once_with(
3179 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3180 self._DEFAULT_REQUEST)
3181 mockJsonDump.assert_called_once_with(
3182 'file.json', self._DEFAULT_RESPONSE['builds'])
3183
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003184 def test_filter_failed_for_one_simple(self):
Edward Lemur45768512020-03-02 19:03:14 +00003185 self.assertEqual([], git_cl._filter_failed_for_retry([]))
3186 self.assertEqual(
3187 [
3188 ('chromium', 'try', 'bot_failure'),
3189 ('chromium', 'try', 'bot_infra_failure'),
3190 ],
3191 git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds']))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003192
3193 def test_filter_failed_for_retry_many_builds(self):
3194
3195 def _build(name, created_sec, status, experimental=False):
3196 assert 0 <= created_sec < 100, created_sec
3197 b = {
3198 'id': 112112,
3199 'builder': {
3200 'project': 'chromium',
3201 'bucket': 'try',
3202 'builder': name,
3203 },
3204 'createTime': '2019-10-09T08:00:%02d.854286Z' % created_sec,
3205 'status': status,
3206 'tags': [],
3207 }
3208 if experimental:
3209 b['tags'].append({'key': 'cq_experimental', 'value': 'true'})
3210 return b
3211
3212 builds = [
3213 _build('flaky-last-green', 1, 'FAILURE'),
3214 _build('flaky-last-green', 2, 'SUCCESS'),
3215 _build('flaky', 1, 'SUCCESS'),
3216 _build('flaky', 2, 'FAILURE'),
3217 _build('running', 1, 'FAILED'),
3218 _build('running', 2, 'SCHEDULED'),
3219 _build('yep-still-running', 1, 'STARTED'),
3220 _build('yep-still-running', 2, 'FAILURE'),
3221 _build('cq-experimental', 1, 'SUCCESS', experimental=True),
3222 _build('cq-experimental', 2, 'FAILURE', experimental=True),
3223
3224 # Simulate experimental in CQ builder, which developer decided
3225 # to retry manually which resulted in 2nd build non-experimental.
3226 _build('sometimes-experimental', 1, 'FAILURE', experimental=True),
3227 _build('sometimes-experimental', 2, 'FAILURE', experimental=False),
3228 ]
3229 builds.sort(key=lambda b: b['status']) # ~deterministic shuffle.
Edward Lemur45768512020-03-02 19:03:14 +00003230 self.assertEqual(
3231 [
3232 ('chromium', 'try', 'flaky'),
3233 ('chromium', 'try', 'sometimes-experimental'),
3234 ],
3235 git_cl._filter_failed_for_retry(builds))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003236
3237
3238class CMDTryTestCase(CMDTestCaseBase):
3239
3240 @mock.patch('git_cl.Changelist.SetCQState')
Edward Lemur45768512020-03-02 19:03:14 +00003241 def testSetCQDryRunByDefault(self, mockSetCQState):
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003242 mockSetCQState.return_value = 0
Edward Lemur4c707a22019-09-24 21:13:43 +00003243 self.assertEqual(0, git_cl.main(['try']))
3244 git_cl.Changelist.SetCQState.assert_called_with(git_cl._CQState.DRY_RUN)
3245 self.assertEqual(
3246 sys.stdout.getvalue(),
3247 'Scheduling CQ dry run on: '
3248 'https://chromium-review.googlesource.com/123456\n')
3249
Edward Lemur4c707a22019-09-24 21:13:43 +00003250 @mock.patch('git_cl._call_buildbucket')
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003251 def testScheduleOnBuildbucket(self, mockCallBuildbucket):
Edward Lemur4c707a22019-09-24 21:13:43 +00003252 mockCallBuildbucket.return_value = {}
Edward Lemur4c707a22019-09-24 21:13:43 +00003253
3254 self.assertEqual(0, git_cl.main([
3255 'try', '-B', 'luci.chromium.try', '-b', 'win',
3256 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
3257 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003258 'Scheduling jobs on:\n'
3259 ' chromium/try: win',
Edward Lemur4c707a22019-09-24 21:13:43 +00003260 git_cl.sys.stdout.getvalue())
3261
3262 expected_request = {
3263 "requests": [{
3264 "scheduleBuild": {
3265 "requestId": "uuid4",
3266 "builder": {
3267 "project": "chromium",
3268 "builder": "win",
3269 "bucket": "try",
3270 },
3271 "gerritChanges": [{
3272 "project": "depot_tools",
3273 "host": "chromium-review.googlesource.com",
3274 "patchset": 7,
3275 "change": 123456,
3276 }],
3277 "properties": {
3278 "category": "git_cl_try",
3279 "json": [{"a": 1}, None],
3280 "key": "val",
3281 },
3282 "tags": [
3283 {"value": "win", "key": "builder"},
3284 {"value": "git_cl_try", "key": "user_agent"},
3285 ],
3286 },
3287 }],
3288 }
3289 mockCallBuildbucket.assert_called_with(
3290 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3291
Anthony Polito1a5fe232020-01-24 23:17:52 +00003292 @mock.patch('git_cl._call_buildbucket')
3293 def testScheduleOnBuildbucketWithRevision(self, mockCallBuildbucket):
3294 mockCallBuildbucket.return_value = {}
3295
3296 self.assertEqual(0, git_cl.main([
3297 'try', '-B', 'luci.chromium.try', '-b', 'win', '-b', 'linux',
3298 '-p', 'key=val', '-p', 'json=[{"a":1}, null]',
3299 '-r', 'beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef']))
3300 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003301 'Scheduling jobs on:\n'
3302 ' chromium/try: linux\n'
3303 ' chromium/try: win',
Anthony Polito1a5fe232020-01-24 23:17:52 +00003304 git_cl.sys.stdout.getvalue())
3305
3306 expected_request = {
3307 "requests": [{
3308 "scheduleBuild": {
3309 "requestId": "uuid4",
3310 "builder": {
3311 "project": "chromium",
3312 "builder": "linux",
3313 "bucket": "try",
3314 },
3315 "gerritChanges": [{
3316 "project": "depot_tools",
3317 "host": "chromium-review.googlesource.com",
3318 "patchset": 7,
3319 "change": 123456,
3320 }],
3321 "properties": {
3322 "category": "git_cl_try",
3323 "json": [{"a": 1}, None],
3324 "key": "val",
3325 },
3326 "tags": [
3327 {"value": "linux", "key": "builder"},
3328 {"value": "git_cl_try", "key": "user_agent"},
3329 ],
3330 "gitilesCommit": {
3331 "host": "chromium-review.googlesource.com",
3332 "project": "depot_tools",
3333 "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
3334 }
3335 },
3336 },
3337 {
3338 "scheduleBuild": {
3339 "requestId": "uuid4",
3340 "builder": {
3341 "project": "chromium",
3342 "builder": "win",
3343 "bucket": "try",
3344 },
3345 "gerritChanges": [{
3346 "project": "depot_tools",
3347 "host": "chromium-review.googlesource.com",
3348 "patchset": 7,
3349 "change": 123456,
3350 }],
3351 "properties": {
3352 "category": "git_cl_try",
3353 "json": [{"a": 1}, None],
3354 "key": "val",
3355 },
3356 "tags": [
3357 {"value": "win", "key": "builder"},
3358 {"value": "git_cl_try", "key": "user_agent"},
3359 ],
3360 "gitilesCommit": {
3361 "host": "chromium-review.googlesource.com",
3362 "project": "depot_tools",
3363 "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
3364 }
3365 },
3366 }],
3367 }
3368 mockCallBuildbucket.assert_called_with(
3369 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3370
Edward Lemur45768512020-03-02 19:03:14 +00003371 @mock.patch('sys.stderr', StringIO())
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003372 def testScheduleOnBuildbucket_WrongBucket(self):
Edward Lemur45768512020-03-02 19:03:14 +00003373 with self.assertRaises(SystemExit):
3374 git_cl.main([
3375 'try', '-B', 'not-a-bucket', '-b', 'win',
3376 '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])
Edward Lemur4c707a22019-09-24 21:13:43 +00003377 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003378 'Invalid bucket: not-a-bucket.',
3379 sys.stderr.getvalue())
Edward Lemur4c707a22019-09-24 21:13:43 +00003380
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003381 @mock.patch('git_cl._call_buildbucket')
Quinten Yearsley777660f2020-03-04 23:37:06 +00003382 @mock.patch('git_cl._fetch_tryjobs')
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003383 def testScheduleOnBuildbucketRetryFailed(
3384 self, mockFetchTryJobs, mockCallBuildbucket):
Quinten Yearsley777660f2020-03-04 23:37:06 +00003385 git_cl._fetch_tryjobs.side_effect = lambda *_, **kw: {
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003386 7: [],
3387 6: [{
3388 'id': 112112,
3389 'builder': {
3390 'project': 'chromium',
3391 'bucket': 'try',
Quinten Yearsley777660f2020-03-04 23:37:06 +00003392 'builder': 'linux', },
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003393 'createTime': '2019-10-09T08:00:01.854286Z',
3394 'tags': [],
Quinten Yearsley777660f2020-03-04 23:37:06 +00003395 'status': 'FAILURE', }], }[kw['patchset']]
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003396 mockCallBuildbucket.return_value = {}
3397
3398 self.assertEqual(0, git_cl.main(['try', '--retry-failed']))
3399 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003400 'Scheduling jobs on:\n'
3401 ' chromium/try: linux',
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003402 git_cl.sys.stdout.getvalue())
3403
3404 expected_request = {
3405 "requests": [{
3406 "scheduleBuild": {
3407 "requestId": "uuid4",
3408 "builder": {
3409 "project": "chromium",
3410 "bucket": "try",
3411 "builder": "linux",
3412 },
3413 "gerritChanges": [{
3414 "project": "depot_tools",
3415 "host": "chromium-review.googlesource.com",
3416 "patchset": 7,
3417 "change": 123456,
3418 }],
3419 "properties": {
3420 "category": "git_cl_try",
3421 },
3422 "tags": [
3423 {"value": "linux", "key": "builder"},
3424 {"value": "git_cl_try", "key": "user_agent"},
3425 {"value": "1", "key": "retry_failed"},
3426 ],
3427 },
3428 }],
3429 }
3430 mockCallBuildbucket.assert_called_with(
3431 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3432
Edward Lemur4c707a22019-09-24 21:13:43 +00003433 def test_parse_bucket(self):
3434 test_cases = [
3435 {
3436 'bucket': 'chromium/try',
3437 'result': ('chromium', 'try'),
3438 },
3439 {
3440 'bucket': 'luci.chromium.try',
3441 'result': ('chromium', 'try'),
3442 'has_warning': True,
3443 },
3444 {
3445 'bucket': 'skia.primary',
3446 'result': ('skia', 'skia.primary'),
3447 'has_warning': True,
3448 },
3449 {
3450 'bucket': 'not-a-bucket',
3451 'result': (None, None),
3452 },
3453 ]
3454
3455 for test_case in test_cases:
3456 git_cl.sys.stdout.truncate(0)
3457 self.assertEqual(
3458 test_case['result'], git_cl._parse_bucket(test_case['bucket']))
3459 if test_case.get('has_warning'):
Edward Lemur6215c792019-10-03 21:59:05 +00003460 expected_warning = 'WARNING Please use %s/%s to specify the bucket' % (
3461 test_case['result'])
3462 self.assertIn(expected_warning, git_cl.sys.stdout.getvalue())
Edward Lemur4c707a22019-09-24 21:13:43 +00003463
3464
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003465class CMDUploadTestCase(CMDTestCaseBase):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003466
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003467 def setUp(self):
3468 super(CMDUploadTestCase, self).setUp()
Quinten Yearsley777660f2020-03-04 23:37:06 +00003469 mock.patch('git_cl._fetch_tryjobs').start()
3470 mock.patch('git_cl._trigger_tryjobs', return_value={}).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003471 mock.patch('git_cl.Changelist.CMDUpload', return_value=0).start()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003472 self.addCleanup(mock.patch.stopall)
3473
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003474 def testWarmUpChangeDetailCache(self):
3475 self.assertEqual(0, git_cl.main(['upload']))
3476 gerrit_util.GetChangeDetail.assert_called_once_with(
3477 'chromium-review.googlesource.com', 'depot_tools~123456',
3478 frozenset([
3479 'LABELS', 'CURRENT_REVISION', 'DETAILED_ACCOUNTS',
3480 'CURRENT_COMMIT']))
3481
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003482 def testUploadRetryFailed(self):
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003483 # This test mocks out the actual upload part, and just asserts that after
3484 # upload, if --retry-failed is added, then the tool will fetch try jobs
3485 # from the previous patchset and trigger the right builders on the latest
3486 # patchset.
Quinten Yearsley777660f2020-03-04 23:37:06 +00003487 git_cl._fetch_tryjobs.side_effect = [
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003488 # Latest patchset: No builds.
3489 [],
3490 # Patchset before latest: Some builds.
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003491 [{
3492 'id': str(100 + idx),
3493 'builder': {
3494 'project': 'chromium',
3495 'bucket': 'try',
3496 'builder': 'bot_' + status.lower(),
3497 },
3498 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
3499 'tags': [],
3500 'status': status,
3501 } for idx, status in enumerate(self._STATUSES)],
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00003502 ]
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003503
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003504 self.assertEqual(0, git_cl.main(['upload', '--retry-failed']))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003505 self.assertEqual([
Edward Lemur5b929a42019-10-21 17:57:39 +00003506 mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
3507 mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
Quinten Yearsley777660f2020-03-04 23:37:06 +00003508 ], git_cl._fetch_tryjobs.mock_calls)
Edward Lemur45768512020-03-02 19:03:14 +00003509 expected_buckets = [
3510 ('chromium', 'try', 'bot_failure'),
3511 ('chromium', 'try', 'bot_infra_failure'),
3512 ]
Quinten Yearsley777660f2020-03-04 23:37:06 +00003513 git_cl._trigger_tryjobs.assert_called_once_with(mock.ANY, expected_buckets,
3514 mock.ANY, 8)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003515
Brian Sheedy59b06a82019-10-14 17:03:29 +00003516
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003517class MakeRequestsHelperTestCase(unittest.TestCase):
3518
3519 def exampleGerritChange(self):
3520 return {
3521 'host': 'chromium-review.googlesource.com',
3522 'project': 'depot_tools',
3523 'change': 1,
3524 'patchset': 2,
3525 }
3526
3527 def testMakeRequestsHelperNoOptions(self):
3528 # Basic test for the helper function _make_tryjob_schedule_requests;
3529 # it shouldn't throw AttributeError even when options doesn't have any
3530 # of the expected values; it will use default option values.
3531 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3532 jobs = [('chromium', 'try', 'my-builder')]
3533 options = optparse.Values()
3534 requests = git_cl._make_tryjob_schedule_requests(
3535 changelist, jobs, options, patchset=None)
3536
3537 # requestId is non-deterministic. Just assert that it's there and has
3538 # a particular length.
3539 self.assertEqual(len(requests[0]['scheduleBuild'].pop('requestId')), 36)
3540 self.assertEqual(requests, [{
3541 'scheduleBuild': {
3542 'builder': {
3543 'bucket': 'try',
3544 'builder': 'my-builder',
3545 'project': 'chromium'
3546 },
3547 'gerritChanges': [self.exampleGerritChange()],
3548 'properties': {
3549 'category': 'git_cl_try'
3550 },
3551 'tags': [{
3552 'key': 'builder',
3553 'value': 'my-builder'
3554 }, {
3555 'key': 'user_agent',
3556 'value': 'git_cl_try'
3557 }]
3558 }
3559 }])
3560
3561 def testMakeRequestsHelperPresubmitSetsDryRunProperty(self):
3562 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3563 jobs = [('chromium', 'try', 'presubmit')]
3564 options = optparse.Values()
3565 requests = git_cl._make_tryjob_schedule_requests(
3566 changelist, jobs, options, patchset=None)
3567 self.assertEqual(requests[0]['scheduleBuild']['properties'], {
3568 'category': 'git_cl_try',
3569 'dry_run': 'true'
3570 })
3571
3572 def testMakeRequestsHelperRevisionSet(self):
3573 # Gitiles commit is specified when revision is in options.
3574 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3575 jobs = [('chromium', 'try', 'my-builder')]
3576 options = optparse.Values({'revision': 'ba5eba11'})
3577 requests = git_cl._make_tryjob_schedule_requests(
3578 changelist, jobs, options, patchset=None)
3579 self.assertEqual(
3580 requests[0]['scheduleBuild']['gitilesCommit'], {
3581 'host': 'chromium-review.googlesource.com',
3582 'id': 'ba5eba11',
3583 'project': 'depot_tools'
3584 })
3585
3586 def testMakeRequestsHelperRetryFailedSet(self):
3587 # An extra tag is added when retry_failed is in options.
3588 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3589 jobs = [('chromium', 'try', 'my-builder')]
3590 options = optparse.Values({'retry_failed': 'true'})
3591 requests = git_cl._make_tryjob_schedule_requests(
3592 changelist, jobs, options, patchset=None)
3593 self.assertEqual(
3594 requests[0]['scheduleBuild']['tags'], [
3595 {
3596 'key': 'builder',
3597 'value': 'my-builder'
3598 },
3599 {
3600 'key': 'user_agent',
3601 'value': 'git_cl_try'
3602 },
3603 {
3604 'key': 'retry_failed',
3605 'value': '1'
3606 }
3607 ])
3608
3609 def testMakeRequestsHelperCategorySet(self):
3610 # The category property can be overriden with options.
3611 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3612 jobs = [('chromium', 'try', 'my-builder')]
3613 options = optparse.Values({'category': 'my-special-category'})
3614 requests = git_cl._make_tryjob_schedule_requests(
3615 changelist, jobs, options, patchset=None)
3616 self.assertEqual(requests[0]['scheduleBuild']['properties'],
3617 {'category': 'my-special-category'})
3618
3619
Edward Lemurda4b6c62020-02-13 00:28:40 +00003620class CMDFormatTestCase(unittest.TestCase):
Brian Sheedy59b06a82019-10-14 17:03:29 +00003621
3622 def setUp(self):
3623 super(CMDFormatTestCase, self).setUp()
Jamie Madill5e96ad12020-01-13 16:08:35 +00003624 mock.patch('git_cl.RunCommand').start()
3625 mock.patch('clang_format.FindClangFormatToolInChromiumTree').start()
3626 mock.patch('clang_format.FindClangFormatScriptInChromiumTree').start()
3627 mock.patch('git_cl.settings').start()
Brian Sheedy59b06a82019-10-14 17:03:29 +00003628 self._top_dir = tempfile.mkdtemp()
Jamie Madill5e96ad12020-01-13 16:08:35 +00003629 self.addCleanup(mock.patch.stopall)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003630
3631 def tearDown(self):
3632 shutil.rmtree(self._top_dir)
3633 super(CMDFormatTestCase, self).tearDown()
3634
Jamie Madill5e96ad12020-01-13 16:08:35 +00003635 def _make_temp_file(self, fname, contents):
3636 with open(os.path.join(self._top_dir, fname), 'w') as tf:
3637 tf.write('\n'.join(contents))
3638
Brian Sheedy59b06a82019-10-14 17:03:29 +00003639 def _make_yapfignore(self, contents):
Jamie Madill5e96ad12020-01-13 16:08:35 +00003640 self._make_temp_file('.yapfignore', contents)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003641
Brian Sheedyb4307d52019-12-02 19:18:17 +00003642 def _check_yapf_filtering(self, files, expected):
3643 self.assertEqual(expected, git_cl._FilterYapfIgnoredFiles(
3644 files, git_cl._GetYapfIgnorePatterns(self._top_dir)))
Brian Sheedy59b06a82019-10-14 17:03:29 +00003645
Edward Lemur1a83da12020-03-04 21:18:36 +00003646 def _run_command_mock(self, return_value):
3647 def f(*args, **kwargs):
3648 if 'stdin' in kwargs:
3649 self.assertIsInstance(kwargs['stdin'], bytes)
3650 return return_value
3651 return f
3652
Jamie Madill5e96ad12020-01-13 16:08:35 +00003653 def testClangFormatDiffFull(self):
3654 self._make_temp_file('test.cc', ['// test'])
3655 git_cl.settings.GetFormatFullByDefault.return_value = False
3656 diff_file = [os.path.join(self._top_dir, 'test.cc')]
3657 mock_opts = mock.Mock(full=True, dry_run=True, diff=False)
3658
3659 # Diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003660 git_cl.RunCommand.side_effect = self._run_command_mock(' // test')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003661 return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
3662 self._top_dir, 'HEAD')
3663 self.assertEqual(2, return_value)
3664
3665 # No diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003666 git_cl.RunCommand.side_effect = self._run_command_mock('// test')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003667 return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
3668 self._top_dir, 'HEAD')
3669 self.assertEqual(0, return_value)
3670
3671 def testClangFormatDiff(self):
3672 git_cl.settings.GetFormatFullByDefault.return_value = False
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00003673 # A valid file is required, so use this test.
3674 clang_format.FindClangFormatToolInChromiumTree.return_value = __file__
Jamie Madill5e96ad12020-01-13 16:08:35 +00003675 mock_opts = mock.Mock(full=False, dry_run=True, diff=False)
3676
3677 # Diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003678 git_cl.RunCommand.side_effect = self._run_command_mock('error')
3679 return_value = git_cl._RunClangFormatDiff(
3680 mock_opts, ['.'], self._top_dir, 'HEAD')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003681 self.assertEqual(2, return_value)
3682
3683 # No diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003684 git_cl.RunCommand.side_effect = self._run_command_mock('')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003685 return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir,
3686 'HEAD')
3687 self.assertEqual(0, return_value)
3688
Brian Sheedyb4307d52019-12-02 19:18:17 +00003689 def testYapfignoreExplicit(self):
3690 self._make_yapfignore(['foo/bar.py', 'foo/bar/baz.py'])
3691 files = [
3692 'bar.py',
3693 'foo/bar.py',
3694 'foo/baz.py',
3695 'foo/bar/baz.py',
3696 'foo/bar/foobar.py',
3697 ]
3698 expected = [
3699 'bar.py',
3700 'foo/baz.py',
3701 'foo/bar/foobar.py',
3702 ]
3703 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003704
Brian Sheedyb4307d52019-12-02 19:18:17 +00003705 def testYapfignoreSingleWildcards(self):
3706 self._make_yapfignore(['*bar.py', 'foo*', 'baz*.py'])
3707 files = [
3708 'bar.py', # Matched by *bar.py.
3709 'bar.txt',
3710 'foobar.py', # Matched by *bar.py, foo*.
3711 'foobar.txt', # Matched by foo*.
3712 'bazbar.py', # Matched by *bar.py, baz*.py.
3713 'bazbar.txt',
3714 'foo/baz.txt', # Matched by foo*.
3715 'bar/bar.py', # Matched by *bar.py.
3716 'baz/foo.py', # Matched by baz*.py, foo*.
3717 'baz/foo.txt',
3718 ]
3719 expected = [
3720 'bar.txt',
3721 'bazbar.txt',
3722 'baz/foo.txt',
3723 ]
3724 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003725
Brian Sheedyb4307d52019-12-02 19:18:17 +00003726 def testYapfignoreMultiplewildcards(self):
3727 self._make_yapfignore(['*bar*', '*foo*baz.txt'])
3728 files = [
3729 'bar.py', # Matched by *bar*.
3730 'bar.txt', # Matched by *bar*.
3731 'abar.py', # Matched by *bar*.
3732 'foobaz.txt', # Matched by *foo*baz.txt.
3733 'foobaz.py',
3734 'afoobaz.txt', # Matched by *foo*baz.txt.
3735 ]
3736 expected = [
3737 'foobaz.py',
3738 ]
3739 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003740
3741 def testYapfignoreComments(self):
3742 self._make_yapfignore(['test.py', '#test2.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003743 files = [
3744 'test.py',
3745 'test2.py',
3746 ]
3747 expected = [
3748 'test2.py',
3749 ]
3750 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003751
3752 def testYapfignoreBlankLines(self):
3753 self._make_yapfignore(['test.py', '', '', 'test2.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003754 files = [
3755 'test.py',
3756 'test2.py',
3757 'test3.py',
3758 ]
3759 expected = [
3760 'test3.py',
3761 ]
3762 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003763
3764 def testYapfignoreWhitespace(self):
3765 self._make_yapfignore([' test.py '])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003766 files = [
3767 'test.py',
3768 'test2.py',
3769 ]
3770 expected = [
3771 'test2.py',
3772 ]
3773 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003774
Brian Sheedyb4307d52019-12-02 19:18:17 +00003775 def testYapfignoreNoFiles(self):
Brian Sheedy59b06a82019-10-14 17:03:29 +00003776 self._make_yapfignore(['test.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003777 self._check_yapf_filtering([], [])
3778
3779 def testYapfignoreMissingYapfignore(self):
3780 files = [
3781 'test.py',
3782 ]
3783 expected = [
3784 'test.py',
3785 ]
3786 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003787
3788
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003789if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003790 logging.basicConfig(
3791 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003792 unittest.main()