blob: 2c06c98c6c237949b3ba35d5b9aa7d677caffbf1 [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
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000229 def test_upload_to_non_default_branch_no_retry(self):
230 m = mock.patch('git_cl.Changelist._CMDUploadChange',
231 side_effect=[git_cl.GitPushError(), None]).start()
232 mock.patch('git_cl.Changelist.GetRemoteBranch',
233 return_value=('foo', 'bar')).start()
234 mock.patch('git_cl.Changelist._GetGerritProject',
235 return_value='foo').start()
236 mock.patch('git_cl.gerrit_util.GetProjectHead',
237 return_value='refs/heads/main').start()
238
239 cl = git_cl.Changelist()
240 options = optparse.Values()
241 with self.assertRaises(SystemExitMock):
242 cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
243
244 # ensure upload is called once
245 self.assertEqual(len(m.mock_calls), 1)
246 sys.exit.assert_called_once_with(1)
247 # option not set as retry didn't happen
248 self.assertFalse(hasattr(options, 'force'))
249 self.assertFalse(hasattr(options, 'edit_description'))
250
251 def test_upload_to_old_default_still_active(self):
252 m = mock.patch('git_cl.Changelist._CMDUploadChange',
253 side_effect=[git_cl.GitPushError(), None]).start()
254 mock.patch('git_cl.Changelist.GetRemoteBranch',
255 return_value=('foo', git_cl.DEFAULT_OLD_BRANCH)).start()
256 mock.patch('git_cl.Changelist._GetGerritProject',
257 return_value='foo').start()
258 mock.patch('git_cl.gerrit_util.GetProjectHead',
259 return_value='refs/heads/old_default').start()
260
261 cl = git_cl.Changelist()
262 options = optparse.Values()
263 with self.assertRaises(SystemExitMock):
264 cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
265
266 # ensure upload is called once
267 self.assertEqual(len(m.mock_calls), 1)
268 sys.exit.assert_called_once_with(1)
269 # option not set as retry didn't happen
270 self.assertFalse(hasattr(options, 'force'))
271 self.assertFalse(hasattr(options, 'edit_description'))
272
273 def test_upload_to_old_default_retry_on_failure(self):
274 m = mock.patch('git_cl.Changelist._CMDUploadChange',
275 side_effect=[git_cl.GitPushError(), None]).start()
276 mock.patch('git_cl.Changelist.GetRemoteBranch',
277 return_value=('foo', git_cl.DEFAULT_OLD_BRANCH)).start()
278 mock.patch('git_cl.Changelist._GetGerritProject',
279 return_value='foo').start()
280 mock.patch('git_cl.gerrit_util.GetProjectHead',
281 return_value='refs/heads/main').start()
282 mock.patch('git_cl.RunGit').start()
283
284 cl = git_cl.Changelist()
285 options = optparse.Values()
286 cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
287 # ensure upload is called twice
288 self.assertEqual(len(m.mock_calls), 2)
289 # option overrides on retry
290 self.assertEqual(options.force, True)
291 self.assertEqual(options.edit_description, False)
292
Edward Lemur61bf4172020-02-24 23:22:37 +0000293 def test_get_cl_statuses_no_changes(self):
294 self.assertEqual([], list(git_cl.get_cl_statuses([], True)))
295
296 @mock.patch('git_cl.Changelist.EnsureAuthenticated')
297 @mock.patch('multiprocessing.pool.ThreadPool')
298 def test_get_cl_statuses_timeout(self, *_mocks):
299 changes = [git_cl.Changelist() for _ in range(2)]
300 pool = multiprocessing.pool.ThreadPool()
301 it = pool.imap_unordered.return_value.__iter__ = mock.Mock()
302 it.return_value.next.side_effect = [
303 (changes[0], 'lgtm'),
304 multiprocessing.TimeoutError,
305 ]
306
307 actual = list(git_cl.get_cl_statuses(changes, True))
308 self.assertEqual([(changes[0], 'lgtm'), (changes[1], 'error')], actual)
309
310 @mock.patch('git_cl.Changelist.GetIssueURL')
311 def test_get_cl_statuses_not_finegrained(self, _mock):
312 changes = [git_cl.Changelist() for _ in range(2)]
313 urls = ['some-url', None]
314 git_cl.Changelist.GetIssueURL.side_effect = urls
315
316 actual = set(git_cl.get_cl_statuses(changes, False))
317 self.assertEqual(
318 set([(changes[0], 'waiting'), (changes[1], 'error')]), actual)
319
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000320 def test_get_issue_url(self):
321 cl = git_cl.Changelist(issue=123)
322 cl._gerrit_server = 'https://example.com'
323 self.assertEqual(cl.GetIssueURL(), 'https://example.com/123')
324 self.assertEqual(cl.GetIssueURL(short=True), 'https://example.com/123')
325
326 cl = git_cl.Changelist(issue=123)
327 cl._gerrit_server = 'https://chromium-review.googlesource.com'
328 self.assertEqual(cl.GetIssueURL(),
329 'https://chromium-review.googlesource.com/123')
330 self.assertEqual(cl.GetIssueURL(short=True), 'https://crrev.com/c/123')
331
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +0000332 def test_set_preserve_tryjobs(self):
333 d = git_cl.ChangeDescription('Simple.')
334 d.set_preserve_tryjobs()
335 self.assertEqual(d.description.splitlines(), [
336 'Simple.',
337 '',
338 'Cq-Do-Not-Cancel-Tryjobs: true',
339 ])
340 before = d.description
341 d.set_preserve_tryjobs()
342 self.assertEqual(before, d.description)
343
344 d = git_cl.ChangeDescription('\n'.join([
345 'One is enough',
346 '',
347 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
348 'Change-Id: Ideadbeef',
349 ]))
350 d.set_preserve_tryjobs()
351 self.assertEqual(d.description.splitlines(), [
352 'One is enough',
353 '',
354 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
355 'Change-Id: Ideadbeef',
356 'Cq-Do-Not-Cancel-Tryjobs: true',
357 ])
358
tandriif9aefb72016-07-01 09:06:51 -0700359 def test_get_bug_line_values(self):
360 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
361 self.assertEqual(f('', ''), [])
362 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
Lei Zhang8a0efc12020-08-05 19:58:45 +0000363 # Prefix that ends with colon.
364 self.assertEqual(f('v8:', '456'), ['v8:456'])
365 self.assertEqual(f('v8:', 'chromium:123,456'), ['v8:456', 'chromium:123'])
366 # Prefix that ends without colon.
tandriif9aefb72016-07-01 09:06:51 -0700367 self.assertEqual(f('v8', '456'), ['v8:456'])
368 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
369 # Not nice, but not worth carying.
Lei Zhang8a0efc12020-08-05 19:58:45 +0000370 self.assertEqual(f('v8:', 'chromium:123,456,v8:123'),
371 ['v8:456', 'chromium:123', 'v8:123'])
tandriif9aefb72016-07-01 09:06:51 -0700372 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
373 ['v8:456', 'chromium:123', 'v8:123'])
374
Edward Lemurda4b6c62020-02-13 00:28:40 +0000375 @mock.patch('gerrit_util.GetAccountDetails')
376 def test_valid_accounts(self, mockGetAccountDetails):
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000377 mock_per_account = {
378 'u1': None, # 404, doesn't exist.
379 'u2': {
380 '_account_id': 123124,
381 'avatars': [],
382 'email': 'u2@example.com',
383 'name': 'User Number 2',
384 'status': 'OOO',
385 },
386 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('),
387 }
388 def GetAccountDetailsMock(_, account):
389 # Poor-man's mock library's side_effect.
390 v = mock_per_account.pop(account)
391 if isinstance(v, Exception):
392 raise v
393 return v
394
Edward Lemurda4b6c62020-02-13 00:28:40 +0000395 mockGetAccountDetails.side_effect = GetAccountDetailsMock
396 actual = git_cl.gerrit_util.ValidAccounts(
397 'host', ['u1', 'u2', 'u3'], max_threads=1)
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000398 self.assertEqual(actual, {
399 'u2': {
400 '_account_id': 123124,
401 'avatars': [],
402 'email': 'u2@example.com',
403 'name': 'User Number 2',
404 'status': 'OOO',
405 },
406 })
407
408
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200409class TestParseIssueURL(unittest.TestCase):
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000410 def _test(self, arg, issue=None, patchset=None, hostname=None, fail=False):
411 parsed = git_cl.ParseIssueNumberArgument(arg)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200412 self.assertIsNotNone(parsed)
413 if fail:
414 self.assertFalse(parsed.valid)
415 return
416 self.assertTrue(parsed.valid)
417 self.assertEqual(parsed.issue, issue)
418 self.assertEqual(parsed.patchset, patchset)
419 self.assertEqual(parsed.hostname, hostname)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200420
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000421 def test_basic(self):
422 self._test('123', 123)
423 self._test('', fail=True)
424 self._test('abc', fail=True)
425 self._test('123/1', fail=True)
426 self._test('123a', fail=True)
427 self._test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
428 self._test('ssh://chrome-review.source.com/c/123/1/', fail=True)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200429
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000430 def test_gerrit_url(self):
431 self._test('https://codereview.source.com/123', 123, None,
432 'codereview.source.com')
433 self._test('http://chrome-review.source.com/c/123', 123, None,
434 'chrome-review.source.com')
435 self._test('https://chrome-review.source.com/c/123/', 123, None,
436 'chrome-review.source.com')
437 self._test('https://chrome-review.source.com/c/123/4', 123, 4,
438 'chrome-review.source.com')
439 self._test('https://chrome-review.source.com/#/c/123/4', 123, 4,
440 'chrome-review.source.com')
441 self._test('https://chrome-review.source.com/c/123/4', 123, 4,
442 'chrome-review.source.com')
443 self._test('https://chrome-review.source.com/123', 123, None,
444 'chrome-review.source.com')
445 self._test('https://chrome-review.source.com/123/4', 123, 4,
446 'chrome-review.source.com')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200447
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000448 self._test('https://chrome-review.source.com/bad/123/4', fail=True)
449 self._test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
450 self._test('https://chrome-review.source.com/c/abc/', fail=True)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200451
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000452 def test_short_urls(self):
453 self._test('https://crrev.com/c/2151934', 2151934, None,
454 'chromium-review.googlesource.com')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200455
456
Edward Lemurda4b6c62020-02-13 00:28:40 +0000457class GitCookiesCheckerTest(unittest.TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100458 def setUp(self):
459 super(GitCookiesCheckerTest, self).setUp()
460 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100461 self.c._all_hosts = []
Edward Lemurda4b6c62020-02-13 00:28:40 +0000462 mock.patch('sys.stdout', StringIO()).start()
463 self.addCleanup(mock.patch.stopall)
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100464
465 def mock_hosts_creds(self, subhost_identity_pairs):
466 def ensure_googlesource(h):
467 if not h.endswith(self.c._GOOGLESOURCE):
468 assert not h.endswith('.')
469 return h + '.' + self.c._GOOGLESOURCE
470 return h
471 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
472 for h, i in subhost_identity_pairs]
473
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200474 def test_identity_parsing(self):
475 self.assertEqual(self.c._parse_identity('ldap.google.com'),
476 ('ldap', 'google.com'))
477 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
478 ('ldap', 'example.com'))
479 # Specical case because we know there are no subdomains in chromium.org.
480 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
481 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800482 # Pathological: ".period." can be either username OR domain, more likely
483 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200484 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
485 ('note', 'period.example.com'))
486
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100487 def test_analysis_nothing(self):
488 self.c._all_hosts = []
489 self.assertFalse(self.c.has_generic_host())
490 self.assertEqual(set(), self.c.get_conflicting_hosts())
491 self.assertEqual(set(), self.c.get_duplicated_hosts())
492 self.assertEqual(set(), self.c.get_partially_configured_hosts())
493 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
494
495 def test_analysis(self):
496 self.mock_hosts_creds([
497 ('.googlesource.com', 'git-example.chromium.org'),
498
499 ('chromium', 'git-example.google.com'),
500 ('chromium-review', 'git-example.google.com'),
501 ('chrome-internal', 'git-example.chromium.org'),
502 ('chrome-internal-review', 'git-example.chromium.org'),
503 ('conflict', 'git-example.google.com'),
504 ('conflict-review', 'git-example.chromium.org'),
505 ('dup', 'git-example.google.com'),
506 ('dup', 'git-example.google.com'),
507 ('dup-review', 'git-example.google.com'),
508 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200509 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100510 ])
511 self.assertTrue(self.c.has_generic_host())
512 self.assertEqual(set(['conflict.googlesource.com']),
513 self.c.get_conflicting_hosts())
514 self.assertEqual(set(['dup.googlesource.com']),
515 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200516 self.assertEqual(set(['partial.googlesource.com',
517 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100518 self.c.get_partially_configured_hosts())
519 self.assertEqual(set(['chromium.googlesource.com',
520 'chrome-internal.googlesource.com']),
521 self.c.get_hosts_with_wrong_identities())
522
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100523 def test_report_no_problems(self):
524 self.test_analysis_nothing()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100525 self.assertFalse(self.c.find_and_report_problems())
526 self.assertEqual(sys.stdout.getvalue(), '')
527
Edward Lemurda4b6c62020-02-13 00:28:40 +0000528 @mock.patch(
529 'git_cl.gerrit_util.CookiesAuthenticator.get_gitcookies_path',
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000530 return_value=os.path.join('~', '.gitcookies'))
Edward Lemurda4b6c62020-02-13 00:28:40 +0000531 def test_report(self, *_mocks):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100532 self.test_analysis()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100533 self.assertTrue(self.c.find_and_report_problems())
534 with open(os.path.join(os.path.dirname(__file__),
535 'git_cl_creds_check_report.txt')) as f:
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000536 expected = f.read() % {
537 'sep': os.sep,
538 }
539
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100540 def by_line(text):
541 return [l.rstrip() for l in text.rstrip().splitlines()]
Robert Iannucci456b0d62018-03-13 19:15:50 -0700542 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200543 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100544
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800545
Edward Lemurda4b6c62020-02-13 00:28:40 +0000546class TestGitCl(unittest.TestCase):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000547 def setUp(self):
548 super(TestGitCl, self).setUp()
549 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700550 self._calls_done = []
Edward Lesmes0dd54822020-03-26 18:24:25 +0000551 self.failed = False
Edward Lemurda4b6c62020-02-13 00:28:40 +0000552 mock.patch('sys.stdout', StringIO()).start()
553 mock.patch(
554 'git_cl.time_time',
555 lambda: self._mocked_call('time.time')).start()
556 mock.patch(
557 'git_cl.metrics.collector.add_repeated',
558 lambda *a: self._mocked_call('add_repeated', *a)).start()
559 mock.patch('subprocess2.call', self._mocked_call).start()
560 mock.patch('subprocess2.check_call', self._mocked_call).start()
561 mock.patch('subprocess2.check_output', self._mocked_call).start()
562 mock.patch(
563 'subprocess2.communicate',
564 lambda *a, **_k: ([self._mocked_call(*a), ''], 0)).start()
565 mock.patch(
566 'git_cl.gclient_utils.CheckCallAndFilter',
567 self._mocked_call).start()
568 mock.patch('git_common.is_dirty_git_tree', lambda x: False).start()
569 mock.patch(
570 'git_common.get_or_create_merge_base',
571 lambda *a: self._mocked_call('get_or_create_merge_base', *a)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +0000572 mock.patch('git_cl.FindCodereviewSettingsFile', return_value='').start()
573 mock.patch(
574 'git_cl.SaveDescriptionBackup',
575 lambda _: self._mocked_call('SaveDescriptionBackup')).start()
576 mock.patch(
Edward Lemurda4b6c62020-02-13 00:28:40 +0000577 'git_cl.write_json',
578 lambda *a: self._mocked_call('write_json', *a)).start()
579 mock.patch(
Edward Lemur227d5102020-02-25 23:45:35 +0000580 'git_cl.Changelist.RunHook',
581 return_value={'more_cc': ['test-more-cc@chromium.org']}).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +0000582 mock.patch('git_cl.watchlists.Watchlists', WatchlistsMock).start()
583 mock.patch('git_cl.auth.Authenticator', AuthenticatorMock).start()
Edward Lesmes7677e5c2020-02-19 20:39:03 +0000584 mock.patch('gerrit_util.GetChangeDetail').start()
Edward Lemurda4b6c62020-02-13 00:28:40 +0000585 mock.patch(
586 'git_cl.gerrit_util.GetChangeComments',
587 lambda *a: self._mocked_call('GetChangeComments', *a)).start()
588 mock.patch(
589 'git_cl.gerrit_util.GetChangeRobotComments',
590 lambda *a: self._mocked_call('GetChangeRobotComments', *a)).start()
591 mock.patch(
592 'git_cl.gerrit_util.AddReviewers',
593 lambda *a: self._mocked_call('AddReviewers', *a)).start()
594 mock.patch(
595 'git_cl.gerrit_util.SetReview',
596 lambda h, i, msg=None, labels=None, notify=None, ready=None: (
597 self._mocked_call(
598 'SetReview', h, i, msg, labels, notify, ready))).start()
599 mock.patch(
600 'git_cl.gerrit_util.LuciContextAuthenticator.is_luci',
601 return_value=False).start()
602 mock.patch(
603 'git_cl.gerrit_util.GceAuthenticator.is_gce',
604 return_value=False).start()
605 mock.patch(
606 'git_cl.gerrit_util.ValidAccounts',
607 lambda *a: self._mocked_call('ValidAccounts', *a)).start()
Edward Lemurd55c5072020-02-20 01:09:07 +0000608 mock.patch('sys.exit', side_effect=SystemExitMock).start()
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000609 mock.patch('git_cl.Settings.GetRoot', return_value='').start()
Edward Lemur85153282020-02-14 22:06:29 +0000610 self.mockGit = GitMocks()
611 mock.patch('scm.GIT.GetBranchRef', self.mockGit.GetBranchRef).start()
612 mock.patch('scm.GIT.GetConfig', self.mockGit.GetConfig).start()
Edward Lesmes50da7702020-03-30 19:23:43 +0000613 mock.patch('scm.GIT.ResolveCommit', return_value='hash').start()
614 mock.patch('scm.GIT.IsValidRevision', return_value=True).start()
Edward Lemur85153282020-02-14 22:06:29 +0000615 mock.patch('scm.GIT.SetConfig', self.mockGit.SetConfig).start()
Edward Lemur84101642020-02-21 21:40:34 +0000616 mock.patch(
617 'git_new_branch.create_new_branch', self.mockGit.NewBranch).start()
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000618 mock.patch(
Edward Lemur85153282020-02-14 22:06:29 +0000619 'scm.GIT.FetchUpstreamTuple',
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000620 return_value=('origin', 'refs/heads/master')).start()
Edward Lemur85153282020-02-14 22:06:29 +0000621 mock.patch(
622 'scm.GIT.CaptureStatus', return_value=[('M', 'foo.txt')]).start()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000623 # It's important to reset settings to not have inter-tests interference.
624 git_cl.settings = None
Edward Lemurda4b6c62020-02-13 00:28:40 +0000625 self.addCleanup(mock.patch.stopall)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000626
627 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000628 try:
Edward Lesmes0dd54822020-03-26 18:24:25 +0000629 if not self.failed:
630 self.assertEqual([], self.calls)
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100631 except AssertionError:
Edward Lemur85153282020-02-14 22:06:29 +0000632 calls = ''.join(' %s\n' % str(call) for call in self.calls[:5])
633 if len(self.calls) > 5:
634 calls += ' ...\n'
635 self.fail(
636 '\n'
637 'There are un-consumed calls after this test has finished:\n' +
638 calls)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000639 finally:
640 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000641
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000642 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000643 self.assertTrue(
644 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700645 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000646 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000647 expected_args, result = top
648
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000649 # Also logs otherwise it could get caught in a try/finally and be hard to
650 # diagnose.
651 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700652 N = 5
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000653 prior_calls = '\n '.join(
tandrii9d206752016-06-20 11:32:47 -0700654 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
655 for i, c in enumerate(self._calls_done[-N:]))
656 following_calls = '\n '.join(
657 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
658 for i, c in enumerate(self.calls[:N]))
659 extended_msg = (
660 'A few prior calls:\n %s\n\n'
661 'This (expected):\n @%d: %r\n'
662 'This (actual):\n @%d: %r\n\n'
663 'A few following expected calls:\n %s' %
664 (prior_calls, len(self._calls_done), expected_args,
665 len(self._calls_done), args, following_calls))
tandrii9d206752016-06-20 11:32:47 -0700666
Edward Lesmes0dd54822020-03-26 18:24:25 +0000667 self.failed = True
tandrii99a72f22016-08-17 14:33:24 -0700668 self.fail('@%d\n'
669 ' Expected: %r\n'
Edward Lemur26964072020-02-19 19:18:51 +0000670 ' Actual: %r\n'
671 '\n'
672 '%s' % (
673 len(self._calls_done), expected_args, args, extended_msg))
tandrii9d206752016-06-20 11:32:47 -0700674
675 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700676 if isinstance(result, Exception):
677 raise result
Edward Lemur0db01f02019-11-12 22:01:51 +0000678 # stdout from git commands is supposed to be a bytestream. Convert it here
679 # instead of converting all test output in this file to bytes.
680 if args[0][0] == 'git' and not isinstance(result, bytes):
681 result = result.encode('utf-8')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000682 return result
683
Edward Lemur1a83da12020-03-04 21:18:36 +0000684 @mock.patch('sys.stdin', StringIO('blah\nye\n'))
685 @mock.patch('sys.stdout', StringIO())
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100686 def test_ask_for_explicit_yes_true(self):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100687 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
Edward Lemur1a83da12020-03-04 21:18:36 +0000688 self.assertEqual(
689 'prompt [Yes/No]: Please, type yes or no: ',
690 sys.stdout.getvalue())
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100691
tandrii48df5812016-10-17 03:55:37 -0700692 def test_LoadCodereviewSettingsFromFile_gerrit(self):
Edward Lemur79d4f992019-11-11 23:49:02 +0000693 codereview_file = StringIO('GERRIT_HOST: true')
tandrii48df5812016-10-17 03:55:37 -0700694 self.calls = [
695 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700696 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
697 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
698 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
699 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700700 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
701 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700702 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
703 CERR1),
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000704 ((['git', 'config', '--unset-all', 'rietveld.format-full-by-default'],),
705 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700706 ((['git', 'config', 'gerrit.host', 'true'],), ''),
707 ]
708 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
709
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000710 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100711 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200712 fetched_status=None, other_cl_owner=None,
Anthony Polito8b955342019-09-24 19:01:36 +0000713 custom_cl_base=None, short_hostname='chromium',
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000714 change_id=None, new_default=False):
Edward Lemur26964072020-02-19 19:18:51 +0000715 calls = []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200716 if custom_cl_base:
717 ancestor_revision = custom_cl_base
718 else:
719 # Determine ancestor_revision to be merge base.
720 ancestor_revision = 'fake_ancestor_sha'
721 calls += [
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000722 (('get_or_create_merge_base', 'master',
723 'refs/remotes/origin/master'), ancestor_revision),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200724 ]
725
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100726 if issue:
Edward Lesmes7677e5c2020-02-19 20:39:03 +0000727 gerrit_util.GetChangeDetail.return_value = {
728 'owner': {'email': (other_cl_owner or 'owner@example.com')},
729 'change_id': (change_id or '123456789'),
730 'current_revision': 'sha1_of_current_revision',
731 'revisions': {'sha1_of_current_revision': {
732 'commit': {'message': fetched_description},
733 }},
734 'status': fetched_status or 'NEW',
735 }
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100736 if fetched_status == 'ABANDONED':
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100737 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100738 if other_cl_owner:
739 calls += [
740 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
741 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100742
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100743 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200744 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
745 ([custom_cl_base] if custom_cl_base else
746 [ancestor_revision, 'HEAD']),),
747 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100748 ]
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000749 calls += [
750 ((['git', 'show-branch', 'refs/remotes/origin/main'], ),
751 '1' if new_default else callError(1)),
752 ]
Edward Lemur2c62b332020-03-12 22:12:33 +0000753
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100754 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +0000755
Edward Lemur26964072020-02-19 19:18:51 +0000756 def _gerrit_upload_calls(self, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700757 squash_mode='default',
Aaron Gablefd238082017-06-07 13:42:34 -0700758 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +0100759 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000760 custom_cl_base=None, tbr=None,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +0000761 short_hostname='chromium',
Edward Lemur5a644f82020-03-18 16:44:57 +0000762 labels=None, change_id=None,
Anthony Polito8b955342019-09-24 19:01:36 +0000763 final_description=None, gitcookies_exists=True,
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000764 force=False, edit_description=None,
765 new_default=False):
766 default_branch = 'main' if new_default else 'master';
tandrii@chromium.org10625002016-03-04 20:03:47 +0000767 if post_amend_description is None:
768 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -0700769 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200770
771 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000772
Edward Lesmes4de54132020-05-05 19:41:33 +0000773 if squash_mode in ('override_squash', 'override_nosquash'):
774 self.mockGit.config['gerrit.override-squash-uploads'] = (
775 'true' if squash_mode == 'override_squash' else 'false')
776
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000777 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000778 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200779 (('DownloadGerritHook', False), ''),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200780 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000781 if squash:
Edward Lemur5a644f82020-03-18 16:44:57 +0000782 if not issue and not force:
Edward Lemur5fb22242020-03-12 22:05:13 +0000783 calls += [
784 ((['RunEditor'],), description),
785 ]
Josipe827b0f2020-01-30 00:07:20 +0000786 # user wants to edit description
787 if edit_description:
788 calls += [
Josipe827b0f2020-01-30 00:07:20 +0000789 ((['RunEditor'],), edit_description),
790 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000791 ref_to_push = 'abcdef0123456789'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200792
793 if custom_cl_base is None:
794 calls += [
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000795 (('get_or_create_merge_base', 'master',
796 'refs/remotes/origin/master'), 'origin/' + default_branch),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200797 ]
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000798 parent = 'origin/' + default_branch
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200799 else:
800 calls += [
801 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000802 'refs/remotes/origin/' + default_branch],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200803 callError(1)), # Means not ancenstor.
804 (('ask_for_data',
805 'Do you take responsibility for cleaning up potential mess '
806 'resulting from proceeding with upload? Press Enter to upload, '
807 'or Ctrl+C to abort'), ''),
808 ]
809 parent = custom_cl_base
810
811 calls += [
812 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
813 '0123456789abcdef'),
Edward Lemur1773f372020-02-22 00:27:14 +0000814 ((['FileWrite', '/tmp/fake-temp1', description],), None),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200815 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Edward Lemur1773f372020-02-22 00:27:14 +0000816 '-F', '/tmp/fake-temp1'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200817 ref_to_push),
818 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000819 else:
820 ref_to_push = 'HEAD'
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000821 parent = 'origin/refs/heads/' + default_branch
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000822
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000823 calls += [
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000824 (('SaveDescriptionBackup',), None),
Edward Lemur5a644f82020-03-18 16:44:57 +0000825 ((['git', 'rev-list', parent + '..' + ref_to_push],),'1hashPerLine\n'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200826 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000827
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000828 metrics_arguments = []
829
Aaron Gableafd52772017-06-27 16:40:10 -0700830 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -0700831 ref_suffix = '%ready,notify=ALL'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000832 metrics_arguments += ['ready', 'notify=ALL']
Aaron Gable844cf292017-06-28 11:32:59 -0700833 else:
Jamie Madill276da0b2018-04-27 14:41:20 -0400834 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -0700835 ref_suffix = '%wip'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000836 metrics_arguments.append('wip')
Aaron Gable844cf292017-06-28 11:32:59 -0700837 else:
838 ref_suffix = '%notify=NONE'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000839 metrics_arguments.append('notify=NONE')
Aaron Gable9b713dd2016-12-14 16:04:21 -0800840
Edward Lemur5a644f82020-03-18 16:44:57 +0000841 # If issue is given, then description is fetched from Gerrit instead.
842 if issue is None:
843 if squash:
844 title = 'Initial upload'
845 else:
846 if not title:
847 calls += [
848 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
849 (('ask_for_data', 'Title for patchset []: '), 'User input'),
850 ]
851 title = 'User input'
Aaron Gable70f4e242017-06-26 10:45:59 -0700852 if title:
Edward Lemur5a644f82020-03-18 16:44:57 +0000853 ref_suffix += ',m=' + gerrit_util.PercentEncodeForGitRef(title)
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000854 metrics_arguments.append('m')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000855
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000856 if short_hostname == 'chromium':
Quinten Yearsley925cedb2020-04-13 17:49:39 +0000857 # All reviewers and ccs get into ref_suffix.
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000858 for r in sorted(reviewers):
859 ref_suffix += ',r=%s' % r
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000860 metrics_arguments.append('r')
Edward Lemur4508b422019-10-03 21:56:35 +0000861 if issue is None:
Edward Lemur227d5102020-02-25 23:45:35 +0000862 cc += ['test-more-cc@chromium.org', 'joe@example.com']
Edward Lemur4508b422019-10-03 21:56:35 +0000863 for c in sorted(cc):
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000864 ref_suffix += ',cc=%s' % c
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000865 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000866 reviewers, cc = [], []
867 else:
868 # TODO(crbug/877717): remove this case.
869 calls += [
870 (('ValidAccounts', '%s-review.googlesource.com' % short_hostname,
871 sorted(reviewers) + ['joe@example.com',
Edward Lemur227d5102020-02-25 23:45:35 +0000872 'test-more-cc@chromium.org'] + cc),
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000873 {
874 e: {'email': e}
875 for e in (reviewers + ['joe@example.com'] + cc)
876 })
877 ]
878 for r in sorted(reviewers):
879 if r != 'bad-account-or-email':
880 ref_suffix += ',r=%s' % r
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000881 metrics_arguments.append('r')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000882 reviewers.remove(r)
Edward Lemur4508b422019-10-03 21:56:35 +0000883 if issue is None:
884 cc += ['joe@example.com']
885 for c in sorted(cc):
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000886 ref_suffix += ',cc=%s' % c
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000887 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000888 if c in cc:
889 cc.remove(c)
Andrii Shyshkalov76988a82018-10-15 03:12:25 +0000890
Edward Lemur687ca902018-12-05 02:30:30 +0000891 for k, v in sorted((labels or {}).items()):
892 ref_suffix += ',l=%s+%d' % (k, v)
893 metrics_arguments.append('l=%s+%d' % (k, v))
894
895 if tbr:
896 calls += [
897 (('GetCodeReviewTbrScore',
898 '%s-review.googlesource.com' % short_hostname,
899 'my/repo'),
900 2,),
901 ]
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +0000902
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000903 calls += [
904 (('time.time',), 1000,),
905 ((['git', 'push',
906 'https://%s.googlesource.com/my/repo' % short_hostname,
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000907 ref_to_push + ':refs/for/refs/heads/' + default_branch + ref_suffix],),
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000908 (('remote:\n'
909 'remote: Processing changes: (\)\n'
910 'remote: Processing changes: (|)\n'
911 'remote: Processing changes: (/)\n'
912 'remote: Processing changes: (-)\n'
913 'remote: Processing changes: new: 1 (/)\n'
914 'remote: Processing changes: new: 1, done\n'
915 'remote:\n'
916 'remote: New Changes:\n'
917 'remote: https://%s-review.googlesource.com/#/c/my/repo/+/123456'
918 ' XXX\n'
919 'remote:\n'
920 'To https://%s.googlesource.com/my/repo\n'
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000921 ' * [new branch] hhhh -> refs/for/refs/heads/%s\n'
922 ) % (short_hostname, short_hostname, default_branch)),),
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000923 (('time.time',), 2000,),
924 (('add_repeated',
925 'sub_commands',
926 {
927 'execution_time': 1000,
928 'command': 'git push',
929 'exit_code': 0,
930 'arguments': sorted(metrics_arguments),
931 }),
932 None,),
933 ]
934
Edward Lemur1b52d872019-05-09 21:12:12 +0000935 final_description = final_description or post_amend_description.strip()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000936
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000937 trace_name = os.path.join('TRACES_DIR', '20170316T200041.000000')
938
Edward Lemur1b52d872019-05-09 21:12:12 +0000939 # Trace-related calls
940 calls += [
941 # Write a description with context for the current trace.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000942 (
943 ([
944 'FileWrite', trace_name + '-README',
945 '%(date)s\n'
946 '%(short_hostname)s-review.googlesource.com\n'
947 '%(change_id)s\n'
948 '%(title)s\n'
949 '%(description)s\n'
950 '1000\n'
951 '0\n'
952 '%(trace_name)s' % {
Josip Sokcevic5e18b602020-04-23 21:47:00 +0000953 'date': '2017-03-16T20:00:41.000000',
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000954 'short_hostname': short_hostname,
955 'change_id': change_id,
956 'description': final_description,
957 'title': title or '<untitled>',
958 'trace_name': trace_name,
959 }
960 ], ),
961 None,
Edward Lemur1b52d872019-05-09 21:12:12 +0000962 ),
963 # Read traces and shorten git hashes.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000964 (
965 (['os.path.isfile',
966 os.path.join('TEMP_DIR', 'trace-packet')], ),
967 True,
Edward Lemur1b52d872019-05-09 21:12:12 +0000968 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000969 (
970 (['FileRead', os.path.join('TEMP_DIR', 'trace-packet')], ),
971 ('git-hash: 0123456789012345678901234567890123456789\n'
972 'git-hash: abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde\n'),
Edward Lemur1b52d872019-05-09 21:12:12 +0000973 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000974 (
975 ([
976 'FileWrite',
977 os.path.join('TEMP_DIR', 'trace-packet'), 'git-hash: 012345\n'
978 'git-hash: abcdea\n'
979 ], ),
980 None,
Edward Lemur1b52d872019-05-09 21:12:12 +0000981 ),
982 # Make zip file for the git traces.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000983 (
984 (['make_archive', trace_name + '-traces', 'zip', 'TEMP_DIR'], ),
985 None,
Edward Lemur1b52d872019-05-09 21:12:12 +0000986 ),
987 # Collect git config and gitcookies.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000988 (
989 (['git', 'config', '-l'], ),
990 'git-config-output',
Edward Lemur1b52d872019-05-09 21:12:12 +0000991 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000992 (
993 ([
994 'FileWrite',
995 os.path.join('TEMP_DIR', 'git-config'), 'git-config-output'
996 ], ),
997 None,
Edward Lemur1b52d872019-05-09 21:12:12 +0000998 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000999 (
1000 (['os.path.isfile',
1001 os.path.join('~', '.gitcookies')], ),
1002 gitcookies_exists,
Edward Lemur1b52d872019-05-09 21:12:12 +00001003 ),
1004 ]
1005 if gitcookies_exists:
1006 calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001007 (
1008 (['FileRead', os.path.join('~', '.gitcookies')], ),
1009 'gitcookies 1/SECRET',
Edward Lemur1b52d872019-05-09 21:12:12 +00001010 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001011 (
1012 ([
1013 'FileWrite',
1014 os.path.join('TEMP_DIR', 'gitcookies'), 'gitcookies REDACTED'
1015 ], ),
1016 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001017 ),
1018 ]
1019 calls += [
1020 # Make zip file for the git config and gitcookies.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001021 (
1022 (['make_archive', trace_name + '-git-info', 'zip', 'TEMP_DIR'], ),
1023 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001024 ),
1025 ]
1026
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001027 # TODO(crbug/877717): this should never be used.
1028 if squash and short_hostname != 'chromium':
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001029 calls += [
1030 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001031 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001032 sorted(reviewers),
Edward Lemur227d5102020-02-25 23:45:35 +00001033 cc + ['test-more-cc@chromium.org'],
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00001034 notify),
1035 ''),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001036 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001037 return calls
1038
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001039 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001040 self,
1041 upload_args,
1042 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001043 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001044 squash=True,
1045 squash_mode=None,
Aaron Gable9b713dd2016-12-14 16:04:21 -08001046 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001047 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001048 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001049 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001050 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001051 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001052 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001053 custom_cl_base=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001054 tbr=None,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001055 short_hostname='chromium',
Edward Lemur1b52d872019-05-09 21:12:12 +00001056 labels=None,
1057 change_id=None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001058 final_description=None,
Anthony Polito8b955342019-09-24 19:01:36 +00001059 gitcookies_exists=True,
1060 force=False,
Edward Lesmes0dd54822020-03-26 18:24:25 +00001061 log_description=None,
Josipe827b0f2020-01-30 00:07:20 +00001062 edit_description=None,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001063 fetched_description=None,
1064 new_default=False):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001065 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001066 if squash_mode is None:
1067 if '--no-squash' in upload_args:
1068 squash_mode = 'nosquash'
1069 elif '--squash' in upload_args:
1070 squash_mode = 'squash'
1071 else:
1072 squash_mode = 'default'
1073
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001074 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001075 cc = cc or []
Edward Lemurda4b6c62020-02-13 00:28:40 +00001076 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001077 CookiesAuthenticatorMockFactory(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001078 same_auth=('git-owner.example.com', '', 'pass'))).start()
1079 mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck',
1080 lambda _, offer_removal: None).start()
1081 mock.patch('git_cl.gclient_utils.RunEditor',
1082 lambda *_, **__: self._mocked_call(['RunEditor'])).start()
1083 mock.patch('git_cl.DownloadGerritHook', lambda force: self._mocked_call(
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001084 'DownloadGerritHook', force)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00001085 mock.patch('git_cl.gclient_utils.FileRead',
1086 lambda path: self._mocked_call(['FileRead', path])).start()
1087 mock.patch('git_cl.gclient_utils.FileWrite',
Edward Lemur1b52d872019-05-09 21:12:12 +00001088 lambda path, contents: self._mocked_call(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001089 ['FileWrite', path, contents])).start()
1090 mock.patch('git_cl.datetime_now',
1091 lambda: datetime.datetime(2017, 3, 16, 20, 0, 41, 0)).start()
1092 mock.patch('git_cl.tempfile.mkdtemp', lambda: 'TEMP_DIR').start()
1093 mock.patch('git_cl.TRACES_DIR', 'TRACES_DIR').start()
1094 mock.patch('git_cl.TRACES_README_FORMAT',
Edward Lemur75391d42019-05-14 23:35:56 +00001095 '%(now)s\n'
1096 '%(gerrit_host)s\n'
1097 '%(change_id)s\n'
1098 '%(title)s\n'
1099 '%(description)s\n'
1100 '%(execution_time)s\n'
1101 '%(exit_code)s\n'
Edward Lemurda4b6c62020-02-13 00:28:40 +00001102 '%(trace_name)s').start()
1103 mock.patch('git_cl.shutil.make_archive',
1104 lambda *args: self._mocked_call(['make_archive'] +
1105 list(args))).start()
1106 mock.patch('os.path.isfile',
1107 lambda path: self._mocked_call(['os.path.isfile', path])).start()
Edward Lemur9aa1a962020-02-25 00:58:38 +00001108 mock.patch(
Edward Lesmes0dd54822020-03-26 18:24:25 +00001109 'git_cl._create_description_from_log',
1110 return_value=log_description or description).start()
Edward Lemura12175c2020-03-09 16:58:26 +00001111 mock.patch(
1112 'git_cl.Changelist._AddChangeIdToCommitMessage',
1113 return_value=post_amend_description or description).start()
Edward Lemur1a83da12020-03-04 21:18:36 +00001114 mock.patch(
Edward Lemur5a644f82020-03-18 16:44:57 +00001115 'git_cl.GenerateGerritChangeId', return_value=change_id).start()
1116 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00001117 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00001118 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
tandriia60502f2016-06-20 02:01:53 -07001119
Edward Lemur26964072020-02-19 19:18:51 +00001120 self.mockGit.config['gerrit.host'] = 'true'
Edward Lemur85153282020-02-14 22:06:29 +00001121 self.mockGit.config['branch.master.gerritissue'] = (
1122 str(issue) if issue else None)
1123 self.mockGit.config['remote.origin.url'] = (
1124 'https://%s.googlesource.com/my/repo' % short_hostname)
Edward Lemur9aa1a962020-02-25 00:58:38 +00001125 self.mockGit.config['user.email'] = 'me@example.com'
Edward Lemur85153282020-02-14 22:06:29 +00001126
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001127 self.calls = self._gerrit_base_calls(
1128 issue=issue,
Anthony Polito8b955342019-09-24 19:01:36 +00001129 fetched_description=fetched_description or description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001130 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001131 other_cl_owner=other_cl_owner,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001132 custom_cl_base=custom_cl_base,
Anthony Polito8b955342019-09-24 19:01:36 +00001133 short_hostname=short_hostname,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001134 change_id=change_id,
1135 new_default=new_default)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001136 if fetched_status != 'ABANDONED':
Edward Lemurda4b6c62020-02-13 00:28:40 +00001137 mock.patch(
Edward Lemur1773f372020-02-22 00:27:14 +00001138 'gclient_utils.temporary_file', TemporaryFileMock()).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00001139 mock.patch('os.remove', return_value=True).start()
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001140 self.calls += self._gerrit_upload_calls(
1141 description, reviewers, squash,
1142 squash_mode=squash_mode,
Aaron Gablefd238082017-06-07 13:42:34 -07001143 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001144 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001145 issue=issue, cc=cc,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001146 custom_cl_base=custom_cl_base, tbr=tbr,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001147 short_hostname=short_hostname,
Edward Lemur1b52d872019-05-09 21:12:12 +00001148 labels=labels,
1149 change_id=change_id,
Edward Lemur1b52d872019-05-09 21:12:12 +00001150 final_description=final_description,
Anthony Polito8b955342019-09-24 19:01:36 +00001151 gitcookies_exists=gitcookies_exists,
Josipe827b0f2020-01-30 00:07:20 +00001152 force=force,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001153 edit_description=edit_description,
1154 new_default=new_default)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001155 # Uncomment when debugging.
Raul Tambre80ee78e2019-05-06 22:41:05 +00001156 # print('\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001157 git_cl.main(['upload'] + upload_args)
Edward Lemur85153282020-02-14 22:06:29 +00001158 if squash:
Edward Lemur26964072020-02-19 19:18:51 +00001159 self.assertIssueAndPatchset(patchset=None)
Edward Lemur85153282020-02-14 22:06:29 +00001160 self.assertEqual(
1161 'abcdef0123456789',
Edward Lemur26964072020-02-19 19:18:51 +00001162 scm.GIT.GetBranchConfig('', 'master', 'gerritsquashhash'))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001163
Edward Lemur1b52d872019-05-09 21:12:12 +00001164 def test_gerrit_upload_traces_no_gitcookies(self):
1165 self._run_gerrit_upload_test(
1166 ['--no-squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001167 'desc ✔\n\nBUG=\n',
Edward Lemur1b52d872019-05-09 21:12:12 +00001168 [],
1169 squash=False,
Edward Lemur0db01f02019-11-12 22:01:51 +00001170 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001171 change_id='Ixxx',
1172 gitcookies_exists=False)
1173
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001174 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001175 self._run_gerrit_upload_test(
Edward Lemur5a644f82020-03-18 16:44:57 +00001176 [],
1177 'desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
1178 [],
1179 change_id='Ixxx')
1180
1181 def test_gerrit_upload_without_change_id_nosquash(self):
1182 self._run_gerrit_upload_test(
tandriia60502f2016-06-20 02:01:53 -07001183 ['--no-squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001184 'desc ✔\n\nBUG=\n',
tandriia60502f2016-06-20 02:01:53 -07001185 [],
1186 squash=False,
Edward Lemur0db01f02019-11-12 22:01:51 +00001187 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001188 change_id='Ixxx')
tandriia60502f2016-06-20 02:01:53 -07001189
Edward Lesmes4de54132020-05-05 19:41:33 +00001190 def test_gerrit_upload_without_change_id_override_nosquash(self):
1191 self._run_gerrit_upload_test(
1192 [],
1193 'desc ✔\n\nBUG=\n',
1194 [],
1195 squash=False,
1196 squash_mode='override_nosquash',
1197 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
1198 change_id='Ixxx')
1199
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001200 def test_gerrit_no_reviewer(self):
1201 self._run_gerrit_upload_test(
Edward Lesmes4de54132020-05-05 19:41:33 +00001202 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001203 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001204 [],
1205 squash=False,
Edward Lesmes4de54132020-05-05 19:41:33 +00001206 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001207 change_id='I123456789')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001208
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001209 def test_gerrit_no_reviewer_non_chromium_host(self):
1210 # TODO(crbug/877717): remove this test case.
1211 self._run_gerrit_upload_test(
Edward Lesmes4de54132020-05-05 19:41:33 +00001212 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001213 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001214 [],
1215 squash=False,
Edward Lesmes4de54132020-05-05 19:41:33 +00001216 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001217 short_hostname='other',
1218 change_id='I123456789')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001219
Edward Lesmes0dd54822020-03-26 18:24:25 +00001220 def test_gerrit_patchset_title_special_chars_nosquash(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001221 self._run_gerrit_upload_test(
Edward Lesmes4de54132020-05-05 19:41:33 +00001222 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001223 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001224 squash=False,
Edward Lesmes4de54132020-05-05 19:41:33 +00001225 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001226 change_id='I123456789',
Edward Lemur5a644f82020-03-18 16:44:57 +00001227 title='We\'ll escape ^_ ^ special chars...@{u}')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001228
ukai@chromium.orge8077812012-02-03 03:41:46 +00001229 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001230 self._run_gerrit_upload_test(
Edward Lesmes4de54132020-05-05 19:41:33 +00001231 ['-r', 'foo@example.com', '--send-mail'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001232 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
Edward Lemur5a644f82020-03-18 16:44:57 +00001233 reviewers=['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001234 squash=False,
Edward Lesmes4de54132020-05-05 19:41:33 +00001235 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001236 notify=True,
1237 change_id='I123456789',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001238 final_description=(
Edward Lemur0db01f02019-11-12 22:01:51 +00001239 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001240
Anthony Polito8b955342019-09-24 19:01:36 +00001241 def test_gerrit_upload_force_sets_bug(self):
1242 self._run_gerrit_upload_test(
1243 ['-b', '10000', '-f'],
1244 u'desc=\n\nBug: 10000\nChange-Id: Ixxx',
1245 [],
1246 force=True,
Anthony Polito8b955342019-09-24 19:01:36 +00001247 fetched_description='desc=\n\nChange-Id: Ixxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001248 change_id='Ixxx')
1249
Edward Lemur5fb22242020-03-12 22:05:13 +00001250 def test_gerrit_upload_corrects_wrong_change_id(self):
Anthony Polito8b955342019-09-24 19:01:36 +00001251 self._run_gerrit_upload_test(
Edward Lemur5fb22242020-03-12 22:05:13 +00001252 ['-b', '10000', '-m', 'Title', '--edit-description'],
1253 u'desc=\n\nBug: 10000\nChange-Id: Ixxxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001254 [],
Anthony Polito8b955342019-09-24 19:01:36 +00001255 issue='123456',
Edward Lemur5fb22242020-03-12 22:05:13 +00001256 edit_description='desc=\n\nBug: 10000\nChange-Id: Izzzz',
Anthony Polito8b955342019-09-24 19:01:36 +00001257 fetched_description='desc=\n\nChange-Id: Ixxxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001258 title='Title',
Edward Lemur5fb22242020-03-12 22:05:13 +00001259 change_id='Ixxxx')
Anthony Polito8b955342019-09-24 19:01:36 +00001260
Dan Beamd8b04ca2019-10-10 21:23:26 +00001261 def test_gerrit_upload_force_sets_fixed(self):
1262 self._run_gerrit_upload_test(
1263 ['-x', '10000', '-f'],
1264 u'desc=\n\nFixed: 10000\nChange-Id: Ixxx',
1265 [],
1266 force=True,
Dan Beamd8b04ca2019-10-10 21:23:26 +00001267 fetched_description='desc=\n\nChange-Id: Ixxx',
Dan Beamd8b04ca2019-10-10 21:23:26 +00001268 change_id='Ixxx')
1269
ukai@chromium.orge8077812012-02-03 03:41:46 +00001270 def test_gerrit_reviewer_multiple(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001271 mock.patch('git_cl.gerrit_util.GetCodeReviewTbrScore',
1272 lambda *a: self._mocked_call('GetCodeReviewTbrScore', *a)).start()
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001273 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001274 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001275 'desc ✔\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
bradnelsond975b302016-10-23 12:20:23 -07001276 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001277 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001278 ['reviewer@example.com', 'another@example.com'],
Aaron Gablefd238082017-06-07 13:42:34 -07001279 cc=['more@example.com', 'people@example.com'],
Edward Lemur687ca902018-12-05 02:30:30 +00001280 tbr='reviewer@example.com',
Edward Lemur1b52d872019-05-09 21:12:12 +00001281 labels={'Code-Review': 2},
Edward Lemur5a644f82020-03-18 16:44:57 +00001282 change_id='123456789')
tandriia60502f2016-06-20 02:01:53 -07001283
1284 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001285 self._run_gerrit_upload_test(
1286 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001287 'desc ✔\nBUG=\n\nChange-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001288 [],
Edward Lemur5a644f82020-03-18 16:44:57 +00001289 change_id='123456789')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001290
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001291 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001292 self._run_gerrit_upload_test(
1293 ['--squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001294 'desc ✔\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001295 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001296 squash=True,
Edward Lemur5a644f82020-03-18 16:44:57 +00001297 change_id='123456789')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001298
Edward Lesmes0dd54822020-03-26 18:24:25 +00001299 def test_gerrit_upload_squash_first_title(self):
1300 self._run_gerrit_upload_test(
1301 ['-f', '-t', 'title'],
1302 'title\n\ndesc\n\nChange-Id: 123456789',
1303 [],
1304 force=True,
1305 squash=True,
1306 log_description='desc',
1307 change_id='123456789')
1308
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001309 def test_gerrit_upload_squash_first_with_labels(self):
1310 self._run_gerrit_upload_test(
1311 ['--squash', '--cq-dry-run', '--enable-auto-submit'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001312 'desc ✔\nBUG=\n\nChange-Id: 123456789',
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001313 [],
1314 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001315 labels={'Commit-Queue': 1, 'Auto-Submit': 1},
Edward Lemur5a644f82020-03-18 16:44:57 +00001316 change_id='123456789')
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001317
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001318 def test_gerrit_upload_squash_first_against_rev(self):
1319 custom_cl_base = 'custom_cl_base_rev_or_branch'
1320 self._run_gerrit_upload_test(
1321 ['--squash', custom_cl_base],
Edward Lemur0db01f02019-11-12 22:01:51 +00001322 'desc ✔\nBUG=\n\nChange-Id: 123456789',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001323 [],
1324 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001325 custom_cl_base=custom_cl_base,
Edward Lemur5a644f82020-03-18 16:44:57 +00001326 change_id='123456789')
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001327 self.assertIn(
1328 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1329 sys.stdout.getvalue())
1330
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001331 def test_gerrit_upload_squash_reupload(self):
Edward Lemur0db01f02019-11-12 22:01:51 +00001332 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001333 self._run_gerrit_upload_test(
1334 ['--squash'],
1335 description,
1336 [],
1337 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001338 issue=123456,
Edward Lemur5a644f82020-03-18 16:44:57 +00001339 change_id='123456789')
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001340
Edward Lemurd55c5072020-02-20 01:09:07 +00001341 @mock.patch('sys.stderr', StringIO())
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001342 def test_gerrit_upload_squash_reupload_to_abandoned(self):
Edward Lemur0db01f02019-11-12 22:01:51 +00001343 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001344 with self.assertRaises(SystemExitMock):
1345 self._run_gerrit_upload_test(
1346 ['--squash'],
1347 description,
1348 [],
1349 squash=True,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001350 issue=123456,
Edward Lemur1b52d872019-05-09 21:12:12 +00001351 fetched_status='ABANDONED',
1352 change_id='123456789')
Edward Lemurd55c5072020-02-20 01:09:07 +00001353 self.assertEqual(
1354 'Change https://chromium-review.googlesource.com/123456 has been '
1355 'abandoned, new uploads are not allowed\n',
1356 sys.stderr.getvalue())
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001357
Edward Lemurda4b6c62020-02-13 00:28:40 +00001358 @mock.patch(
1359 'gerrit_util.GetAccountDetails',
1360 return_value={'email': 'yet-another@example.com'})
1361 def test_gerrit_upload_squash_reupload_to_not_owned(self, _mock):
Edward Lemur0db01f02019-11-12 22:01:51 +00001362 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001363 self._run_gerrit_upload_test(
1364 ['--squash'],
1365 description,
1366 [],
1367 squash=True,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001368 issue=123456,
Edward Lemur1b52d872019-05-09 21:12:12 +00001369 other_cl_owner='other@example.com',
Edward Lemur5a644f82020-03-18 16:44:57 +00001370 change_id='123456789')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001371 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001372 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001373 'authenticate to Gerrit as yet-another@example.com.\n'
1374 'Uploading may fail due to lack of permissions',
Edward Lemurda4b6c62020-02-13 00:28:40 +00001375 sys.stdout.getvalue())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001376
Josipe827b0f2020-01-30 00:07:20 +00001377 def test_upload_change_description_editor(self):
1378 fetched_description = 'foo\n\nChange-Id: 123456789'
1379 description = 'bar\n\nChange-Id: 123456789'
1380 self._run_gerrit_upload_test(
1381 ['--squash', '--edit-description'],
1382 description,
1383 [],
1384 fetched_description=fetched_description,
1385 squash=True,
Josipe827b0f2020-01-30 00:07:20 +00001386 issue=123456,
1387 change_id='123456789',
Josipe827b0f2020-01-30 00:07:20 +00001388 edit_description=description)
1389
Edward Lemurda4b6c62020-02-13 00:28:40 +00001390 @mock.patch('git_cl.RunGit')
1391 @mock.patch('git_cl.CMDupload')
Edward Lemur1a83da12020-03-04 21:18:36 +00001392 @mock.patch('sys.stdin', StringIO('\n'))
1393 @mock.patch('sys.stdout', StringIO())
Edward Lemurda4b6c62020-02-13 00:28:40 +00001394 def test_upload_branch_deps(self, *_mocks):
rmistry@google.com2dd99862015-06-22 12:22:18 +00001395 def mock_run_git(*args, **_kwargs):
1396 if args[0] == ['for-each-ref',
1397 '--format=%(refname:short) %(upstream:short)',
1398 'refs/heads']:
1399 # Create a local branch dependency tree that looks like this:
1400 # test1 -> test2 -> test3 -> test4 -> test5
1401 # -> test3.1
1402 # test6 -> test0
1403 branch_deps = [
1404 'test2 test1', # test1 -> test2
1405 'test3 test2', # test2 -> test3
1406 'test3.1 test2', # test2 -> test3.1
1407 'test4 test3', # test3 -> test4
1408 'test5 test4', # test4 -> test5
1409 'test6 test0', # test0 -> test6
1410 'test7', # test7
1411 ]
1412 return '\n'.join(branch_deps)
Edward Lemurda4b6c62020-02-13 00:28:40 +00001413 git_cl.RunGit.side_effect = mock_run_git
1414 git_cl.CMDupload.return_value = 0
rmistry@google.com2dd99862015-06-22 12:22:18 +00001415
1416 class MockChangelist():
1417 def __init__(self):
1418 pass
1419 def GetBranch(self):
1420 return 'test1'
1421 def GetIssue(self):
1422 return '123'
1423 def GetPatchset(self):
1424 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001425 def IsGerrit(self):
1426 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001427
1428 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1429 # CMDupload should have been called 5 times because of 5 dependent branches.
Edward Lemurda4b6c62020-02-13 00:28:40 +00001430 self.assertEqual(5, len(git_cl.CMDupload.mock_calls))
Edward Lemur1a83da12020-03-04 21:18:36 +00001431 self.assertIn(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001432 'This command will checkout all dependent branches '
1433 'and run "git cl upload". Press Enter to continue, '
Edward Lemur1a83da12020-03-04 21:18:36 +00001434 'or Ctrl+C to abort',
1435 sys.stdout.getvalue())
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001436 self.assertEqual(0, ret)
rmistry@google.com2dd99862015-06-22 12:22:18 +00001437
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001438 def test_gerrit_change_id(self):
1439 self.calls = [
1440 ((['git', 'write-tree'], ),
1441 'hashtree'),
1442 ((['git', 'rev-parse', 'HEAD~0'], ),
1443 'branch-parent'),
1444 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1445 'A B <a@b.org> 1456848326 +0100'),
1446 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1447 'C D <c@d.org> 1456858326 +0100'),
1448 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1449 'hashchange'),
1450 ]
1451 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1452 self.assertEqual(change_id, 'Ihashchange')
1453
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001454 def test_desecription_append_footer(self):
1455 for init_desc, footer_line, expected_desc in [
1456 # Use unique desc first lines for easy test failure identification.
1457 ('foo', 'R=one', 'foo\n\nR=one'),
1458 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1459 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1460 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1461 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1462 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1463 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1464 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1465 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1466 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1467 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1468 ]:
1469 desc = git_cl.ChangeDescription(init_desc)
1470 desc.append_footer(footer_line)
1471 self.assertEqual(desc.description, expected_desc)
1472
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001473 def test_update_reviewers(self):
1474 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001475 ('foo', [], [],
1476 'foo'),
1477 ('foo\nR=xx', [], [],
1478 'foo\nR=xx'),
1479 ('foo\nTBR=xx', [], [],
1480 'foo\nTBR=xx'),
1481 ('foo', ['a@c'], [],
1482 'foo\n\nR=a@c'),
1483 ('foo\nR=xx', ['a@c'], [],
1484 'foo\n\nR=a@c, xx'),
1485 ('foo\nTBR=xx', ['a@c'], [],
1486 'foo\n\nR=a@c\nTBR=xx'),
1487 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1488 'foo\n\nR=a@c, yy\nTBR=xx'),
1489 ('foo\nBUG=', ['a@c'], [],
1490 'foo\nBUG=\nR=a@c'),
1491 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1492 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1493 ('foo', ['a@c', 'b@c'], [],
1494 'foo\n\nR=a@c, b@c'),
1495 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1496 'foo\nBar\n\nR=c@c\nBUG='),
1497 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1498 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001499 # Same as the line before, but full of whitespaces.
1500 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001501 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001502 'foo\nBar\n\nR=c@c\n BUG =',
1503 ),
1504 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001505 ('foo BUG=allo R=joe ', ['c@c'], [],
1506 'foo BUG=allo R=joe\n\nR=c@c'),
1507 # Redundant TBRs get promoted to Rs
1508 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1509 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001510 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001511 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001512 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001513 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001514 obj = git_cl.ChangeDescription(orig)
Edward Lemur2c62b332020-03-12 22:12:33 +00001515 obj.update_reviewers(reviewers, tbrs, None, None, None)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001516 actual.append(obj.description)
1517 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001518
Nodir Turakulov23b82142017-11-16 11:04:25 -08001519 def test_get_hash_tags(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001520 self.calls = [
1521 ((['git', 'show-branch', 'refs/remotes/origin/main'], ),
1522 callError(1)),
1523 ] * 9
Nodir Turakulov23b82142017-11-16 11:04:25 -08001524 cases = [
1525 ('', []),
1526 ('a', []),
1527 ('[a]', ['a']),
1528 ('[aa]', ['aa']),
1529 ('[a ]', ['a']),
1530 ('[a- ]', ['a']),
1531 ('[a- b]', ['a-b']),
1532 ('[a--b]', ['a-b']),
1533 ('[a', []),
1534 ('[a]x', ['a']),
1535 ('[aa]x', ['aa']),
1536 ('[a b]', ['a-b']),
1537 ('[a b]', ['a-b']),
1538 ('[a__b]', ['a-b']),
1539 ('[a] x', ['a']),
1540 ('[a][b]', ['a', 'b']),
1541 ('[a] [b]', ['a', 'b']),
1542 ('[a][b]x', ['a', 'b']),
1543 ('[a][b] x', ['a', 'b']),
1544 ('[a]\n[b]', ['a']),
1545 ('[a\nb]', []),
1546 ('[a][', ['a']),
1547 ('Revert "[a] feature"', ['a']),
1548 ('Reland "[a] feature"', ['a']),
1549 ('Revert: [a] feature', ['a']),
1550 ('Reland: [a] feature', ['a']),
1551 ('Revert "Reland: [a] feature"', ['a']),
1552 ('Foo: feature', ['foo']),
1553 ('Foo Bar: feature', ['foo-bar']),
Anthony Polito02b5af32019-12-02 19:49:47 +00001554 ('Change Foo::Bar', []),
1555 ('Foo: Change Foo::Bar', ['foo']),
Nodir Turakulov23b82142017-11-16 11:04:25 -08001556 ('Revert "Foo bar: feature"', ['foo-bar']),
1557 ('Reland "Foo bar: feature"', ['foo-bar']),
1558 ]
1559 for desc, expected in cases:
1560 change_desc = git_cl.ChangeDescription(desc)
1561 actual = change_desc.get_hash_tags()
1562 self.assertEqual(
1563 actual,
1564 expected,
1565 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1566
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001567 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001568 self.assertEqual(None, git_cl.GetTargetRef(None,
1569 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001570 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001571
wittman@chromium.org455dc922015-01-26 20:15:50 +00001572 # Check default target refs for branches.
1573 self.assertEqual('refs/heads/master',
1574 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001575 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001576 self.assertEqual('refs/heads/master',
1577 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001578 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001579 self.assertEqual('refs/heads/master',
1580 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001581 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001582 self.assertEqual('refs/branch-heads/123',
1583 git_cl.GetTargetRef('origin',
1584 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001585 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001586 self.assertEqual('refs/diff/test',
1587 git_cl.GetTargetRef('origin',
1588 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001589 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001590 self.assertEqual('refs/heads/chrome/m42',
1591 git_cl.GetTargetRef('origin',
1592 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001593 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001594
1595 # Check target refs for user-specified target branch.
1596 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1597 'refs/remotes/branch-heads/123'):
1598 self.assertEqual('refs/branch-heads/123',
1599 git_cl.GetTargetRef('origin',
1600 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001601 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001602 for branch in ('origin/master', 'remotes/origin/master',
1603 'refs/remotes/origin/master'):
1604 self.assertEqual('refs/heads/master',
1605 git_cl.GetTargetRef('origin',
1606 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001607 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001608 for branch in ('master', 'heads/master', 'refs/heads/master'):
1609 self.assertEqual('refs/heads/master',
1610 git_cl.GetTargetRef('origin',
1611 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001612 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001613
Edward Lemurda4b6c62020-02-13 00:28:40 +00001614 @mock.patch('git_common.is_dirty_git_tree', return_value=True)
1615 def test_patch_when_dirty(self, *_mocks):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001616 # Patch when local tree is dirty.
wychen@chromium.orga872e752015-04-28 23:42:18 +00001617 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1618
Edward Lemur85153282020-02-14 22:06:29 +00001619 def assertIssueAndPatchset(
1620 self, branch='master', issue='123456', patchset='7',
1621 git_short_host='chromium'):
1622 self.assertEqual(
Edward Lemur26964072020-02-19 19:18:51 +00001623 issue, scm.GIT.GetBranchConfig('', branch, 'gerritissue'))
Edward Lemur85153282020-02-14 22:06:29 +00001624 self.assertEqual(
Edward Lemur26964072020-02-19 19:18:51 +00001625 patchset, scm.GIT.GetBranchConfig('', branch, 'gerritpatchset'))
Edward Lemur85153282020-02-14 22:06:29 +00001626 self.assertEqual(
1627 'https://%s-review.googlesource.com' % git_short_host,
Edward Lemur26964072020-02-19 19:18:51 +00001628 scm.GIT.GetBranchConfig('', branch, 'gerritserver'))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001629
Edward Lemur85153282020-02-14 22:06:29 +00001630 def _patch_common(self, git_short_host='chromium'):
Edward Lesmes50da7702020-03-30 19:23:43 +00001631 mock.patch('scm.GIT.ResolveCommit', return_value='deadbeef').start()
Edward Lemur26964072020-02-19 19:18:51 +00001632 self.mockGit.config['remote.origin.url'] = (
1633 'https://%s.googlesource.com/my/repo' % git_short_host)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001634 gerrit_util.GetChangeDetail.return_value = {
1635 'current_revision': '7777777777',
1636 'revisions': {
1637 '1111111111': {
1638 '_number': 1,
1639 'fetch': {'http': {
1640 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1641 'ref': 'refs/changes/56/123456/1',
1642 }},
1643 },
1644 '7777777777': {
1645 '_number': 7,
1646 'fetch': {'http': {
1647 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1648 'ref': 'refs/changes/56/123456/7',
1649 }},
1650 },
1651 },
1652 }
wychen@chromium.orga872e752015-04-28 23:42:18 +00001653
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001654 def test_patch_gerrit_default(self):
Edward Lemur85153282020-02-14 22:06:29 +00001655 self._patch_common()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001656 self.calls += [
1657 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1658 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001659 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001660 ]
1661 self.assertEqual(git_cl.main(['patch', '123456']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001662 self.assertIssueAndPatchset()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001663
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001664 def test_patch_gerrit_new_branch(self):
Edward Lemur85153282020-02-14 22:06:29 +00001665 self._patch_common()
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001666 self.calls += [
1667 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1668 'refs/changes/56/123456/7'],), ''),
1669 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001670 ]
Edward Lemur85153282020-02-14 22:06:29 +00001671 self.assertEqual(git_cl.main(['patch', '-b', 'feature', '123456']), 0)
1672 self.assertIssueAndPatchset(branch='feature')
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001673
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001674 def test_patch_gerrit_force(self):
Edward Lemur85153282020-02-14 22:06:29 +00001675 self._patch_common('host')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001676 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001677 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001678 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001679 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001680 ]
Edward Lemur52969c92020-02-06 18:15:28 +00001681 self.assertEqual(git_cl.main(['patch', '123456', '--force']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001682 self.assertIssueAndPatchset(git_short_host='host')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001683
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001684 def test_patch_gerrit_guess_by_url(self):
Edward Lemur85153282020-02-14 22:06:29 +00001685 self._patch_common('else')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001686 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001687 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001688 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001689 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001690 ]
1691 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001692 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001693 self.assertIssueAndPatchset(patchset='1', git_short_host='else')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001694
Aaron Gable697a91b2018-01-19 15:20:15 -08001695 def test_patch_gerrit_guess_by_url_with_repo(self):
Edward Lemur85153282020-02-14 22:06:29 +00001696 self._patch_common('else')
Aaron Gable697a91b2018-01-19 15:20:15 -08001697 self.calls += [
1698 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1699 'refs/changes/56/123456/1'],), ''),
1700 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Aaron Gable697a91b2018-01-19 15:20:15 -08001701 ]
1702 self.assertEqual(git_cl.main(
1703 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1704 0)
Edward Lemur85153282020-02-14 22:06:29 +00001705 self.assertIssueAndPatchset(patchset='1', git_short_host='else')
Aaron Gable697a91b2018-01-19 15:20:15 -08001706
Edward Lemurd55c5072020-02-20 01:09:07 +00001707 @mock.patch('sys.stderr', StringIO())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001708 def test_patch_gerrit_conflict(self):
Edward Lemur85153282020-02-14 22:06:29 +00001709 self._patch_common()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001710 self.calls += [
1711 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001712 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001713 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001714 ]
1715 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001716 git_cl.main(['patch', '123456'])
Edward Lemurd55c5072020-02-20 01:09:07 +00001717 self.assertEqual(
1718 'Command "git cherry-pick FETCH_HEAD" failed.\n\n',
1719 sys.stderr.getvalue())
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001720
Edward Lemurda4b6c62020-02-13 00:28:40 +00001721 @mock.patch(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001722 'gerrit_util.GetChangeDetail',
Edward Lemurda4b6c62020-02-13 00:28:40 +00001723 side_effect=gerrit_util.GerritError(404, ''))
Edward Lemurd55c5072020-02-20 01:09:07 +00001724 @mock.patch('sys.stderr', StringIO())
Edward Lemurda4b6c62020-02-13 00:28:40 +00001725 def test_patch_gerrit_not_exists(self, *_mocks):
Edward Lemur26964072020-02-19 19:18:51 +00001726 self.mockGit.config['remote.origin.url'] = (
1727 'https://chromium.googlesource.com/my/repo')
tandriic2405f52016-10-10 08:13:15 -07001728 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001729 self.assertEqual(1, git_cl.main(['patch', '123456']))
Edward Lemurd55c5072020-02-20 01:09:07 +00001730 self.assertEqual(
1731 'change 123456 at https://chromium-review.googlesource.com does not '
1732 'exist or you have no access to it\n',
1733 sys.stderr.getvalue())
tandriic2405f52016-10-10 08:13:15 -07001734
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001735 def _checkout_calls(self):
1736 return [
1737 ((['git', 'config', '--local', '--get-regexp',
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001738 'branch\\..*\\.gerritissue'], ),
1739 ('branch.ger-branch.gerritissue 123456\n'
1740 'branch.gbranch654.gerritissue 654321\n')),
1741 ]
1742
1743 def test_checkout_gerrit(self):
1744 """Tests git cl checkout <issue>."""
1745 self.calls = self._checkout_calls()
1746 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1747 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1748
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001749 def test_checkout_not_found(self):
1750 """Tests git cl checkout <issue>."""
1751 self.calls = self._checkout_calls()
1752 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1753
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001754 def test_checkout_no_branch_issues(self):
1755 """Tests git cl checkout <issue>."""
1756 self.calls = [
1757 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001758 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001759 ]
1760 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1761
Edward Lemur26964072020-02-19 19:18:51 +00001762 def _test_gerrit_ensure_authenticated_common(self, auth):
Edward Lemur1a83da12020-03-04 21:18:36 +00001763 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00001764 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00001765 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00001766 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
1767 CookiesAuthenticatorMockFactory(hosts_with_creds=auth)).start()
Edward Lemur26964072020-02-19 19:18:51 +00001768 self.mockGit.config['remote.origin.url'] = (
1769 'https://chromium.googlesource.com/my/repo')
Edward Lemurf38bc172019-09-03 21:02:13 +00001770 cl = git_cl.Changelist()
tandrii@chromium.org28253532016-04-14 13:46:56 +00001771 cl.branch = 'master'
1772 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001773 return cl
1774
Edward Lemurd55c5072020-02-20 01:09:07 +00001775 @mock.patch('sys.stderr', StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001776 def test_gerrit_ensure_authenticated_missing(self):
1777 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001778 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001779 })
Edward Lemurd55c5072020-02-20 01:09:07 +00001780 with self.assertRaises(SystemExitMock):
1781 cl.EnsureAuthenticated(force=False)
1782 self.assertEqual(
1783 'Credentials for the following hosts are required:\n'
1784 ' chromium-review.googlesource.com\n'
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001785 'These are read from ~%(sep)s.gitcookies '
1786 '(or legacy ~%(sep)s%(netrc)s)\n'
Edward Lemurd55c5072020-02-20 01:09:07 +00001787 'You can (re)generate your credentials by visiting '
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001788 'https://chromium-review.googlesource.com/new-password\n' % {
1789 'sep': os.sep,
1790 'netrc': NETRC_FILENAME,
1791 }, sys.stderr.getvalue())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001792
1793 def test_gerrit_ensure_authenticated_conflict(self):
1794 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001795 'chromium.googlesource.com':
1796 ('git-one.example.com', None, 'secret1'),
1797 'chromium-review.googlesource.com':
1798 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001799 })
1800 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001801 (('ask_for_data', 'If you know what you are doing '
1802 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001803 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1804
1805 def test_gerrit_ensure_authenticated_ok(self):
1806 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001807 'chromium.googlesource.com':
1808 ('git-same.example.com', None, 'secret'),
1809 'chromium-review.googlesource.com':
1810 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001811 })
1812 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1813
tandrii@chromium.org28253532016-04-14 13:46:56 +00001814 def test_gerrit_ensure_authenticated_skipped(self):
Edward Lemur26964072020-02-19 19:18:51 +00001815 self.mockGit.config['gerrit.skip-ensure-authenticated'] = 'true'
1816 cl = self._test_gerrit_ensure_authenticated_common(auth={})
tandrii@chromium.org28253532016-04-14 13:46:56 +00001817 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1818
Eric Boren2fb63102018-10-05 13:05:03 +00001819 def test_gerrit_ensure_authenticated_bearer_token(self):
1820 cl = self._test_gerrit_ensure_authenticated_common(auth={
1821 'chromium.googlesource.com':
1822 ('', None, 'secret'),
1823 'chromium-review.googlesource.com':
1824 ('', None, 'secret'),
1825 })
1826 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1827 header = gerrit_util.CookiesAuthenticator().get_auth_header(
1828 'chromium.googlesource.com')
1829 self.assertTrue('Bearer' in header)
1830
Daniel Chengcf6269b2019-05-18 01:02:12 +00001831 def test_gerrit_ensure_authenticated_non_https(self):
Edward Lemur26964072020-02-19 19:18:51 +00001832 self.mockGit.config['remote.origin.url'] = 'custom-scheme://repo'
Daniel Chengcf6269b2019-05-18 01:02:12 +00001833 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00001834 (('logging.warning',
1835 'Ignoring branch %(branch)s with non-https remote '
1836 '%(remote)s', {
1837 'branch': 'master',
1838 'remote': 'custom-scheme://repo'}
1839 ), None),
Daniel Chengcf6269b2019-05-18 01:02:12 +00001840 ]
Edward Lemurda4b6c62020-02-13 00:28:40 +00001841 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
1842 CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
1843 mock.patch('logging.warning',
1844 lambda *a: self._mocked_call('logging.warning', *a)).start()
Edward Lemurf38bc172019-09-03 21:02:13 +00001845 cl = git_cl.Changelist()
Daniel Chengcf6269b2019-05-18 01:02:12 +00001846 cl.branch = 'master'
1847 cl.branchref = 'refs/heads/master'
1848 cl.lookedup_issue = True
1849 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1850
Florian Mayerae510e82020-01-30 21:04:48 +00001851 def test_gerrit_ensure_authenticated_non_url(self):
Edward Lemur26964072020-02-19 19:18:51 +00001852 self.mockGit.config['remote.origin.url'] = (
1853 'git@somehost.example:foo/bar.git')
Florian Mayerae510e82020-01-30 21:04:48 +00001854 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00001855 (('logging.error',
1856 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1857 'but it doesn\'t exist.', {
1858 'remote': 'origin',
1859 'branch': 'master',
1860 'url': 'git@somehost.example:foo/bar.git'}
1861 ), None),
Florian Mayerae510e82020-01-30 21:04:48 +00001862 ]
Edward Lemurda4b6c62020-02-13 00:28:40 +00001863 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
1864 CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
1865 mock.patch('logging.error',
1866 lambda *a: self._mocked_call('logging.error', *a)).start()
Florian Mayerae510e82020-01-30 21:04:48 +00001867 cl = git_cl.Changelist()
1868 cl.branch = 'master'
1869 cl.branchref = 'refs/heads/master'
1870 cl.lookedup_issue = True
1871 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1872
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001873 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
Edward Lemur85153282020-02-14 22:06:29 +00001874 self.mockGit.config['branch.master.gerritissue'] = '123'
1875 self.mockGit.config['branch.master.gerritserver'] = (
1876 'https://chromium-review.googlesource.com')
Edward Lemur26964072020-02-19 19:18:51 +00001877 self.mockGit.config['remote.origin.url'] = (
1878 'https://chromium.googlesource.com/infra/infra')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001879 self.calls = [
Edward Lemurda4b6c62020-02-13 00:28:40 +00001880 (('SetReview', 'chromium-review.googlesource.com',
1881 'infra%2Finfra~123', None,
1882 {'Commit-Queue': vote}, notify, None), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001883 ]
tandriid9e5ce52016-07-13 02:32:59 -07001884
1885 def test_cmd_set_commit_gerrit_clear(self):
1886 self._cmd_set_commit_gerrit_common(0)
1887 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1888
1889 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07001890 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001891 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1892
tandriid9e5ce52016-07-13 02:32:59 -07001893 def test_cmd_set_commit_gerrit(self):
1894 self._cmd_set_commit_gerrit_common(2)
1895 self.assertEqual(0, git_cl.main(['set-commit']))
1896
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001897 def test_description_display(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001898 mock.patch('git_cl.Changelist', ChangelistMock).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001899 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001900
1901 self.assertEqual(0, git_cl.main(['description', '-d']))
Edward Lemurda4b6c62020-02-13 00:28:40 +00001902 self.assertEqual('foo\n', sys.stdout.getvalue())
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001903
Edward Lemurda4b6c62020-02-13 00:28:40 +00001904 @mock.patch('sys.stderr', StringIO())
iannucci3c972b92016-08-17 13:24:10 -07001905 def test_StatusFieldOverrideIssueMissingArgs(self):
iannucci3c972b92016-08-17 13:24:10 -07001906 try:
1907 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
Edward Lemurd55c5072020-02-20 01:09:07 +00001908 except SystemExitMock:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001909 self.assertIn(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001910 '--field must be given when --issue is set.', sys.stderr.getvalue())
iannucci3c972b92016-08-17 13:24:10 -07001911
1912 def test_StatusFieldOverrideIssue(self):
iannucci3c972b92016-08-17 13:24:10 -07001913 def assertIssue(cl_self, *_args):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001914 self.assertEqual(cl_self.issue, 1)
iannucci3c972b92016-08-17 13:24:10 -07001915 return 'foobar'
1916
Edward Lemurda4b6c62020-02-13 00:28:40 +00001917 mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
iannuccie53c9352016-08-17 14:40:40 -07001918 self.assertEqual(
Edward Lemur52969c92020-02-06 18:15:28 +00001919 git_cl.main(['status', '--issue', '1', '--field', 'desc']),
iannuccie53c9352016-08-17 14:40:40 -07001920 0)
Edward Lemurda4b6c62020-02-13 00:28:40 +00001921 self.assertEqual(sys.stdout.getvalue(), 'foobar\n')
iannucci3c972b92016-08-17 13:24:10 -07001922
iannuccie53c9352016-08-17 14:40:40 -07001923 def test_SetCloseOverrideIssue(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001924
iannuccie53c9352016-08-17 14:40:40 -07001925 def assertIssue(cl_self, *_args):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001926 self.assertEqual(cl_self.issue, 1)
iannuccie53c9352016-08-17 14:40:40 -07001927 return 'foobar'
1928
Edward Lemurda4b6c62020-02-13 00:28:40 +00001929 mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
1930 mock.patch('git_cl.Changelist.CloseIssue', lambda *_: None).start()
iannuccie53c9352016-08-17 14:40:40 -07001931 self.assertEqual(
Edward Lemur52969c92020-02-06 18:15:28 +00001932 git_cl.main(['set-close', '--issue', '1']), 0)
iannuccie53c9352016-08-17 14:40:40 -07001933
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00001934 def test_description(self):
Edward Lemur26964072020-02-19 19:18:51 +00001935 self.mockGit.config['remote.origin.url'] = (
1936 'https://chromium.googlesource.com/my/repo')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001937 gerrit_util.GetChangeDetail.return_value = {
1938 'current_revision': 'sha1',
1939 'revisions': {'sha1': {
1940 'commit': {'message': 'foobar'},
1941 }},
1942 }
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001943 self.assertEqual(0, git_cl.main([
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00001944 'description',
1945 'https://chromium-review.googlesource.com/c/my/repo/+/123123',
1946 '-d']))
Edward Lemurda4b6c62020-02-13 00:28:40 +00001947 self.assertEqual('foobar\n', sys.stdout.getvalue())
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001948
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001949 def test_description_set_raw(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001950 mock.patch('git_cl.Changelist', ChangelistMock).start()
1951 mock.patch('git_cl.sys.stdin', StringIO('hihi')).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001952
1953 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1954 self.assertEqual('hihi', ChangelistMock.desc)
1955
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001956 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001957 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001958
1959 def RunEditor(desc, _, **kwargs):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001960 self.assertEqual(
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001961 '# Enter a description of the change.\n'
1962 '# This will be displayed on the codereview site.\n'
1963 '# The first line will also be used as the subject of the review.\n'
1964 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001965 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07001966 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001967 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001968 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07001969 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001970
Edward Lemur6c6827c2020-02-06 21:15:18 +00001971 def UpdateDescription(_, desc, force=False):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001972 self.assertEqual(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001973
Edward Lemurda4b6c62020-02-13 00:28:40 +00001974 mock.patch('git_cl.Changelist.FetchDescription',
1975 lambda *args: current_desc).start()
1976 mock.patch('git_cl.Changelist.UpdateDescription',
1977 UpdateDescription).start()
1978 mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001979
Edward Lemur85153282020-02-14 22:06:29 +00001980 self.mockGit.config['branch.master.gerritissue'] = '123'
Edward Lemur52969c92020-02-06 18:15:28 +00001981 self.assertEqual(0, git_cl.main(['description']))
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00001982
Dan Beamd8b04ca2019-10-10 21:23:26 +00001983 def test_description_does_not_append_bug_line_if_fixed_is_present(self):
1984 current_desc = 'Some.\n\nFixed: 123\nChange-Id: xxx'
1985
1986 def RunEditor(desc, _, **kwargs):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001987 self.assertEqual(
Dan Beamd8b04ca2019-10-10 21:23:26 +00001988 '# Enter a description of the change.\n'
1989 '# This will be displayed on the codereview site.\n'
1990 '# The first line will also be used as the subject of the review.\n'
1991 '#--------------------This line is 72 characters long'
1992 '--------------------\n'
1993 'Some.\n\nFixed: 123\nChange-Id: xxx',
1994 desc)
1995 return desc
1996
Edward Lemurda4b6c62020-02-13 00:28:40 +00001997 mock.patch('git_cl.Changelist.FetchDescription',
1998 lambda *args: current_desc).start()
1999 mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002000
Edward Lemur85153282020-02-14 22:06:29 +00002001 self.mockGit.config['branch.master.gerritissue'] = '123'
Edward Lemur52969c92020-02-06 18:15:28 +00002002 self.assertEqual(0, git_cl.main(['description']))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002003
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002004 def test_description_set_stdin(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002005 mock.patch('git_cl.Changelist', ChangelistMock).start()
2006 mock.patch('git_cl.sys.stdin', StringIO('hi \r\n\t there\n\nman')).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002007
2008 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2009 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2010
kmarshall3bff56b2016-06-06 18:31:47 -07002011 def test_archive(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002012 self.calls = [
2013 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
Edward Lemurf38bc172019-09-03 21:02:13 +00002014 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002015 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002016 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
Edward Lemurf38bc172019-09-03 21:02:13 +00002017 ((['git', 'branch', '-D', 'foo'],), '')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002018 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002019
Edward Lemurda4b6c62020-02-13 00:28:40 +00002020 mock.patch('git_cl.get_cl_statuses',
kmarshall3bff56b2016-06-06 18:31:47 -07002021 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002022 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2023 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002024 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall3bff56b2016-06-06 18:31:47 -07002025
2026 self.assertEqual(0, git_cl.main(['archive', '-f']))
2027
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002028 def test_archive_tag_collision(self):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002029 self.calls = [
2030 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2031 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2032 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],),
2033 'refs/tags/git-cl-archived-456-foo'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002034 ((['git', 'tag', 'git-cl-archived-456-foo-2', 'foo'],), ''),
2035 ((['git', 'branch', '-D', 'foo'],), '')
2036 ]
2037
Edward Lemurda4b6c62020-02-13 00:28:40 +00002038 mock.patch('git_cl.get_cl_statuses',
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002039 lambda branches, fine_grained, max_processes:
2040 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2041 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002042 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002043
2044 self.assertEqual(0, git_cl.main(['archive', '-f']))
2045
kmarshall3bff56b2016-06-06 18:31:47 -07002046 def test_archive_current_branch_fails(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002047 self.calls = [
2048 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2049 'refs/heads/master'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002050 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002051 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002052
Edward Lemurda4b6c62020-02-13 00:28:40 +00002053 mock.patch('git_cl.get_cl_statuses',
kmarshall9249e012016-08-23 12:02:16 -07002054 lambda branches, fine_grained, max_processes:
Edward Lemurda4b6c62020-02-13 00:28:40 +00002055 [(MockChangelistWithBranchAndIssue('master', 1),
2056 'closed')]).start()
kmarshall9249e012016-08-23 12:02:16 -07002057
2058 self.assertEqual(1, git_cl.main(['archive', '-f']))
2059
2060 def test_archive_dry_run(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002061 self.calls = [
2062 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2063 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002064 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002065 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002066
Edward Lemurda4b6c62020-02-13 00:28:40 +00002067 mock.patch('git_cl.get_cl_statuses',
kmarshall3bff56b2016-06-06 18:31:47 -07002068 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002069 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2070 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002071 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall3bff56b2016-06-06 18:31:47 -07002072
kmarshall9249e012016-08-23 12:02:16 -07002073 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2074
2075 def test_archive_no_tags(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002076 self.calls = [
2077 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2078 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002079 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002080 ((['git', 'branch', '-D', 'foo'],), '')
2081 ]
kmarshall9249e012016-08-23 12:02:16 -07002082
Edward Lemurda4b6c62020-02-13 00:28:40 +00002083 mock.patch('git_cl.get_cl_statuses',
kmarshall9249e012016-08-23 12:02:16 -07002084 lambda branches, fine_grained, max_processes:
2085 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2086 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002087 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall9249e012016-08-23 12:02:16 -07002088
2089 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002090
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002091 def test_archive_tag_cleanup_on_branch_deletion_error(self):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002092 self.calls = [
2093 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2094 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2095 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002096 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],),
2097 'refs/tags/git-cl-archived-456-foo'),
2098 ((['git', 'branch', '-D', 'foo'],), CERR1),
2099 ((['git', 'tag', '-d', 'git-cl-archived-456-foo'],),
2100 'refs/tags/git-cl-archived-456-foo'),
2101 ]
2102
Edward Lemurda4b6c62020-02-13 00:28:40 +00002103 mock.patch('git_cl.get_cl_statuses',
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002104 lambda branches, fine_grained, max_processes:
2105 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2106 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002107 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002108
2109 self.assertEqual(0, git_cl.main(['archive', '-f']))
2110
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00002111 def test_archive_with_format(self):
2112 self.calls = [
2113 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'], ),
2114 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2115 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'], ), ''),
2116 ((['git', 'tag', 'archived/12-foo', 'foo'], ), ''),
2117 ((['git', 'branch', '-D', 'foo'], ), ''),
2118 ]
2119
2120 mock.patch('git_cl.get_cl_statuses',
2121 lambda branches, fine_grained, max_processes:
2122 [(MockChangelistWithBranchAndIssue('foo', 12), 'closed')]).start()
2123
2124 self.assertEqual(
2125 0, git_cl.main(['archive', '-f', '-p', 'archived/{issue}-{branch}']))
2126
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002127 def test_cmd_issue_erase_existing(self):
Edward Lemur85153282020-02-14 22:06:29 +00002128 self.mockGit.config['branch.master.gerritissue'] = '123'
2129 self.mockGit.config['branch.master.gerritserver'] = (
2130 'https://chromium-review.googlesource.com')
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002131 self.calls = [
Aaron Gableca01e2c2017-07-19 11:16:02 -07002132 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002133 ]
2134 self.assertEqual(0, git_cl.main(['issue', '0']))
Edward Lemur85153282020-02-14 22:06:29 +00002135 self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
2136 self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002137
Aaron Gable400e9892017-07-12 15:31:21 -07002138 def test_cmd_issue_erase_existing_with_change_id(self):
Edward Lemur85153282020-02-14 22:06:29 +00002139 self.mockGit.config['branch.master.gerritissue'] = '123'
2140 self.mockGit.config['branch.master.gerritserver'] = (
2141 'https://chromium-review.googlesource.com')
Edward Lemurda4b6c62020-02-13 00:28:40 +00002142 mock.patch('git_cl.Changelist.FetchDescription',
2143 lambda _: 'This is a description\n\nChange-Id: Ideadbeef').start()
Aaron Gable400e9892017-07-12 15:31:21 -07002144 self.calls = [
Aaron Gableca01e2c2017-07-19 11:16:02 -07002145 ((['git', 'log', '-1', '--format=%B'],),
2146 'This is a description\n\nChange-Id: Ideadbeef'),
2147 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002148 ]
2149 self.assertEqual(0, git_cl.main(['issue', '0']))
Edward Lemur85153282020-02-14 22:06:29 +00002150 self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
2151 self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
Aaron Gable400e9892017-07-12 15:31:21 -07002152
phajdan.jre328cf92016-08-22 04:12:17 -07002153 def test_cmd_issue_json(self):
Edward Lemur85153282020-02-14 22:06:29 +00002154 self.mockGit.config['branch.master.gerritissue'] = '123'
2155 self.mockGit.config['branch.master.gerritserver'] = (
2156 'https://chromium-review.googlesource.com')
phajdan.jre328cf92016-08-22 04:12:17 -07002157 self.calls = [
phajdan.jre328cf92016-08-22 04:12:17 -07002158 (('write_json', 'output.json',
Andrii Shyshkalova185e2e2018-11-21 00:42:55 +00002159 {'issue': 123,
2160 'issue_url': 'https://chromium-review.googlesource.com/123'}),
phajdan.jre328cf92016-08-22 04:12:17 -07002161 ''),
2162 ]
2163 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2164
tandrii16e0b4e2016-06-07 10:34:28 -07002165 def _common_GerritCommitMsgHookCheck(self):
Edward Lemur15a9b8c2020-02-13 00:52:30 +00002166 mock.patch(
2167 'git_cl.os.path.abspath',
2168 lambda path: self._mocked_call(['abspath', path])).start()
2169 mock.patch(
2170 'git_cl.os.path.exists',
2171 lambda path: self._mocked_call(['exists', path])).start()
2172 mock.patch(
2173 'git_cl.gclient_utils.FileRead',
2174 lambda path: self._mocked_call(['FileRead', path])).start()
2175 mock.patch(
2176 'git_cl.gclient_utils.rm_file_or_tree',
2177 lambda path: self._mocked_call(['rm_file_or_tree', path])).start()
Edward Lemur1a83da12020-03-04 21:18:36 +00002178 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00002179 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00002180 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurf38bc172019-09-03 21:02:13 +00002181 return git_cl.Changelist(issue=123)
tandrii16e0b4e2016-06-07 10:34:28 -07002182
2183 def test_GerritCommitMsgHookCheck_custom_hook(self):
2184 cl = self._common_GerritCommitMsgHookCheck()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002185 self.calls += [((['exists',
2186 os.path.join('.git', 'hooks', 'commit-msg')], ), True),
2187 ((['FileRead',
2188 os.path.join('.git', 'hooks', 'commit-msg')], ),
2189 '#!/bin/sh\necho "custom hook"')]
Edward Lemur125d60a2019-09-13 18:25:41 +00002190 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002191
2192 def test_GerritCommitMsgHookCheck_not_exists(self):
2193 cl = self._common_GerritCommitMsgHookCheck()
2194 self.calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002195 ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), False),
tandrii16e0b4e2016-06-07 10:34:28 -07002196 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002197 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002198
2199 def test_GerritCommitMsgHookCheck(self):
2200 cl = self._common_GerritCommitMsgHookCheck()
2201 self.calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002202 ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), True),
2203 ((['FileRead', os.path.join('.git', 'hooks', 'commit-msg')], ),
tandrii16e0b4e2016-06-07 10:34:28 -07002204 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002205 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002206 ((['rm_file_or_tree',
2207 os.path.join('.git', 'hooks', 'commit-msg')], ), ''),
tandrii16e0b4e2016-06-07 10:34:28 -07002208 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002209 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002210
tandriic4344b52016-08-29 06:04:54 -07002211 def test_GerritCmdLand(self):
Edward Lemur85153282020-02-14 22:06:29 +00002212 self.mockGit.config['branch.master.gerritsquashhash'] = 'deadbeaf'
2213 self.mockGit.config['branch.master.gerritserver'] = (
2214 'chromium-review.googlesource.com')
tandriic4344b52016-08-29 06:04:54 -07002215 self.calls += [
tandriic4344b52016-08-29 06:04:54 -07002216 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
tandriic4344b52016-08-29 06:04:54 -07002217 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002218 cl = git_cl.Changelist(issue=123)
Edward Lemur125d60a2019-09-13 18:25:41 +00002219 cl._GetChangeDetail = lambda *args, **kwargs: {
tandriic4344b52016-08-29 06:04:54 -07002220 'labels': {},
2221 'current_revision': 'deadbeaf',
2222 }
Edward Lemur125d60a2019-09-13 18:25:41 +00002223 cl._GetChangeCommit = lambda: {
agable32978d92016-11-01 12:55:02 -07002224 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002225 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002226 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2227 }
Edward Lemur125d60a2019-09-13 18:25:41 +00002228 cl.SubmitIssue = lambda wait_for_merge: None
Olivier Robin75ee7252018-04-13 10:02:56 +02002229 self.assertEqual(0, cl.CMDLand(force=True,
2230 bypass_hooks=True,
2231 verbose=True,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002232 parallel=False,
2233 resultdb=False,
2234 realm=None))
Edward Lemur73c76702020-02-06 23:57:18 +00002235 self.assertIn(
2236 'Issue chromium-review.googlesource.com/123 has been submitted',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002237 sys.stdout.getvalue())
Edward Lemur73c76702020-02-06 23:57:18 +00002238 self.assertIn(
2239 'Landed as: https://git.googlesource.com/test/+/deadbeef',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002240 sys.stdout.getvalue())
tandriic4344b52016-08-29 06:04:54 -07002241
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002242 def _mock_gerrit_changes_for_detail_cache(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002243 mock.patch('git_cl.Changelist._GetGerritHost', lambda _: 'host').start()
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002244
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002245 def test_gerrit_change_detail_cache_simple(self):
2246 self._mock_gerrit_changes_for_detail_cache()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002247 gerrit_util.GetChangeDetail.side_effect = ['a', 'b']
Edward Lemurf38bc172019-09-03 21:02:13 +00002248 cl1 = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002249 cl1._cached_remote_url = (
2250 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemurf38bc172019-09-03 21:02:13 +00002251 cl2 = git_cl.Changelist(issue=2)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002252 cl2._cached_remote_url = (
2253 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002254 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
2255 self.assertEqual(cl1._GetChangeDetail(), 'a')
2256 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002257
2258 def test_gerrit_change_detail_cache_options(self):
2259 self._mock_gerrit_changes_for_detail_cache()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002260 gerrit_util.GetChangeDetail.side_effect = ['cab', 'ad']
Edward Lemurf38bc172019-09-03 21:02:13 +00002261 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002262 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002263 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2264 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2265 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2266 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2267 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2268 self.assertEqual(cl._GetChangeDetail(), 'cab')
2269
2270 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2271 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2272 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2273 self.assertEqual(cl._GetChangeDetail(), 'cab')
2274
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002275 def test_gerrit_description_caching(self):
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002276 gerrit_util.GetChangeDetail.return_value = {
2277 'current_revision': 'rev1',
2278 'revisions': {
2279 'rev1': {'commit': {'message': 'desc1'}},
2280 },
2281 }
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002282
2283 self._mock_gerrit_changes_for_detail_cache()
Edward Lemurf38bc172019-09-03 21:02:13 +00002284 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002285 cl._cached_remote_url = (
2286 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemur6c6827c2020-02-06 21:15:18 +00002287 self.assertEqual(cl.FetchDescription(), 'desc1')
2288 self.assertEqual(cl.FetchDescription(), 'desc1') # cache hit.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002289
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002290 def test_print_current_creds(self):
2291 class CookiesAuthenticatorMock(object):
2292 def __init__(self):
2293 self.gitcookies = {
2294 'host.googlesource.com': ('user', 'pass'),
2295 'host-review.googlesource.com': ('user', 'pass'),
2296 }
2297 self.netrc = self
2298 self.netrc.hosts = {
2299 'github.com': ('user2', None, 'pass2'),
2300 'host2.googlesource.com': ('user3', None, 'pass'),
2301 }
Edward Lemurda4b6c62020-02-13 00:28:40 +00002302 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2303 CookiesAuthenticatorMock).start()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002304 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
2305 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2306 ' Host\t User\t Which file',
2307 '============================\t=====\t===========',
2308 'host-review.googlesource.com\t user\t.gitcookies',
2309 ' host.googlesource.com\t user\t.gitcookies',
2310 ' host2.googlesource.com\tuser3\t .netrc',
2311 ])
Edward Lemur79d4f992019-11-11 23:49:02 +00002312 sys.stdout.seek(0)
2313 sys.stdout.truncate(0)
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002314 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
2315 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2316 ' Host\tUser\t Which file',
2317 '============================\t====\t===========',
2318 'host-review.googlesource.com\tuser\t.gitcookies',
2319 ' host.googlesource.com\tuser\t.gitcookies',
2320 ])
2321
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002322 def _common_creds_check_mocks(self):
2323 def exists_mock(path):
2324 dirname = os.path.dirname(path)
2325 if dirname == os.path.expanduser('~'):
2326 dirname = '~'
2327 base = os.path.basename(path)
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002328 if base in (NETRC_FILENAME, '.gitcookies'):
2329 return self._mocked_call('os.path.exists', os.path.join(dirname, base))
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002330 # git cl also checks for existence other files not relevant to this test.
2331 return None
Edward Lemur1a83da12020-03-04 21:18:36 +00002332 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00002333 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00002334 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002335 mock.patch('os.path.exists', exists_mock).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002336
2337 def test_creds_check_gitcookies_not_configured(self):
2338 self._common_creds_check_mocks()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002339 mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
2340 lambda _, include_netrc=False: []).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002341 self.calls = [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002342 ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
2343 ((['git', 'config', '--global', 'http.cookiefile'], ), CERR1),
2344 (('os.path.exists', os.path.join('~', NETRC_FILENAME)), True),
2345 (('ask_for_data', 'Press Enter to setup .gitcookies, '
2346 'or Ctrl+C to abort'), ''),
2347 (([
2348 'git', 'config', '--global', 'http.cookiefile',
2349 os.path.expanduser(os.path.join('~', '.gitcookies'))
2350 ], ), ''),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002351 ]
2352 self.assertEqual(0, git_cl.main(['creds-check']))
Edward Lemur73c76702020-02-06 23:57:18 +00002353 self.assertTrue(
2354 sys.stdout.getvalue().startswith(
2355 'You seem to be using outdated .netrc for git credentials:'))
2356 self.assertIn(
2357 '\nConfigured git to use .gitcookies from',
2358 sys.stdout.getvalue())
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002359
2360 def test_creds_check_gitcookies_configured_custom_broken(self):
2361 self._common_creds_check_mocks()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002362 mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
2363 lambda _, include_netrc=False: []).start()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002364 custom_cookie_path = ('C:\\.gitcookies'
2365 if sys.platform == 'win32' else '/custom/.gitcookies')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002366 self.calls = [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002367 ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
2368 ((['git', 'config', '--global', 'http.cookiefile'], ),
2369 custom_cookie_path),
2370 (('os.path.exists', custom_cookie_path), False),
2371 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
2372 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
2373 (([
2374 'git', 'config', '--global', 'http.cookiefile',
2375 os.path.expanduser(os.path.join('~', '.gitcookies'))
2376 ], ), ''),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002377 ]
2378 self.assertEqual(0, git_cl.main(['creds-check']))
Edward Lemur73c76702020-02-06 23:57:18 +00002379 self.assertIn(
2380 'WARNING: You have configured custom path to .gitcookies: ',
2381 sys.stdout.getvalue())
2382 self.assertIn(
2383 'However, your configured .gitcookies file is missing.',
2384 sys.stdout.getvalue())
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002385
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002386 def test_git_cl_comment_add_gerrit(self):
Edward Lemur85153282020-02-14 22:06:29 +00002387 self.mockGit.branchref = None
Edward Lemur26964072020-02-19 19:18:51 +00002388 self.mockGit.config['remote.origin.url'] = (
2389 'https://chromium.googlesource.com/infra/infra')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002390 self.calls = [
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002391 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002392 'msg', None, None, None),
Aaron Gable636b13f2017-07-14 10:42:48 -07002393 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002394 ]
Edward Lemur52969c92020-02-06 18:15:28 +00002395 self.assertEqual(0, git_cl.main(['comment', '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002396
Edward Lemurda4b6c62020-02-13 00:28:40 +00002397 @mock.patch('git_cl.Changelist.GetBranch', return_value='foo')
2398 def test_git_cl_comments_fetch_gerrit(self, *_mocks):
Edward Lemur26964072020-02-19 19:18:51 +00002399 self.mockGit.config['remote.origin.url'] = (
2400 'https://chromium.googlesource.com/infra/infra')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002401 gerrit_util.GetChangeDetail.return_value = {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002402 'owner': {'email': 'owner@example.com'},
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002403 'current_revision': 'ba5eba11',
2404 'revisions': {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002405 'deadbeaf': {
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002406 '_number': 1,
2407 },
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002408 'ba5eba11': {
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002409 '_number': 2,
2410 },
2411 },
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002412 'messages': [
2413 {
2414 u'_revision_number': 1,
2415 u'author': {
2416 u'_account_id': 1111084,
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002417 u'email': u'could-be-anything@example.com',
2418 u'name': u'LUCI CQ'
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002419 },
2420 u'date': u'2017-03-15 20:08:45.000000000',
2421 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07002422 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002423 u'tag': u'autogenerated:cq:dry-run'
2424 },
2425 {
2426 u'_revision_number': 2,
2427 u'author': {
2428 u'_account_id': 11151243,
2429 u'email': u'owner@example.com',
2430 u'name': u'owner'
2431 },
2432 u'date': u'2017-03-16 20:00:41.000000000',
2433 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2434 u'message': u'PTAL',
2435 },
2436 {
2437 u'_revision_number': 2,
2438 u'author': {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002439 u'_account_id': 148512,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002440 u'email': u'reviewer@example.com',
2441 u'name': u'reviewer'
2442 },
2443 u'date': u'2017-03-17 05:19:37.500000000',
2444 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2445 u'message': u'Patch Set 2: Code-Review+1',
2446 },
2447 ]
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002448 }
2449 self.calls = [
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002450 (('GetChangeComments', 'chromium-review.googlesource.com',
2451 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002452 '/COMMIT_MSG': [
2453 {
2454 'author': {'email': u'reviewer@example.com'},
2455 'updated': u'2017-03-17 05:19:37.500000000',
2456 'patch_set': 2,
2457 'side': 'REVISION',
2458 'message': 'Please include a bug link',
2459 },
2460 ],
2461 'codereview.settings': [
2462 {
2463 'author': {'email': u'owner@example.com'},
2464 'updated': u'2017-03-16 20:00:41.000000000',
2465 'patch_set': 2,
2466 'side': 'PARENT',
2467 'line': 42,
2468 'message': 'I removed this because it is bad',
2469 },
2470 ]
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002471 }),
2472 (('GetChangeRobotComments', 'chromium-review.googlesource.com',
2473 'infra%2Finfra~1'), {}),
Leszek Swirski45b20c42018-09-17 17:05:26 +00002474 ] * 2 + [
2475 (('write_json', 'output.json', [
2476 {
2477 u'date': u'2017-03-16 20:00:41.000000',
2478 u'message': (
2479 u'PTAL\n' +
2480 u'\n' +
2481 u'codereview.settings\n' +
2482 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2483 u'c/1/2/codereview.settings#b42\n' +
2484 u' I removed this because it is bad\n'),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002485 u'autogenerated': False,
Leszek Swirski45b20c42018-09-17 17:05:26 +00002486 u'approval': False,
2487 u'disapproval': False,
2488 u'sender': u'owner@example.com'
2489 }, {
2490 u'date': u'2017-03-17 05:19:37.500000',
2491 u'message': (
2492 u'Patch Set 2: Code-Review+1\n' +
2493 u'\n' +
2494 u'/COMMIT_MSG\n' +
2495 u' PS2, File comment: https://chromium-review.googlesource' +
2496 u'.com/c/1/2//COMMIT_MSG#\n' +
2497 u' Please include a bug link\n'),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002498 u'autogenerated': False,
Leszek Swirski45b20c42018-09-17 17:05:26 +00002499 u'approval': False,
2500 u'disapproval': False,
2501 u'sender': u'reviewer@example.com'
2502 }
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002503 ]), '')
Leszek Swirski45b20c42018-09-17 17:05:26 +00002504 ]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002505 expected_comments_summary = [
2506 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002507 message=(
2508 u'PTAL\n' +
2509 u'\n' +
2510 u'codereview.settings\n' +
2511 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2512 u'c/1/2/codereview.settings#b42\n' +
2513 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002514 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002515 autogenerated=False,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002516 disapproval=False, approval=False, sender=u'owner@example.com'),
2517 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002518 message=(
2519 u'Patch Set 2: Code-Review+1\n' +
2520 u'\n' +
2521 u'/COMMIT_MSG\n' +
2522 u' PS2, File comment: https://chromium-review.googlesource.com/' +
2523 u'c/1/2//COMMIT_MSG#\n' +
2524 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002525 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002526 autogenerated=False,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002527 disapproval=False, approval=False, sender=u'reviewer@example.com'),
2528 ]
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002529 cl = git_cl.Changelist(
Edward Lemurf38bc172019-09-03 21:02:13 +00002530 issue=1, branchref='refs/heads/foo')
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002531 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002532 self.assertEqual(
2533 0, git_cl.main(['comments', '-i', '1', '-j', 'output.json']))
2534
2535 def test_git_cl_comments_robot_comments(self):
2536 # git cl comments also fetches robot comments (which are considered a type
2537 # of autogenerated comment), and unlike other types of comments, only robot
2538 # comments from the latest patchset are shown.
Edward Lemur26964072020-02-19 19:18:51 +00002539 self.mockGit.config['remote.origin.url'] = (
2540 'https://chromium.googlesource.com/infra/infra')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002541 gerrit_util.GetChangeDetail.return_value = {
2542 'owner': {'email': 'owner@example.com'},
2543 'current_revision': 'ba5eba11',
2544 'revisions': {
2545 'deadbeaf': {
2546 '_number': 1,
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002547 },
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002548 'ba5eba11': {
2549 '_number': 2,
2550 },
2551 },
2552 'messages': [
2553 {
2554 u'_revision_number': 1,
2555 u'author': {
2556 u'_account_id': 1111084,
2557 u'email': u'commit-bot@chromium.org',
2558 u'name': u'Commit Bot'
2559 },
2560 u'date': u'2017-03-15 20:08:45.000000000',
2561 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
2562 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
2563 u'tag': u'autogenerated:cq:dry-run'
2564 },
2565 {
2566 u'_revision_number': 1,
2567 u'author': {
2568 u'_account_id': 123,
2569 u'email': u'tricium@serviceaccount.com',
2570 u'name': u'Tricium'
2571 },
2572 u'date': u'2017-03-16 20:00:41.000000000',
2573 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2574 u'message': u'(1 comment)',
2575 u'tag': u'autogenerated:tricium',
2576 },
2577 {
2578 u'_revision_number': 1,
2579 u'author': {
2580 u'_account_id': 123,
2581 u'email': u'tricium@serviceaccount.com',
2582 u'name': u'Tricium'
2583 },
2584 u'date': u'2017-03-16 20:00:41.000000000',
2585 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2586 u'message': u'(1 comment)',
2587 u'tag': u'autogenerated:tricium',
2588 },
2589 {
2590 u'_revision_number': 2,
2591 u'author': {
2592 u'_account_id': 123,
2593 u'email': u'tricium@serviceaccount.com',
2594 u'name': u'reviewer'
2595 },
2596 u'date': u'2017-03-17 05:30:37.000000000',
2597 u'tag': u'autogenerated:tricium',
2598 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2599 u'message': u'(1 comment)',
2600 },
2601 ]
2602 }
2603 self.calls = [
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002604 (('GetChangeComments', 'chromium-review.googlesource.com',
2605 'infra%2Finfra~1'), {}),
2606 (('GetChangeRobotComments', 'chromium-review.googlesource.com',
2607 'infra%2Finfra~1'), {
2608 'codereview.settings': [
2609 {
2610 u'author': {u'email': u'tricium@serviceaccount.com'},
2611 u'updated': u'2017-03-17 05:30:37.000000000',
2612 u'robot_run_id': u'5565031076855808',
2613 u'robot_id': u'Linter/Category',
2614 u'tag': u'autogenerated:tricium',
2615 u'patch_set': 2,
2616 u'side': u'REVISION',
2617 u'message': u'Linter warning message text',
2618 u'line': 32,
2619 },
2620 ],
2621 }),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002622 ]
2623 expected_comments_summary = [
2624 git_cl._CommentSummary(date=datetime.datetime(2017, 3, 17, 5, 30, 37),
2625 message=(
2626 u'(1 comment)\n\ncodereview.settings\n'
2627 u' PS2, Line 32: https://chromium-review.googlesource.com/'
2628 u'c/1/2/codereview.settings#32\n'
2629 u' Linter warning message text\n'),
2630 sender=u'tricium@serviceaccount.com',
2631 autogenerated=True, approval=False, disapproval=False)
2632 ]
2633 cl = git_cl.Changelist(
Edward Lemurf38bc172019-09-03 21:02:13 +00002634 issue=1, branchref='refs/heads/foo')
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002635 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002636
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002637 def test_get_remote_url_with_mirror(self):
2638 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002639
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002640 def selective_os_path_isdir_mock(path):
2641 if path == '/cache/this-dir-exists':
2642 return self._mocked_call('os.path.isdir', path)
2643 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002644
Edward Lemurda4b6c62020-02-13 00:28:40 +00002645 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002646
2647 url = 'https://chromium.googlesource.com/my/repo'
Edward Lemur26964072020-02-19 19:18:51 +00002648 self.mockGit.config['remote.origin.url'] = (
2649 '/cache/this-dir-exists')
2650 self.mockGit.config['/cache/this-dir-exists:remote.origin.url'] = (
2651 url)
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002652 self.calls = [
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002653 (('os.path.isdir', '/cache/this-dir-exists'),
2654 True),
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002655 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002656 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002657 self.assertEqual(cl.GetRemoteUrl(), url)
2658 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
2659
Edward Lemur298f2cf2019-02-22 21:40:39 +00002660 def test_get_remote_url_non_existing_mirror(self):
2661 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002662
Edward Lemur298f2cf2019-02-22 21:40:39 +00002663 def selective_os_path_isdir_mock(path):
2664 if path == '/cache/this-dir-doesnt-exist':
2665 return self._mocked_call('os.path.isdir', path)
2666 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002667
Edward Lemurda4b6c62020-02-13 00:28:40 +00002668 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
2669 mock.patch('logging.error',
2670 lambda *a: self._mocked_call('logging.error', *a)).start()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002671
Edward Lemur26964072020-02-19 19:18:51 +00002672 self.mockGit.config['remote.origin.url'] = (
2673 '/cache/this-dir-doesnt-exist')
Edward Lemur298f2cf2019-02-22 21:40:39 +00002674 self.calls = [
Edward Lemur298f2cf2019-02-22 21:40:39 +00002675 (('os.path.isdir', '/cache/this-dir-doesnt-exist'),
2676 False),
2677 (('logging.error',
Josip906bfde2020-01-31 22:38:49 +00002678 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2679 'but it doesn\'t exist.', {
2680 'remote': 'origin',
2681 'branch': 'master',
2682 'url': '/cache/this-dir-doesnt-exist'}
2683 ), None),
Edward Lemur298f2cf2019-02-22 21:40:39 +00002684 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002685 cl = git_cl.Changelist(issue=1)
Edward Lemur298f2cf2019-02-22 21:40:39 +00002686 self.assertIsNone(cl.GetRemoteUrl())
2687
2688 def test_get_remote_url_misconfigured_mirror(self):
2689 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002690
Edward Lemur298f2cf2019-02-22 21:40:39 +00002691 def selective_os_path_isdir_mock(path):
2692 if path == '/cache/this-dir-exists':
2693 return self._mocked_call('os.path.isdir', path)
2694 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002695
Edward Lemurda4b6c62020-02-13 00:28:40 +00002696 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
2697 mock.patch('logging.error',
2698 lambda *a: self._mocked_call('logging.error', *a)).start()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002699
Edward Lemur26964072020-02-19 19:18:51 +00002700 self.mockGit.config['remote.origin.url'] = (
2701 '/cache/this-dir-exists')
Edward Lemur298f2cf2019-02-22 21:40:39 +00002702 self.calls = [
Edward Lemur298f2cf2019-02-22 21:40:39 +00002703 (('os.path.isdir', '/cache/this-dir-exists'), True),
Edward Lemur298f2cf2019-02-22 21:40:39 +00002704 (('logging.error',
2705 'Remote "%(remote)s" for branch "%(branch)s" points to '
2706 '"%(cache_path)s", but it is misconfigured.\n'
2707 '"%(cache_path)s" must be a git repo and must have a remote named '
2708 '"%(remote)s" pointing to the git host.', {
2709 'remote': 'origin',
2710 'cache_path': '/cache/this-dir-exists',
2711 'branch': 'master'}
2712 ), None),
2713 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002714 cl = git_cl.Changelist(issue=1)
Edward Lemur298f2cf2019-02-22 21:40:39 +00002715 self.assertIsNone(cl.GetRemoteUrl())
2716
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002717 def test_gerrit_change_identifier_with_project(self):
Edward Lemur26964072020-02-19 19:18:51 +00002718 self.mockGit.config['remote.origin.url'] = (
2719 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemurf38bc172019-09-03 21:02:13 +00002720 cl = git_cl.Changelist(issue=123456)
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002721 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
2722
2723 def test_gerrit_change_identifier_without_project(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002724 mock.patch('logging.error',
2725 lambda *a: self._mocked_call('logging.error', *a)).start()
Josip906bfde2020-01-31 22:38:49 +00002726
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002727 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00002728 (('logging.error',
2729 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2730 'but it doesn\'t exist.', {
2731 'remote': 'origin',
2732 'branch': 'master',
2733 'url': ''}
2734 ), None),
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002735 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002736 cl = git_cl.Changelist(issue=123456)
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002737 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002738
Josip Sokcevicc39ab992020-09-24 20:09:15 +00002739 def test_gerrit_new_default(self):
2740 self._run_gerrit_upload_test(
2741 [],
2742 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
2743 [],
2744 squash=False,
2745 squash_mode='override_nosquash',
2746 change_id='I123456789',
2747 new_default=True)
2748
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002749
Edward Lemur9aa1a962020-02-25 00:58:38 +00002750class ChangelistTest(unittest.TestCase):
Edward Lemur227d5102020-02-25 23:45:35 +00002751 def setUp(self):
2752 super(ChangelistTest, self).setUp()
2753 mock.patch('gclient_utils.FileRead').start()
2754 mock.patch('gclient_utils.FileWrite').start()
2755 mock.patch('gclient_utils.temporary_file', TemporaryFileMock()).start()
2756 mock.patch(
2757 'git_cl.Changelist.GetCodereviewServer',
2758 return_value='https://chromium-review.googlesource.com').start()
2759 mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start()
2760 mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
2761 mock.patch('git_cl.Changelist.GetPatchset', return_value=7).start()
2762 mock.patch('git_cl.PRESUBMIT_SUPPORT', 'PRESUBMIT_SUPPORT').start()
2763 mock.patch('git_cl.Settings.GetRoot', return_value='root').start()
2764 mock.patch('git_cl.time_time').start()
2765 mock.patch('metrics.collector').start()
2766 mock.patch('subprocess2.Popen').start()
Saagar Sanghavi531d9922020-08-10 20:14:01 +00002767 mock.patch('git_cl.Changelist._GetGerritProject',
2768 return_value='https://chromium-review.googlesource.com').start()
Edward Lemur227d5102020-02-25 23:45:35 +00002769 self.addCleanup(mock.patch.stopall)
2770 self.temp_count = 0
2771
Edward Lemur227d5102020-02-25 23:45:35 +00002772 def testRunHook(self):
2773 expected_results = {
2774 'more_cc': ['more@example.com', 'cc@example.com'],
2775 'should_continue': True,
2776 }
2777 gclient_utils.FileRead.return_value = json.dumps(expected_results)
2778 git_cl.time_time.side_effect = [100, 200]
2779 mockProcess = mock.Mock()
2780 mockProcess.wait.return_value = 0
2781 subprocess2.Popen.return_value = mockProcess
2782
2783 cl = git_cl.Changelist()
2784 results = cl.RunHook(
2785 committing=True,
2786 may_prompt=True,
2787 verbose=2,
2788 parallel=True,
2789 upstream='upstream',
2790 description='description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002791 all_files=True,
2792 resultdb=False)
Edward Lemur227d5102020-02-25 23:45:35 +00002793
2794 self.assertEqual(expected_results, results)
2795 subprocess2.Popen.assert_called_once_with([
2796 'vpython', 'PRESUBMIT_SUPPORT',
Edward Lemur227d5102020-02-25 23:45:35 +00002797 '--root', 'root',
2798 '--upstream', 'upstream',
2799 '--verbose', '--verbose',
Edward Lemur99df04e2020-03-05 19:39:43 +00002800 '--author', 'author',
2801 '--gerrit_url', 'https://chromium-review.googlesource.com',
Edward Lemur227d5102020-02-25 23:45:35 +00002802 '--issue', '123456',
2803 '--patchset', '7',
Edward Lemur75526302020-02-27 22:31:05 +00002804 '--commit',
Edward Lemur227d5102020-02-25 23:45:35 +00002805 '--may_prompt',
2806 '--parallel',
2807 '--all_files',
2808 '--json_output', '/tmp/fake-temp2',
2809 '--description_file', '/tmp/fake-temp1',
Saagar Sanghavi531d9922020-08-10 20:14:01 +00002810 '--gerrit_project', 'https://chromium-review.googlesource.com',
Edward Lemur227d5102020-02-25 23:45:35 +00002811 ])
2812 gclient_utils.FileWrite.assert_called_once_with(
Edward Lemur1a83da12020-03-04 21:18:36 +00002813 '/tmp/fake-temp1', 'description')
Edward Lemur227d5102020-02-25 23:45:35 +00002814 metrics.collector.add_repeated('sub_commands', {
2815 'command': 'presubmit',
2816 'execution_time': 100,
2817 'exit_code': 0,
2818 })
2819
Edward Lemur99df04e2020-03-05 19:39:43 +00002820 def testRunHook_FewerOptions(self):
2821 expected_results = {
2822 'more_cc': ['more@example.com', 'cc@example.com'],
2823 'should_continue': True,
2824 }
2825 gclient_utils.FileRead.return_value = json.dumps(expected_results)
2826 git_cl.time_time.side_effect = [100, 200]
2827 mockProcess = mock.Mock()
2828 mockProcess.wait.return_value = 0
2829 subprocess2.Popen.return_value = mockProcess
2830
2831 git_cl.Changelist.GetAuthor.return_value = None
2832 git_cl.Changelist.GetIssue.return_value = None
2833 git_cl.Changelist.GetPatchset.return_value = None
2834 git_cl.Changelist.GetCodereviewServer.return_value = None
2835
2836 cl = git_cl.Changelist()
2837 results = cl.RunHook(
2838 committing=False,
2839 may_prompt=False,
2840 verbose=0,
2841 parallel=False,
2842 upstream='upstream',
2843 description='description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002844 all_files=False,
2845 resultdb=False)
Edward Lemur99df04e2020-03-05 19:39:43 +00002846
2847 self.assertEqual(expected_results, results)
2848 subprocess2.Popen.assert_called_once_with([
2849 'vpython', 'PRESUBMIT_SUPPORT',
2850 '--root', 'root',
2851 '--upstream', 'upstream',
2852 '--upload',
2853 '--json_output', '/tmp/fake-temp2',
2854 '--description_file', '/tmp/fake-temp1',
Saagar Sanghavi531d9922020-08-10 20:14:01 +00002855 '--gerrit_project', 'https://chromium-review.googlesource.com',
Edward Lemur99df04e2020-03-05 19:39:43 +00002856 ])
2857 gclient_utils.FileWrite.assert_called_once_with(
2858 '/tmp/fake-temp1', 'description')
2859 metrics.collector.add_repeated('sub_commands', {
2860 'command': 'presubmit',
2861 'execution_time': 100,
2862 'exit_code': 0,
2863 })
2864
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002865 def testRunHook_FewerOptionsResultDB(self):
2866 expected_results = {
2867 'more_cc': ['more@example.com', 'cc@example.com'],
2868 'should_continue': True,
2869 }
2870 gclient_utils.FileRead.return_value = json.dumps(expected_results)
2871 git_cl.time_time.side_effect = [100, 200]
2872 mockProcess = mock.Mock()
2873 mockProcess.wait.return_value = 0
2874 subprocess2.Popen.return_value = mockProcess
2875
2876 git_cl.Changelist.GetAuthor.return_value = None
2877 git_cl.Changelist.GetIssue.return_value = None
2878 git_cl.Changelist.GetPatchset.return_value = None
2879 git_cl.Changelist.GetCodereviewServer.return_value = None
2880
2881 cl = git_cl.Changelist()
2882 results = cl.RunHook(
2883 committing=False,
2884 may_prompt=False,
2885 verbose=0,
2886 parallel=False,
2887 upstream='upstream',
2888 description='description',
2889 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002890 resultdb=True,
2891 realm='chromium:public')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002892
2893 self.assertEqual(expected_results, results)
2894 subprocess2.Popen.assert_called_once_with([
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002895 'rdb', 'stream', '-new', '-realm', 'chromium:public', '--',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002896 'vpython', 'PRESUBMIT_SUPPORT',
2897 '--root', 'root',
2898 '--upstream', 'upstream',
2899 '--upload',
2900 '--json_output', '/tmp/fake-temp2',
2901 '--description_file', '/tmp/fake-temp1',
Saagar Sanghavi531d9922020-08-10 20:14:01 +00002902 '--gerrit_project', 'https://chromium-review.googlesource.com',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002903 ])
2904
Edward Lemur227d5102020-02-25 23:45:35 +00002905 @mock.patch('sys.exit', side_effect=SystemExitMock)
2906 def testRunHook_Failure(self, _mock):
2907 git_cl.time_time.side_effect = [100, 200]
2908 mockProcess = mock.Mock()
2909 mockProcess.wait.return_value = 2
2910 subprocess2.Popen.return_value = mockProcess
2911
2912 cl = git_cl.Changelist()
2913 with self.assertRaises(SystemExitMock):
2914 cl.RunHook(
2915 committing=True,
2916 may_prompt=True,
2917 verbose=2,
2918 parallel=True,
2919 upstream='upstream',
2920 description='description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00002921 all_files=True,
2922 resultdb=False)
Edward Lemur227d5102020-02-25 23:45:35 +00002923
2924 sys.exit.assert_called_once_with(2)
2925
Edward Lemur75526302020-02-27 22:31:05 +00002926 def testRunPostUploadHook(self):
2927 cl = git_cl.Changelist()
2928 cl.RunPostUploadHook(2, 'upstream', 'description')
2929
2930 subprocess2.Popen.assert_called_once_with([
2931 'vpython', 'PRESUBMIT_SUPPORT',
Edward Lemur75526302020-02-27 22:31:05 +00002932 '--root', 'root',
2933 '--upstream', 'upstream',
2934 '--verbose', '--verbose',
Edward Lemur99df04e2020-03-05 19:39:43 +00002935 '--author', 'author',
2936 '--gerrit_url', 'https://chromium-review.googlesource.com',
Edward Lemur75526302020-02-27 22:31:05 +00002937 '--issue', '123456',
2938 '--patchset', '7',
Edward Lemur75526302020-02-27 22:31:05 +00002939 '--post_upload',
2940 '--description_file', '/tmp/fake-temp1',
2941 ])
2942 gclient_utils.FileWrite.assert_called_once_with(
Edward Lemur1a83da12020-03-04 21:18:36 +00002943 '/tmp/fake-temp1', 'description')
Edward Lemur75526302020-02-27 22:31:05 +00002944
Edward Lemur9aa1a962020-02-25 00:58:38 +00002945
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002946class CMDTestCaseBase(unittest.TestCase):
2947 _STATUSES = [
2948 'STATUS_UNSPECIFIED', 'SCHEDULED', 'STARTED', 'SUCCESS', 'FAILURE',
2949 'INFRA_FAILURE', 'CANCELED',
2950 ]
2951 _CHANGE_DETAIL = {
2952 'project': 'depot_tools',
2953 'status': 'OPEN',
2954 'owner': {'email': 'owner@e.mail'},
2955 'current_revision': 'beeeeeef',
2956 'revisions': {
2957 'deadbeaf': {'_number': 6},
2958 'beeeeeef': {
2959 '_number': 7,
2960 'fetch': {'http': {
2961 'url': 'https://chromium.googlesource.com/depot_tools',
2962 'ref': 'refs/changes/56/123456/7'
2963 }},
2964 },
2965 },
2966 }
2967 _DEFAULT_RESPONSE = {
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00002968 'builds': [{
2969 'id': str(100 + idx),
2970 'builder': {
2971 'project': 'chromium',
2972 'bucket': 'try',
2973 'builder': 'bot_' + status.lower(),
2974 },
2975 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
2976 'tags': [],
2977 'status': status,
2978 } for idx, status in enumerate(_STATUSES)]
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002979 }
2980
Edward Lemur4c707a22019-09-24 21:13:43 +00002981 def setUp(self):
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002982 super(CMDTestCaseBase, self).setUp()
Edward Lemur79d4f992019-11-11 23:49:02 +00002983 mock.patch('git_cl.sys.stdout', StringIO()).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002984 mock.patch('git_cl.uuid.uuid4', return_value='uuid4').start()
2985 mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002986 mock.patch(
2987 'git_cl.Changelist.GetCodereviewServer',
2988 return_value='https://chromium-review.googlesource.com').start()
2989 mock.patch(
2990 'git_cl.Changelist._GetGerritHost',
2991 return_value='chromium-review.googlesource.com').start()
2992 mock.patch(
2993 'git_cl.Changelist.GetMostRecentPatchset',
2994 return_value=7).start()
2995 mock.patch(
2996 'git_cl.Changelist.GetRemoteUrl',
2997 return_value='https://chromium.googlesource.com/depot_tools').start()
2998 mock.patch(
2999 'auth.Authenticator',
3000 return_value=AuthenticatorMock()).start()
3001 mock.patch(
3002 'gerrit_util.GetChangeDetail',
3003 return_value=self._CHANGE_DETAIL).start()
3004 mock.patch(
3005 'git_cl._call_buildbucket',
3006 return_value = self._DEFAULT_RESPONSE).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003007 mock.patch('git_common.is_dirty_git_tree', return_value=False).start()
Edward Lemur4c707a22019-09-24 21:13:43 +00003008 self.addCleanup(mock.patch.stopall)
3009
Edward Lemur4c707a22019-09-24 21:13:43 +00003010
Edward Lemur9468eba2020-02-27 19:07:22 +00003011class CMDPresubmitTestCase(CMDTestCaseBase):
3012 def setUp(self):
3013 super(CMDPresubmitTestCase, self).setUp()
3014 mock.patch(
3015 'git_cl.Changelist.GetCommonAncestorWithUpstream',
3016 return_value='upstream').start()
3017 mock.patch(
3018 'git_cl.Changelist.FetchDescription',
3019 return_value='fetch description').start()
3020 mock.patch(
Edward Lemura12175c2020-03-09 16:58:26 +00003021 'git_cl._create_description_from_log',
Edward Lemur9468eba2020-02-27 19:07:22 +00003022 return_value='get description').start()
3023 mock.patch('git_cl.Changelist.RunHook').start()
3024
3025 def testDefaultCase(self):
3026 self.assertEqual(0, git_cl.main(['presubmit']))
3027 git_cl.Changelist.RunHook.assert_called_once_with(
3028 committing=True,
3029 may_prompt=False,
3030 verbose=0,
3031 parallel=None,
3032 upstream='upstream',
3033 description='fetch description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003034 all_files=None,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003035 resultdb=None,
3036 realm=None)
Edward Lemur9468eba2020-02-27 19:07:22 +00003037
3038 def testNoIssue(self):
3039 git_cl.Changelist.GetIssue.return_value = None
3040 self.assertEqual(0, git_cl.main(['presubmit']))
3041 git_cl.Changelist.RunHook.assert_called_once_with(
3042 committing=True,
3043 may_prompt=False,
3044 verbose=0,
3045 parallel=None,
3046 upstream='upstream',
3047 description='get description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003048 all_files=None,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003049 resultdb=None,
3050 realm=None)
Edward Lemur9468eba2020-02-27 19:07:22 +00003051
3052 def testCustomBranch(self):
3053 self.assertEqual(0, git_cl.main(['presubmit', 'custom_branch']))
3054 git_cl.Changelist.RunHook.assert_called_once_with(
3055 committing=True,
3056 may_prompt=False,
3057 verbose=0,
3058 parallel=None,
3059 upstream='custom_branch',
3060 description='fetch description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003061 all_files=None,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003062 resultdb=None,
3063 realm=None)
Edward Lemur9468eba2020-02-27 19:07:22 +00003064
3065 def testOptions(self):
3066 self.assertEqual(
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003067 0, git_cl.main(['presubmit', '-v', '-v', '--all', '--parallel', '-u',
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003068 '--resultdb', '--realm', 'chromium:public']))
Edward Lemur9468eba2020-02-27 19:07:22 +00003069 git_cl.Changelist.RunHook.assert_called_once_with(
3070 committing=False,
3071 may_prompt=False,
3072 verbose=2,
3073 parallel=True,
3074 upstream='upstream',
3075 description='fetch description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003076 all_files=True,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003077 resultdb=True,
3078 realm='chromium:public')
Edward Lemur9468eba2020-02-27 19:07:22 +00003079
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003080class CMDTryResultsTestCase(CMDTestCaseBase):
3081 _DEFAULT_REQUEST = {
3082 'predicate': {
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003083 "gerritChanges": [{
3084 "project": "depot_tools",
3085 "host": "chromium-review.googlesource.com",
3086 "patchset": 7,
3087 "change": 123456,
3088 }],
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003089 },
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003090 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
3091 ',builds.*.createTime,builds.*.tags'),
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003092 }
3093
3094 def testNoJobs(self):
3095 git_cl._call_buildbucket.return_value = {}
3096
3097 self.assertEqual(0, git_cl.main(['try-results']))
3098 self.assertEqual('No tryjobs scheduled.\n', sys.stdout.getvalue())
3099 git_cl._call_buildbucket.assert_called_once_with(
3100 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3101 self._DEFAULT_REQUEST)
3102
3103 def testPrintToStdout(self):
3104 self.assertEqual(0, git_cl.main(['try-results']))
3105 self.assertEqual([
3106 'Successes:',
3107 ' bot_success https://ci.chromium.org/b/103',
3108 'Infra Failures:',
3109 ' bot_infra_failure https://ci.chromium.org/b/105',
3110 'Failures:',
3111 ' bot_failure https://ci.chromium.org/b/104',
3112 'Canceled:',
3113 ' bot_canceled ',
3114 'Started:',
3115 ' bot_started https://ci.chromium.org/b/102',
3116 'Scheduled:',
3117 ' bot_scheduled id=101',
3118 'Other:',
3119 ' bot_status_unspecified id=100',
3120 'Total: 7 tryjobs',
3121 ], sys.stdout.getvalue().splitlines())
3122 git_cl._call_buildbucket.assert_called_once_with(
3123 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3124 self._DEFAULT_REQUEST)
3125
3126 def testPrintToStdoutWithMasters(self):
3127 self.assertEqual(0, git_cl.main(['try-results', '--print-master']))
3128 self.assertEqual([
3129 'Successes:',
3130 ' try bot_success https://ci.chromium.org/b/103',
3131 'Infra Failures:',
3132 ' try bot_infra_failure https://ci.chromium.org/b/105',
3133 'Failures:',
3134 ' try bot_failure https://ci.chromium.org/b/104',
3135 'Canceled:',
3136 ' try bot_canceled ',
3137 'Started:',
3138 ' try bot_started https://ci.chromium.org/b/102',
3139 'Scheduled:',
3140 ' try bot_scheduled id=101',
3141 'Other:',
3142 ' try bot_status_unspecified id=100',
3143 'Total: 7 tryjobs',
3144 ], sys.stdout.getvalue().splitlines())
3145 git_cl._call_buildbucket.assert_called_once_with(
3146 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3147 self._DEFAULT_REQUEST)
3148
3149 @mock.patch('git_cl.write_json')
3150 def testWriteToJson(self, mockJsonDump):
3151 self.assertEqual(0, git_cl.main(['try-results', '--json', 'file.json']))
3152 git_cl._call_buildbucket.assert_called_once_with(
3153 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3154 self._DEFAULT_REQUEST)
3155 mockJsonDump.assert_called_once_with(
3156 'file.json', self._DEFAULT_RESPONSE['builds'])
3157
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003158 def test_filter_failed_for_one_simple(self):
Edward Lemur45768512020-03-02 19:03:14 +00003159 self.assertEqual([], git_cl._filter_failed_for_retry([]))
3160 self.assertEqual(
3161 [
3162 ('chromium', 'try', 'bot_failure'),
3163 ('chromium', 'try', 'bot_infra_failure'),
3164 ],
3165 git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds']))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003166
3167 def test_filter_failed_for_retry_many_builds(self):
3168
3169 def _build(name, created_sec, status, experimental=False):
3170 assert 0 <= created_sec < 100, created_sec
3171 b = {
3172 'id': 112112,
3173 'builder': {
3174 'project': 'chromium',
3175 'bucket': 'try',
3176 'builder': name,
3177 },
3178 'createTime': '2019-10-09T08:00:%02d.854286Z' % created_sec,
3179 'status': status,
3180 'tags': [],
3181 }
3182 if experimental:
3183 b['tags'].append({'key': 'cq_experimental', 'value': 'true'})
3184 return b
3185
3186 builds = [
3187 _build('flaky-last-green', 1, 'FAILURE'),
3188 _build('flaky-last-green', 2, 'SUCCESS'),
3189 _build('flaky', 1, 'SUCCESS'),
3190 _build('flaky', 2, 'FAILURE'),
3191 _build('running', 1, 'FAILED'),
3192 _build('running', 2, 'SCHEDULED'),
3193 _build('yep-still-running', 1, 'STARTED'),
3194 _build('yep-still-running', 2, 'FAILURE'),
3195 _build('cq-experimental', 1, 'SUCCESS', experimental=True),
3196 _build('cq-experimental', 2, 'FAILURE', experimental=True),
3197
3198 # Simulate experimental in CQ builder, which developer decided
3199 # to retry manually which resulted in 2nd build non-experimental.
3200 _build('sometimes-experimental', 1, 'FAILURE', experimental=True),
3201 _build('sometimes-experimental', 2, 'FAILURE', experimental=False),
3202 ]
3203 builds.sort(key=lambda b: b['status']) # ~deterministic shuffle.
Edward Lemur45768512020-03-02 19:03:14 +00003204 self.assertEqual(
3205 [
3206 ('chromium', 'try', 'flaky'),
3207 ('chromium', 'try', 'sometimes-experimental'),
3208 ],
3209 git_cl._filter_failed_for_retry(builds))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003210
3211
3212class CMDTryTestCase(CMDTestCaseBase):
3213
3214 @mock.patch('git_cl.Changelist.SetCQState')
Edward Lemur45768512020-03-02 19:03:14 +00003215 def testSetCQDryRunByDefault(self, mockSetCQState):
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003216 mockSetCQState.return_value = 0
Edward Lemur4c707a22019-09-24 21:13:43 +00003217 self.assertEqual(0, git_cl.main(['try']))
3218 git_cl.Changelist.SetCQState.assert_called_with(git_cl._CQState.DRY_RUN)
3219 self.assertEqual(
3220 sys.stdout.getvalue(),
3221 'Scheduling CQ dry run on: '
3222 'https://chromium-review.googlesource.com/123456\n')
3223
Edward Lemur4c707a22019-09-24 21:13:43 +00003224 @mock.patch('git_cl._call_buildbucket')
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003225 def testScheduleOnBuildbucket(self, mockCallBuildbucket):
Edward Lemur4c707a22019-09-24 21:13:43 +00003226 mockCallBuildbucket.return_value = {}
Edward Lemur4c707a22019-09-24 21:13:43 +00003227
3228 self.assertEqual(0, git_cl.main([
3229 'try', '-B', 'luci.chromium.try', '-b', 'win',
3230 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
3231 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003232 'Scheduling jobs on:\n'
3233 ' chromium/try: win',
Edward Lemur4c707a22019-09-24 21:13:43 +00003234 git_cl.sys.stdout.getvalue())
3235
3236 expected_request = {
3237 "requests": [{
3238 "scheduleBuild": {
3239 "requestId": "uuid4",
3240 "builder": {
3241 "project": "chromium",
3242 "builder": "win",
3243 "bucket": "try",
3244 },
3245 "gerritChanges": [{
3246 "project": "depot_tools",
3247 "host": "chromium-review.googlesource.com",
3248 "patchset": 7,
3249 "change": 123456,
3250 }],
3251 "properties": {
3252 "category": "git_cl_try",
3253 "json": [{"a": 1}, None],
3254 "key": "val",
3255 },
3256 "tags": [
3257 {"value": "win", "key": "builder"},
3258 {"value": "git_cl_try", "key": "user_agent"},
3259 ],
3260 },
3261 }],
3262 }
3263 mockCallBuildbucket.assert_called_with(
3264 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3265
Anthony Polito1a5fe232020-01-24 23:17:52 +00003266 @mock.patch('git_cl._call_buildbucket')
3267 def testScheduleOnBuildbucketWithRevision(self, mockCallBuildbucket):
3268 mockCallBuildbucket.return_value = {}
3269
3270 self.assertEqual(0, git_cl.main([
3271 'try', '-B', 'luci.chromium.try', '-b', 'win', '-b', 'linux',
3272 '-p', 'key=val', '-p', 'json=[{"a":1}, null]',
3273 '-r', 'beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef']))
3274 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003275 'Scheduling jobs on:\n'
3276 ' chromium/try: linux\n'
3277 ' chromium/try: win',
Anthony Polito1a5fe232020-01-24 23:17:52 +00003278 git_cl.sys.stdout.getvalue())
3279
3280 expected_request = {
3281 "requests": [{
3282 "scheduleBuild": {
3283 "requestId": "uuid4",
3284 "builder": {
3285 "project": "chromium",
3286 "builder": "linux",
3287 "bucket": "try",
3288 },
3289 "gerritChanges": [{
3290 "project": "depot_tools",
3291 "host": "chromium-review.googlesource.com",
3292 "patchset": 7,
3293 "change": 123456,
3294 }],
3295 "properties": {
3296 "category": "git_cl_try",
3297 "json": [{"a": 1}, None],
3298 "key": "val",
3299 },
3300 "tags": [
3301 {"value": "linux", "key": "builder"},
3302 {"value": "git_cl_try", "key": "user_agent"},
3303 ],
3304 "gitilesCommit": {
3305 "host": "chromium-review.googlesource.com",
3306 "project": "depot_tools",
3307 "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
3308 }
3309 },
3310 },
3311 {
3312 "scheduleBuild": {
3313 "requestId": "uuid4",
3314 "builder": {
3315 "project": "chromium",
3316 "builder": "win",
3317 "bucket": "try",
3318 },
3319 "gerritChanges": [{
3320 "project": "depot_tools",
3321 "host": "chromium-review.googlesource.com",
3322 "patchset": 7,
3323 "change": 123456,
3324 }],
3325 "properties": {
3326 "category": "git_cl_try",
3327 "json": [{"a": 1}, None],
3328 "key": "val",
3329 },
3330 "tags": [
3331 {"value": "win", "key": "builder"},
3332 {"value": "git_cl_try", "key": "user_agent"},
3333 ],
3334 "gitilesCommit": {
3335 "host": "chromium-review.googlesource.com",
3336 "project": "depot_tools",
3337 "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
3338 }
3339 },
3340 }],
3341 }
3342 mockCallBuildbucket.assert_called_with(
3343 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3344
Edward Lemur45768512020-03-02 19:03:14 +00003345 @mock.patch('sys.stderr', StringIO())
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003346 def testScheduleOnBuildbucket_WrongBucket(self):
Edward Lemur45768512020-03-02 19:03:14 +00003347 with self.assertRaises(SystemExit):
3348 git_cl.main([
3349 'try', '-B', 'not-a-bucket', '-b', 'win',
3350 '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])
Edward Lemur4c707a22019-09-24 21:13:43 +00003351 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003352 'Invalid bucket: not-a-bucket.',
3353 sys.stderr.getvalue())
Edward Lemur4c707a22019-09-24 21:13:43 +00003354
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003355 @mock.patch('git_cl._call_buildbucket')
Quinten Yearsley777660f2020-03-04 23:37:06 +00003356 @mock.patch('git_cl._fetch_tryjobs')
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003357 def testScheduleOnBuildbucketRetryFailed(
3358 self, mockFetchTryJobs, mockCallBuildbucket):
Quinten Yearsley777660f2020-03-04 23:37:06 +00003359 git_cl._fetch_tryjobs.side_effect = lambda *_, **kw: {
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003360 7: [],
3361 6: [{
3362 'id': 112112,
3363 'builder': {
3364 'project': 'chromium',
3365 'bucket': 'try',
Quinten Yearsley777660f2020-03-04 23:37:06 +00003366 'builder': 'linux', },
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003367 'createTime': '2019-10-09T08:00:01.854286Z',
3368 'tags': [],
Quinten Yearsley777660f2020-03-04 23:37:06 +00003369 'status': 'FAILURE', }], }[kw['patchset']]
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003370 mockCallBuildbucket.return_value = {}
3371
3372 self.assertEqual(0, git_cl.main(['try', '--retry-failed']))
3373 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003374 'Scheduling jobs on:\n'
3375 ' chromium/try: linux',
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003376 git_cl.sys.stdout.getvalue())
3377
3378 expected_request = {
3379 "requests": [{
3380 "scheduleBuild": {
3381 "requestId": "uuid4",
3382 "builder": {
3383 "project": "chromium",
3384 "bucket": "try",
3385 "builder": "linux",
3386 },
3387 "gerritChanges": [{
3388 "project": "depot_tools",
3389 "host": "chromium-review.googlesource.com",
3390 "patchset": 7,
3391 "change": 123456,
3392 }],
3393 "properties": {
3394 "category": "git_cl_try",
3395 },
3396 "tags": [
3397 {"value": "linux", "key": "builder"},
3398 {"value": "git_cl_try", "key": "user_agent"},
3399 {"value": "1", "key": "retry_failed"},
3400 ],
3401 },
3402 }],
3403 }
3404 mockCallBuildbucket.assert_called_with(
3405 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3406
Edward Lemur4c707a22019-09-24 21:13:43 +00003407 def test_parse_bucket(self):
3408 test_cases = [
3409 {
3410 'bucket': 'chromium/try',
3411 'result': ('chromium', 'try'),
3412 },
3413 {
3414 'bucket': 'luci.chromium.try',
3415 'result': ('chromium', 'try'),
3416 'has_warning': True,
3417 },
3418 {
3419 'bucket': 'skia.primary',
3420 'result': ('skia', 'skia.primary'),
3421 'has_warning': True,
3422 },
3423 {
3424 'bucket': 'not-a-bucket',
3425 'result': (None, None),
3426 },
3427 ]
3428
3429 for test_case in test_cases:
3430 git_cl.sys.stdout.truncate(0)
3431 self.assertEqual(
3432 test_case['result'], git_cl._parse_bucket(test_case['bucket']))
3433 if test_case.get('has_warning'):
Edward Lemur6215c792019-10-03 21:59:05 +00003434 expected_warning = 'WARNING Please use %s/%s to specify the bucket' % (
3435 test_case['result'])
3436 self.assertIn(expected_warning, git_cl.sys.stdout.getvalue())
Edward Lemur4c707a22019-09-24 21:13:43 +00003437
3438
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003439class CMDUploadTestCase(CMDTestCaseBase):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003440
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003441 def setUp(self):
3442 super(CMDUploadTestCase, self).setUp()
Quinten Yearsley777660f2020-03-04 23:37:06 +00003443 mock.patch('git_cl._fetch_tryjobs').start()
3444 mock.patch('git_cl._trigger_tryjobs', return_value={}).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003445 mock.patch('git_cl.Changelist.CMDUpload', return_value=0).start()
Edward Lesmes0dd54822020-03-26 18:24:25 +00003446 mock.patch('git_cl.Settings.GetRoot', return_value='').start()
3447 mock.patch(
3448 'git_cl.Settings.GetSquashGerritUploads',
3449 return_value=True).start()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003450 self.addCleanup(mock.patch.stopall)
3451
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003452 def testWarmUpChangeDetailCache(self):
3453 self.assertEqual(0, git_cl.main(['upload']))
3454 gerrit_util.GetChangeDetail.assert_called_once_with(
3455 'chromium-review.googlesource.com', 'depot_tools~123456',
3456 frozenset([
3457 'LABELS', 'CURRENT_REVISION', 'DETAILED_ACCOUNTS',
3458 'CURRENT_COMMIT']))
3459
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003460 def testUploadRetryFailed(self):
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003461 # This test mocks out the actual upload part, and just asserts that after
3462 # upload, if --retry-failed is added, then the tool will fetch try jobs
3463 # from the previous patchset and trigger the right builders on the latest
3464 # patchset.
Quinten Yearsley777660f2020-03-04 23:37:06 +00003465 git_cl._fetch_tryjobs.side_effect = [
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003466 # Latest patchset: No builds.
3467 [],
3468 # Patchset before latest: Some builds.
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003469 [{
3470 'id': str(100 + idx),
3471 'builder': {
3472 'project': 'chromium',
3473 'bucket': 'try',
3474 'builder': 'bot_' + status.lower(),
3475 },
3476 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
3477 'tags': [],
3478 'status': status,
3479 } for idx, status in enumerate(self._STATUSES)],
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00003480 ]
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003481
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003482 self.assertEqual(0, git_cl.main(['upload', '--retry-failed']))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003483 self.assertEqual([
Edward Lemur5b929a42019-10-21 17:57:39 +00003484 mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
3485 mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
Quinten Yearsley777660f2020-03-04 23:37:06 +00003486 ], git_cl._fetch_tryjobs.mock_calls)
Edward Lemur45768512020-03-02 19:03:14 +00003487 expected_buckets = [
3488 ('chromium', 'try', 'bot_failure'),
3489 ('chromium', 'try', 'bot_infra_failure'),
3490 ]
Quinten Yearsley777660f2020-03-04 23:37:06 +00003491 git_cl._trigger_tryjobs.assert_called_once_with(mock.ANY, expected_buckets,
3492 mock.ANY, 8)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003493
Brian Sheedy59b06a82019-10-14 17:03:29 +00003494
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003495class MakeRequestsHelperTestCase(unittest.TestCase):
3496
3497 def exampleGerritChange(self):
3498 return {
3499 'host': 'chromium-review.googlesource.com',
3500 'project': 'depot_tools',
3501 'change': 1,
3502 'patchset': 2,
3503 }
3504
3505 def testMakeRequestsHelperNoOptions(self):
3506 # Basic test for the helper function _make_tryjob_schedule_requests;
3507 # it shouldn't throw AttributeError even when options doesn't have any
3508 # of the expected values; it will use default option values.
3509 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3510 jobs = [('chromium', 'try', 'my-builder')]
3511 options = optparse.Values()
3512 requests = git_cl._make_tryjob_schedule_requests(
3513 changelist, jobs, options, patchset=None)
3514
3515 # requestId is non-deterministic. Just assert that it's there and has
3516 # a particular length.
3517 self.assertEqual(len(requests[0]['scheduleBuild'].pop('requestId')), 36)
3518 self.assertEqual(requests, [{
3519 'scheduleBuild': {
3520 'builder': {
3521 'bucket': 'try',
3522 'builder': 'my-builder',
3523 'project': 'chromium'
3524 },
3525 'gerritChanges': [self.exampleGerritChange()],
3526 'properties': {
3527 'category': 'git_cl_try'
3528 },
3529 'tags': [{
3530 'key': 'builder',
3531 'value': 'my-builder'
3532 }, {
3533 'key': 'user_agent',
3534 'value': 'git_cl_try'
3535 }]
3536 }
3537 }])
3538
3539 def testMakeRequestsHelperPresubmitSetsDryRunProperty(self):
3540 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3541 jobs = [('chromium', 'try', 'presubmit')]
3542 options = optparse.Values()
3543 requests = git_cl._make_tryjob_schedule_requests(
3544 changelist, jobs, options, patchset=None)
3545 self.assertEqual(requests[0]['scheduleBuild']['properties'], {
3546 'category': 'git_cl_try',
3547 'dry_run': 'true'
3548 })
3549
3550 def testMakeRequestsHelperRevisionSet(self):
3551 # Gitiles commit is specified when revision is in options.
3552 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3553 jobs = [('chromium', 'try', 'my-builder')]
3554 options = optparse.Values({'revision': 'ba5eba11'})
3555 requests = git_cl._make_tryjob_schedule_requests(
3556 changelist, jobs, options, patchset=None)
3557 self.assertEqual(
3558 requests[0]['scheduleBuild']['gitilesCommit'], {
3559 'host': 'chromium-review.googlesource.com',
3560 'id': 'ba5eba11',
3561 'project': 'depot_tools'
3562 })
3563
3564 def testMakeRequestsHelperRetryFailedSet(self):
3565 # An extra tag is added when retry_failed is in options.
3566 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3567 jobs = [('chromium', 'try', 'my-builder')]
3568 options = optparse.Values({'retry_failed': 'true'})
3569 requests = git_cl._make_tryjob_schedule_requests(
3570 changelist, jobs, options, patchset=None)
3571 self.assertEqual(
3572 requests[0]['scheduleBuild']['tags'], [
3573 {
3574 'key': 'builder',
3575 'value': 'my-builder'
3576 },
3577 {
3578 'key': 'user_agent',
3579 'value': 'git_cl_try'
3580 },
3581 {
3582 'key': 'retry_failed',
3583 'value': '1'
3584 }
3585 ])
3586
3587 def testMakeRequestsHelperCategorySet(self):
Quinten Yearsley925cedb2020-04-13 17:49:39 +00003588 # The category property can be overridden with options.
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003589 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3590 jobs = [('chromium', 'try', 'my-builder')]
3591 options = optparse.Values({'category': 'my-special-category'})
3592 requests = git_cl._make_tryjob_schedule_requests(
3593 changelist, jobs, options, patchset=None)
3594 self.assertEqual(requests[0]['scheduleBuild']['properties'],
3595 {'category': 'my-special-category'})
3596
3597
Edward Lemurda4b6c62020-02-13 00:28:40 +00003598class CMDFormatTestCase(unittest.TestCase):
Brian Sheedy59b06a82019-10-14 17:03:29 +00003599
3600 def setUp(self):
3601 super(CMDFormatTestCase, self).setUp()
Jamie Madill5e96ad12020-01-13 16:08:35 +00003602 mock.patch('git_cl.RunCommand').start()
3603 mock.patch('clang_format.FindClangFormatToolInChromiumTree').start()
3604 mock.patch('clang_format.FindClangFormatScriptInChromiumTree').start()
3605 mock.patch('git_cl.settings').start()
Brian Sheedy59b06a82019-10-14 17:03:29 +00003606 self._top_dir = tempfile.mkdtemp()
Jamie Madill5e96ad12020-01-13 16:08:35 +00003607 self.addCleanup(mock.patch.stopall)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003608
3609 def tearDown(self):
3610 shutil.rmtree(self._top_dir)
3611 super(CMDFormatTestCase, self).tearDown()
3612
Jamie Madill5e96ad12020-01-13 16:08:35 +00003613 def _make_temp_file(self, fname, contents):
3614 with open(os.path.join(self._top_dir, fname), 'w') as tf:
3615 tf.write('\n'.join(contents))
3616
Brian Sheedy59b06a82019-10-14 17:03:29 +00003617 def _make_yapfignore(self, contents):
Jamie Madill5e96ad12020-01-13 16:08:35 +00003618 self._make_temp_file('.yapfignore', contents)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003619
Brian Sheedyb4307d52019-12-02 19:18:17 +00003620 def _check_yapf_filtering(self, files, expected):
3621 self.assertEqual(expected, git_cl._FilterYapfIgnoredFiles(
3622 files, git_cl._GetYapfIgnorePatterns(self._top_dir)))
Brian Sheedy59b06a82019-10-14 17:03:29 +00003623
Edward Lemur1a83da12020-03-04 21:18:36 +00003624 def _run_command_mock(self, return_value):
3625 def f(*args, **kwargs):
3626 if 'stdin' in kwargs:
3627 self.assertIsInstance(kwargs['stdin'], bytes)
3628 return return_value
3629 return f
3630
Jamie Madill5e96ad12020-01-13 16:08:35 +00003631 def testClangFormatDiffFull(self):
3632 self._make_temp_file('test.cc', ['// test'])
3633 git_cl.settings.GetFormatFullByDefault.return_value = False
3634 diff_file = [os.path.join(self._top_dir, 'test.cc')]
3635 mock_opts = mock.Mock(full=True, dry_run=True, diff=False)
3636
3637 # Diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003638 git_cl.RunCommand.side_effect = self._run_command_mock(' // test')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003639 return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
3640 self._top_dir, 'HEAD')
3641 self.assertEqual(2, return_value)
3642
3643 # No diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003644 git_cl.RunCommand.side_effect = self._run_command_mock('// test')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003645 return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
3646 self._top_dir, 'HEAD')
3647 self.assertEqual(0, return_value)
3648
3649 def testClangFormatDiff(self):
3650 git_cl.settings.GetFormatFullByDefault.return_value = False
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00003651 # A valid file is required, so use this test.
3652 clang_format.FindClangFormatToolInChromiumTree.return_value = __file__
Jamie Madill5e96ad12020-01-13 16:08:35 +00003653 mock_opts = mock.Mock(full=False, dry_run=True, diff=False)
3654
3655 # Diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003656 git_cl.RunCommand.side_effect = self._run_command_mock('error')
3657 return_value = git_cl._RunClangFormatDiff(
3658 mock_opts, ['.'], self._top_dir, 'HEAD')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003659 self.assertEqual(2, return_value)
3660
3661 # No diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003662 git_cl.RunCommand.side_effect = self._run_command_mock('')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003663 return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir,
3664 'HEAD')
3665 self.assertEqual(0, return_value)
3666
Brian Sheedyb4307d52019-12-02 19:18:17 +00003667 def testYapfignoreExplicit(self):
3668 self._make_yapfignore(['foo/bar.py', 'foo/bar/baz.py'])
3669 files = [
3670 'bar.py',
3671 'foo/bar.py',
3672 'foo/baz.py',
3673 'foo/bar/baz.py',
3674 'foo/bar/foobar.py',
3675 ]
3676 expected = [
3677 'bar.py',
3678 'foo/baz.py',
3679 'foo/bar/foobar.py',
3680 ]
3681 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003682
Brian Sheedyb4307d52019-12-02 19:18:17 +00003683 def testYapfignoreSingleWildcards(self):
3684 self._make_yapfignore(['*bar.py', 'foo*', 'baz*.py'])
3685 files = [
3686 'bar.py', # Matched by *bar.py.
3687 'bar.txt',
3688 'foobar.py', # Matched by *bar.py, foo*.
3689 'foobar.txt', # Matched by foo*.
3690 'bazbar.py', # Matched by *bar.py, baz*.py.
3691 'bazbar.txt',
3692 'foo/baz.txt', # Matched by foo*.
3693 'bar/bar.py', # Matched by *bar.py.
3694 'baz/foo.py', # Matched by baz*.py, foo*.
3695 'baz/foo.txt',
3696 ]
3697 expected = [
3698 'bar.txt',
3699 'bazbar.txt',
3700 'baz/foo.txt',
3701 ]
3702 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003703
Brian Sheedyb4307d52019-12-02 19:18:17 +00003704 def testYapfignoreMultiplewildcards(self):
3705 self._make_yapfignore(['*bar*', '*foo*baz.txt'])
3706 files = [
3707 'bar.py', # Matched by *bar*.
3708 'bar.txt', # Matched by *bar*.
3709 'abar.py', # Matched by *bar*.
3710 'foobaz.txt', # Matched by *foo*baz.txt.
3711 'foobaz.py',
3712 'afoobaz.txt', # Matched by *foo*baz.txt.
3713 ]
3714 expected = [
3715 'foobaz.py',
3716 ]
3717 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003718
3719 def testYapfignoreComments(self):
3720 self._make_yapfignore(['test.py', '#test2.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003721 files = [
3722 'test.py',
3723 'test2.py',
3724 ]
3725 expected = [
3726 'test2.py',
3727 ]
3728 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003729
3730 def testYapfignoreBlankLines(self):
3731 self._make_yapfignore(['test.py', '', '', 'test2.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003732 files = [
3733 'test.py',
3734 'test2.py',
3735 'test3.py',
3736 ]
3737 expected = [
3738 'test3.py',
3739 ]
3740 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003741
3742 def testYapfignoreWhitespace(self):
3743 self._make_yapfignore([' test.py '])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003744 files = [
3745 'test.py',
3746 'test2.py',
3747 ]
3748 expected = [
3749 'test2.py',
3750 ]
3751 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003752
Brian Sheedyb4307d52019-12-02 19:18:17 +00003753 def testYapfignoreNoFiles(self):
Brian Sheedy59b06a82019-10-14 17:03:29 +00003754 self._make_yapfignore(['test.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003755 self._check_yapf_filtering([], [])
3756
3757 def testYapfignoreMissingYapfignore(self):
3758 files = [
3759 'test.py',
3760 ]
3761 expected = [
3762 'test.py',
3763 ]
3764 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003765
3766
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003767if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003768 logging.basicConfig(
3769 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003770 unittest.main()