blob: 27056ba62bcb5916c96b1b7609513cd117dc51c4 [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
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +000045import owners_client
Edward Lemur85153282020-02-14 22:06:29 +000046import scm
maruel@chromium.orgddd59412011-11-30 14:20:38 +000047import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000048
Josip Sokcevic464e9ff2020-03-18 23:48:55 +000049NETRC_FILENAME = '_netrc' if sys.platform == 'win32' else '.netrc'
50
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000051
Edward Lemur0db01f02019-11-12 22:01:51 +000052def callError(code=1, cmd='', cwd='', stdout=b'', stderr=b''):
tandrii5d48c322016-08-18 16:19:37 -070053 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
54
tandrii5d48c322016-08-18 16:19:37 -070055CERR1 = callError(1)
56
57
Edward Lemur1773f372020-02-22 00:27:14 +000058class TemporaryFileMock(object):
59 def __init__(self):
60 self.suffix = 0
Aaron Gable9a03ae02017-11-03 11:31:07 -070061
Edward Lemur1773f372020-02-22 00:27:14 +000062 @contextlib.contextmanager
63 def __call__(self):
64 self.suffix += 1
65 yield '/tmp/fake-temp' + str(self.suffix)
Aaron Gable9a03ae02017-11-03 11:31:07 -070066
67
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000068class ChangelistMock(object):
69 # A class variable so we can access it when we don't have access to the
70 # instance that's being set.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000071 desc = ''
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +000072
73 def __init__(self, gerrit_change=None, **kwargs):
74 self._gerrit_change = gerrit_change
75
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000076 def GetIssue(self):
77 return 1
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +000078
Edward Lemur6c6827c2020-02-06 21:15:18 +000079 def FetchDescription(self):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000080 return ChangelistMock.desc
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +000081
dsansomee2d6fd92016-09-08 00:10:47 -070082 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000083 ChangelistMock.desc = desc
84
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +000085 def GetGerritChange(self, patchset=None, **kwargs):
86 del patchset
87 return self._gerrit_change
88
Josip Sokcevic9011a5b2021-02-12 18:59:44 +000089 def GetRemoteBranch(self):
90 return ('origin', 'refs/remotes/origin/main')
91
tandrii5d48c322016-08-18 16:19:37 -070092
Edward Lemur85153282020-02-14 22:06:29 +000093class GitMocks(object):
94 def __init__(self, config=None, branchref=None):
95 self.branchref = branchref or 'refs/heads/master'
96 self.config = config or {}
97
98 def GetBranchRef(self, _root):
99 return self.branchref
100
101 def NewBranch(self, branchref):
102 self.branchref = branchref
103
Edward Lemur26964072020-02-19 19:18:51 +0000104 def GetConfig(self, root, key, default=None):
105 if root != '':
106 key = '%s:%s' % (root, key)
Edward Lemur85153282020-02-14 22:06:29 +0000107 return self.config.get(key, default)
108
Edward Lemur26964072020-02-19 19:18:51 +0000109 def SetConfig(self, root, key, value=None):
110 if root != '':
111 key = '%s:%s' % (root, key)
Edward Lemur85153282020-02-14 22:06:29 +0000112 if value:
113 self.config[key] = value
114 return
115 if key not in self.config:
116 raise CERR1
117 del self.config[key]
118
119
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000120class WatchlistsMock(object):
121 def __init__(self, _):
122 pass
123 @staticmethod
124 def GetWatchersForPaths(_):
125 return ['joe@example.com']
126
127
Edward Lemur4c707a22019-09-24 21:13:43 +0000128class CodereviewSettingsFileMock(object):
129 def __init__(self):
130 pass
131 # pylint: disable=no-self-use
132 def read(self):
133 return ('CODE_REVIEW_SERVER: gerrit.chromium.org\n' +
134 'GERRIT_HOST: True\n')
135
136
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000137class AuthenticatorMock(object):
138 def __init__(self, *_args):
139 pass
140 def has_cached_credentials(self):
141 return True
tandrii221ab252016-10-06 08:12:04 -0700142 def authorize(self, http):
143 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000144
145
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100146def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
148
149 Usage:
150 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100151 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000152
153 OR
154 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100155 CookiesAuthenticatorMockFactory(
156 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000157 """
158 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800159 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000160 # Intentionally not calling super() because it reads actual cookie files.
161 pass
162 @classmethod
163 def get_gitcookies_path(cls):
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000164 return os.path.join('~', '.gitcookies')
165
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000166 @classmethod
167 def get_netrc_path(cls):
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000168 return os.path.join('~', NETRC_FILENAME)
169
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100170 def _get_auth_for_host(self, host):
171 if same_auth:
172 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000173 return (hosts_with_creds or {}).get(host)
174 return CookiesAuthenticatorMock
175
Aaron Gable9a03ae02017-11-03 11:31:07 -0700176
kmarshall9249e012016-08-23 12:02:16 -0700177class MockChangelistWithBranchAndIssue():
178 def __init__(self, branch, issue):
179 self.branch = branch
180 self.issue = issue
181 def GetBranch(self):
182 return self.branch
183 def GetIssue(self):
184 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000185
tandriic2405f52016-10-10 08:13:15 -0700186
187class SystemExitMock(Exception):
188 pass
189
190
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000191class TestGitClBasic(unittest.TestCase):
Josip Sokcevic953278a2020-02-28 19:46:36 +0000192 def setUp(self):
193 mock.patch('sys.exit', side_effect=SystemExitMock).start()
194 mock.patch('sys.stdout', StringIO()).start()
195 mock.patch('sys.stderr', StringIO()).start()
196 self.addCleanup(mock.patch.stopall)
197
198 def test_die_with_error(self):
199 with self.assertRaises(SystemExitMock):
200 git_cl.DieWithError('foo', git_cl.ChangeDescription('lorem ipsum'))
201 self.assertEqual(sys.stderr.getvalue(), 'foo\n')
202 self.assertTrue('saving CL description' in sys.stdout.getvalue())
203 self.assertTrue('Content of CL description' in sys.stdout.getvalue())
204 self.assertTrue('lorem ipsum' in sys.stdout.getvalue())
205 sys.exit.assert_called_once_with(1)
206
207 def test_die_with_error_no_desc(self):
208 with self.assertRaises(SystemExitMock):
209 git_cl.DieWithError('foo')
210 self.assertEqual(sys.stderr.getvalue(), 'foo\n')
211 self.assertEqual(sys.stdout.getvalue(), '')
212 sys.exit.assert_called_once_with(1)
213
Edward Lemur6c6827c2020-02-06 21:15:18 +0000214 def test_fetch_description(self):
Edward Lemurf38bc172019-09-03 21:02:13 +0000215 cl = git_cl.Changelist(issue=1, codereview_host='host')
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100216 cl.description = 'x'
Edward Lemur6c6827c2020-02-06 21:15:18 +0000217 self.assertEqual(cl.FetchDescription(), 'x')
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700218
Edward Lemur61bf4172020-02-24 23:22:37 +0000219 @mock.patch('git_cl.Changelist.EnsureAuthenticated')
220 @mock.patch('git_cl.Changelist.GetStatus', lambda cl: cl.status)
221 def test_get_cl_statuses(self, *_mocks):
222 statuses = [
223 'closed', 'commit', 'dry-run', 'lgtm', 'reply', 'unsent', 'waiting']
224 changes = []
225 for status in statuses:
226 cl = git_cl.Changelist()
227 cl.status = status
228 changes.append(cl)
229
230 actual = set(git_cl.get_cl_statuses(changes, True))
231 self.assertEqual(set(zip(changes, statuses)), actual)
232
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000233 def test_upload_to_non_default_branch_no_retry(self):
234 m = mock.patch('git_cl.Changelist._CMDUploadChange',
235 side_effect=[git_cl.GitPushError(), None]).start()
236 mock.patch('git_cl.Changelist.GetRemoteBranch',
237 return_value=('foo', 'bar')).start()
Edward Lesmeseeca9c62020-11-20 00:00:17 +0000238 mock.patch('git_cl.Changelist.GetGerritProject',
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000239 return_value='foo').start()
240 mock.patch('git_cl.gerrit_util.GetProjectHead',
241 return_value='refs/heads/main').start()
242
243 cl = git_cl.Changelist()
244 options = optparse.Values()
Josip Sokcevicb631a882021-01-06 18:18:10 +0000245 options.target_branch = 'refs/heads/bar'
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000246 with self.assertRaises(SystemExitMock):
247 cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
248
249 # ensure upload is called once
250 self.assertEqual(len(m.mock_calls), 1)
251 sys.exit.assert_called_once_with(1)
252 # option not set as retry didn't happen
253 self.assertFalse(hasattr(options, 'force'))
254 self.assertFalse(hasattr(options, 'edit_description'))
255
256 def test_upload_to_old_default_still_active(self):
257 m = mock.patch('git_cl.Changelist._CMDUploadChange',
258 side_effect=[git_cl.GitPushError(), None]).start()
259 mock.patch('git_cl.Changelist.GetRemoteBranch',
260 return_value=('foo', git_cl.DEFAULT_OLD_BRANCH)).start()
Edward Lesmeseeca9c62020-11-20 00:00:17 +0000261 mock.patch('git_cl.Changelist.GetGerritProject',
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000262 return_value='foo').start()
263 mock.patch('git_cl.gerrit_util.GetProjectHead',
Josip Sokcevicb631a882021-01-06 18:18:10 +0000264 return_value='refs/heads/master').start()
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000265
266 cl = git_cl.Changelist()
267 options = optparse.Values()
Josip Sokcevicb631a882021-01-06 18:18:10 +0000268 options.target_branch = 'refs/heads/master'
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000269 with self.assertRaises(SystemExitMock):
270 cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
271
272 # ensure upload is called once
273 self.assertEqual(len(m.mock_calls), 1)
274 sys.exit.assert_called_once_with(1)
275 # option not set as retry didn't happen
276 self.assertFalse(hasattr(options, 'force'))
277 self.assertFalse(hasattr(options, 'edit_description'))
278
279 def test_upload_to_old_default_retry_on_failure(self):
280 m = mock.patch('git_cl.Changelist._CMDUploadChange',
281 side_effect=[git_cl.GitPushError(), None]).start()
282 mock.patch('git_cl.Changelist.GetRemoteBranch',
283 return_value=('foo', git_cl.DEFAULT_OLD_BRANCH)).start()
Edward Lesmeseeca9c62020-11-20 00:00:17 +0000284 mock.patch('git_cl.Changelist.GetGerritProject',
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000285 return_value='foo').start()
286 mock.patch('git_cl.gerrit_util.GetProjectHead',
287 return_value='refs/heads/main').start()
288 mock.patch('git_cl.RunGit').start()
289
290 cl = git_cl.Changelist()
291 options = optparse.Values()
Josip Sokcevicb631a882021-01-06 18:18:10 +0000292 options.target_branch = 'refs/heads/master'
293 cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
294 # ensure upload is called twice
295 self.assertEqual(len(m.mock_calls), 2)
296 # option overrides on retry
297 self.assertEqual(options.force, True)
298 self.assertEqual(options.edit_description, False)
299
Gavin Mak68e6cf32021-01-25 18:24:08 +0000300 def test_upload_with_message_file_no_editor(self):
301 m = mock.patch('git_cl.ChangeDescription.prompt',
302 return_value=None).start()
303 mock.patch('git_cl.Changelist.GetRemoteBranch',
304 return_value=('foo', git_cl.DEFAULT_NEW_BRANCH)).start()
305 mock.patch('git_cl.GetTargetRef',
306 return_value='refs/heads/main').start()
307 mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck',
308 lambda _, offer_removal: None).start()
309 mock.patch('git_cl.Changelist.GetIssue', return_value=None).start()
310 mock.patch('git_cl.Changelist.GetBranch',
311 side_effect=SystemExitMock).start()
312 mock.patch('git_cl.GenerateGerritChangeId', return_value=None).start()
313 mock.patch('git_cl.RunGit').start()
314
315 cl = git_cl.Changelist()
316 options = optparse.Values()
317 options.target_branch = 'refs/heads/master'
318 options.squash = True
319 options.edit_description = False
320 options.force = False
321 options.preserve_tryjobs = False
322 options.message_file = "message.txt"
323
324 with self.assertRaises(SystemExitMock):
325 cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
326 self.assertEqual(len(m.mock_calls), 0)
327
328 options.message_file = None
329 with self.assertRaises(SystemExitMock):
330 cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
331 self.assertEqual(len(m.mock_calls), 1)
332
Josip Sokcevicb631a882021-01-06 18:18:10 +0000333 def test_upload_to_old_default_retry_on_rollback(self):
334 """Test when default branch migration had to be rolled back to old name"""
335 m = mock.patch('git_cl.Changelist._CMDUploadChange',
336 side_effect=[git_cl.GitPushError(), None]).start()
337 mock.patch('git_cl.Changelist.GetRemoteBranch',
338 return_value=('foo', git_cl.DEFAULT_NEW_BRANCH)).start()
339 mock.patch('git_cl.Changelist.GetGerritProject',
340 return_value='foo').start()
341 mock.patch('git_cl.gerrit_util.GetProjectHead',
342 return_value='refs/heads/master').start()
343 # GetTargetRef returns new default branch since it has stale remote
344 # information.
345 mock.patch('git_cl.GetTargetRef',
346 return_value='refs/heads/main').start()
347 mock.patch('git_cl.RunGit').start()
348
349 cl = git_cl.Changelist()
350 options = optparse.Values()
351 options.target_branch = 'refs/heads/master'
Josip Sokcevicf736cab2020-10-20 23:41:38 +0000352 cl.CMDUploadChange(options, [], 'foo', git_cl.ChangeDescription('bar'))
353 # ensure upload is called twice
354 self.assertEqual(len(m.mock_calls), 2)
355 # option overrides on retry
356 self.assertEqual(options.force, True)
357 self.assertEqual(options.edit_description, False)
358
Edward Lemur61bf4172020-02-24 23:22:37 +0000359 def test_get_cl_statuses_no_changes(self):
360 self.assertEqual([], list(git_cl.get_cl_statuses([], True)))
361
362 @mock.patch('git_cl.Changelist.EnsureAuthenticated')
363 @mock.patch('multiprocessing.pool.ThreadPool')
364 def test_get_cl_statuses_timeout(self, *_mocks):
365 changes = [git_cl.Changelist() for _ in range(2)]
366 pool = multiprocessing.pool.ThreadPool()
367 it = pool.imap_unordered.return_value.__iter__ = mock.Mock()
368 it.return_value.next.side_effect = [
369 (changes[0], 'lgtm'),
370 multiprocessing.TimeoutError,
371 ]
372
373 actual = list(git_cl.get_cl_statuses(changes, True))
374 self.assertEqual([(changes[0], 'lgtm'), (changes[1], 'error')], actual)
375
376 @mock.patch('git_cl.Changelist.GetIssueURL')
377 def test_get_cl_statuses_not_finegrained(self, _mock):
378 changes = [git_cl.Changelist() for _ in range(2)]
379 urls = ['some-url', None]
380 git_cl.Changelist.GetIssueURL.side_effect = urls
381
382 actual = set(git_cl.get_cl_statuses(changes, False))
383 self.assertEqual(
384 set([(changes[0], 'waiting'), (changes[1], 'error')]), actual)
385
Andrii Shyshkalov1ee78cd2020-03-12 01:31:53 +0000386 def test_get_issue_url(self):
387 cl = git_cl.Changelist(issue=123)
388 cl._gerrit_server = 'https://example.com'
389 self.assertEqual(cl.GetIssueURL(), 'https://example.com/123')
390 self.assertEqual(cl.GetIssueURL(short=True), 'https://example.com/123')
391
392 cl = git_cl.Changelist(issue=123)
393 cl._gerrit_server = 'https://chromium-review.googlesource.com'
394 self.assertEqual(cl.GetIssueURL(),
395 'https://chromium-review.googlesource.com/123')
396 self.assertEqual(cl.GetIssueURL(short=True), 'https://crrev.com/c/123')
397
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +0000398 def test_set_preserve_tryjobs(self):
399 d = git_cl.ChangeDescription('Simple.')
400 d.set_preserve_tryjobs()
401 self.assertEqual(d.description.splitlines(), [
402 'Simple.',
403 '',
404 'Cq-Do-Not-Cancel-Tryjobs: true',
405 ])
406 before = d.description
407 d.set_preserve_tryjobs()
408 self.assertEqual(before, d.description)
409
410 d = git_cl.ChangeDescription('\n'.join([
411 'One is enough',
412 '',
413 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
414 'Change-Id: Ideadbeef',
415 ]))
416 d.set_preserve_tryjobs()
417 self.assertEqual(d.description.splitlines(), [
418 'One is enough',
419 '',
420 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
421 'Change-Id: Ideadbeef',
422 'Cq-Do-Not-Cancel-Tryjobs: true',
423 ])
424
tandriif9aefb72016-07-01 09:06:51 -0700425 def test_get_bug_line_values(self):
426 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
427 self.assertEqual(f('', ''), [])
428 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
Lei Zhang8a0efc12020-08-05 19:58:45 +0000429 # Prefix that ends with colon.
430 self.assertEqual(f('v8:', '456'), ['v8:456'])
431 self.assertEqual(f('v8:', 'chromium:123,456'), ['v8:456', 'chromium:123'])
432 # Prefix that ends without colon.
tandriif9aefb72016-07-01 09:06:51 -0700433 self.assertEqual(f('v8', '456'), ['v8:456'])
434 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
435 # Not nice, but not worth carying.
Lei Zhang8a0efc12020-08-05 19:58:45 +0000436 self.assertEqual(f('v8:', 'chromium:123,456,v8:123'),
437 ['v8:456', 'chromium:123', 'v8:123'])
tandriif9aefb72016-07-01 09:06:51 -0700438 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
439 ['v8:456', 'chromium:123', 'v8:123'])
440
Edward Lemurda4b6c62020-02-13 00:28:40 +0000441 @mock.patch('gerrit_util.GetAccountDetails')
442 def test_valid_accounts(self, mockGetAccountDetails):
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000443 mock_per_account = {
444 'u1': None, # 404, doesn't exist.
445 'u2': {
446 '_account_id': 123124,
447 'avatars': [],
448 'email': 'u2@example.com',
449 'name': 'User Number 2',
450 'status': 'OOO',
451 },
452 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('),
453 }
454 def GetAccountDetailsMock(_, account):
455 # Poor-man's mock library's side_effect.
456 v = mock_per_account.pop(account)
457 if isinstance(v, Exception):
458 raise v
459 return v
460
Edward Lemurda4b6c62020-02-13 00:28:40 +0000461 mockGetAccountDetails.side_effect = GetAccountDetailsMock
462 actual = git_cl.gerrit_util.ValidAccounts(
463 'host', ['u1', 'u2', 'u3'], max_threads=1)
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000464 self.assertEqual(actual, {
465 'u2': {
466 '_account_id': 123124,
467 'avatars': [],
468 'email': 'u2@example.com',
469 'name': 'User Number 2',
470 'status': 'OOO',
471 },
472 })
473
474
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200475class TestParseIssueURL(unittest.TestCase):
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000476 def _test(self, arg, issue=None, patchset=None, hostname=None, fail=False):
477 parsed = git_cl.ParseIssueNumberArgument(arg)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200478 self.assertIsNotNone(parsed)
479 if fail:
480 self.assertFalse(parsed.valid)
481 return
482 self.assertTrue(parsed.valid)
483 self.assertEqual(parsed.issue, issue)
484 self.assertEqual(parsed.patchset, patchset)
485 self.assertEqual(parsed.hostname, hostname)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200486
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000487 def test_basic(self):
488 self._test('123', 123)
489 self._test('', fail=True)
490 self._test('abc', fail=True)
491 self._test('123/1', fail=True)
492 self._test('123a', fail=True)
493 self._test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
494 self._test('ssh://chrome-review.source.com/c/123/1/', fail=True)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200495
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000496 def test_gerrit_url(self):
497 self._test('https://codereview.source.com/123', 123, None,
498 'codereview.source.com')
499 self._test('http://chrome-review.source.com/c/123', 123, None,
500 'chrome-review.source.com')
501 self._test('https://chrome-review.source.com/c/123/', 123, None,
502 'chrome-review.source.com')
503 self._test('https://chrome-review.source.com/c/123/4', 123, 4,
504 'chrome-review.source.com')
505 self._test('https://chrome-review.source.com/#/c/123/4', 123, 4,
506 'chrome-review.source.com')
507 self._test('https://chrome-review.source.com/c/123/4', 123, 4,
508 'chrome-review.source.com')
509 self._test('https://chrome-review.source.com/123', 123, None,
510 'chrome-review.source.com')
511 self._test('https://chrome-review.source.com/123/4', 123, 4,
512 'chrome-review.source.com')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200513
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000514 self._test('https://chrome-review.source.com/bad/123/4', fail=True)
515 self._test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
516 self._test('https://chrome-review.source.com/c/abc/', fail=True)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200517
Andrii Shyshkalov8aebb602020-04-16 22:10:27 +0000518 def test_short_urls(self):
519 self._test('https://crrev.com/c/2151934', 2151934, None,
520 'chromium-review.googlesource.com')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200521
522
Edward Lemurda4b6c62020-02-13 00:28:40 +0000523class GitCookiesCheckerTest(unittest.TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100524 def setUp(self):
525 super(GitCookiesCheckerTest, self).setUp()
526 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100527 self.c._all_hosts = []
Edward Lemurda4b6c62020-02-13 00:28:40 +0000528 mock.patch('sys.stdout', StringIO()).start()
529 self.addCleanup(mock.patch.stopall)
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100530
531 def mock_hosts_creds(self, subhost_identity_pairs):
532 def ensure_googlesource(h):
533 if not h.endswith(self.c._GOOGLESOURCE):
534 assert not h.endswith('.')
535 return h + '.' + self.c._GOOGLESOURCE
536 return h
537 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
538 for h, i in subhost_identity_pairs]
539
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200540 def test_identity_parsing(self):
541 self.assertEqual(self.c._parse_identity('ldap.google.com'),
542 ('ldap', 'google.com'))
543 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
544 ('ldap', 'example.com'))
545 # Specical case because we know there are no subdomains in chromium.org.
546 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
547 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800548 # Pathological: ".period." can be either username OR domain, more likely
549 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200550 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
551 ('note', 'period.example.com'))
552
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100553 def test_analysis_nothing(self):
554 self.c._all_hosts = []
555 self.assertFalse(self.c.has_generic_host())
556 self.assertEqual(set(), self.c.get_conflicting_hosts())
557 self.assertEqual(set(), self.c.get_duplicated_hosts())
558 self.assertEqual(set(), self.c.get_partially_configured_hosts())
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100559
560 def test_analysis(self):
561 self.mock_hosts_creds([
562 ('.googlesource.com', 'git-example.chromium.org'),
563
564 ('chromium', 'git-example.google.com'),
565 ('chromium-review', 'git-example.google.com'),
566 ('chrome-internal', 'git-example.chromium.org'),
567 ('chrome-internal-review', 'git-example.chromium.org'),
568 ('conflict', 'git-example.google.com'),
569 ('conflict-review', 'git-example.chromium.org'),
570 ('dup', 'git-example.google.com'),
571 ('dup', 'git-example.google.com'),
572 ('dup-review', 'git-example.google.com'),
573 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200574 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100575 ])
576 self.assertTrue(self.c.has_generic_host())
577 self.assertEqual(set(['conflict.googlesource.com']),
578 self.c.get_conflicting_hosts())
579 self.assertEqual(set(['dup.googlesource.com']),
580 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200581 self.assertEqual(set(['partial.googlesource.com',
582 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100583 self.c.get_partially_configured_hosts())
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100584
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100585 def test_report_no_problems(self):
586 self.test_analysis_nothing()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100587 self.assertFalse(self.c.find_and_report_problems())
588 self.assertEqual(sys.stdout.getvalue(), '')
589
Edward Lemurda4b6c62020-02-13 00:28:40 +0000590 @mock.patch(
591 'git_cl.gerrit_util.CookiesAuthenticator.get_gitcookies_path',
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000592 return_value=os.path.join('~', '.gitcookies'))
Edward Lemurda4b6c62020-02-13 00:28:40 +0000593 def test_report(self, *_mocks):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100594 self.test_analysis()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100595 self.assertTrue(self.c.find_and_report_problems())
596 with open(os.path.join(os.path.dirname(__file__),
597 'git_cl_creds_check_report.txt')) as f:
Josip Sokcevic464e9ff2020-03-18 23:48:55 +0000598 expected = f.read() % {
599 'sep': os.sep,
600 }
601
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100602 def by_line(text):
603 return [l.rstrip() for l in text.rstrip().splitlines()]
Robert Iannucci456b0d62018-03-13 19:15:50 -0700604 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200605 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100606
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800607
Edward Lemurda4b6c62020-02-13 00:28:40 +0000608class TestGitCl(unittest.TestCase):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000609 def setUp(self):
610 super(TestGitCl, self).setUp()
611 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700612 self._calls_done = []
Edward Lesmes0dd54822020-03-26 18:24:25 +0000613 self.failed = False
Edward Lemurda4b6c62020-02-13 00:28:40 +0000614 mock.patch('sys.stdout', StringIO()).start()
615 mock.patch(
616 'git_cl.time_time',
617 lambda: self._mocked_call('time.time')).start()
618 mock.patch(
619 'git_cl.metrics.collector.add_repeated',
620 lambda *a: self._mocked_call('add_repeated', *a)).start()
621 mock.patch('subprocess2.call', self._mocked_call).start()
622 mock.patch('subprocess2.check_call', self._mocked_call).start()
623 mock.patch('subprocess2.check_output', self._mocked_call).start()
624 mock.patch(
625 'subprocess2.communicate',
626 lambda *a, **_k: ([self._mocked_call(*a), ''], 0)).start()
627 mock.patch(
628 'git_cl.gclient_utils.CheckCallAndFilter',
629 self._mocked_call).start()
630 mock.patch('git_common.is_dirty_git_tree', lambda x: False).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +0000631 mock.patch('git_cl.FindCodereviewSettingsFile', return_value='').start()
632 mock.patch(
633 'git_cl.SaveDescriptionBackup',
634 lambda _: self._mocked_call('SaveDescriptionBackup')).start()
635 mock.patch(
Edward Lemurda4b6c62020-02-13 00:28:40 +0000636 'git_cl.write_json',
637 lambda *a: self._mocked_call('write_json', *a)).start()
638 mock.patch(
Edward Lemur227d5102020-02-25 23:45:35 +0000639 'git_cl.Changelist.RunHook',
640 return_value={'more_cc': ['test-more-cc@chromium.org']}).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +0000641 mock.patch('git_cl.watchlists.Watchlists', WatchlistsMock).start()
642 mock.patch('git_cl.auth.Authenticator', AuthenticatorMock).start()
Edward Lesmes7677e5c2020-02-19 20:39:03 +0000643 mock.patch('gerrit_util.GetChangeDetail').start()
Edward Lemurda4b6c62020-02-13 00:28:40 +0000644 mock.patch(
645 'git_cl.gerrit_util.GetChangeComments',
646 lambda *a: self._mocked_call('GetChangeComments', *a)).start()
647 mock.patch(
648 'git_cl.gerrit_util.GetChangeRobotComments',
649 lambda *a: self._mocked_call('GetChangeRobotComments', *a)).start()
650 mock.patch(
651 'git_cl.gerrit_util.AddReviewers',
652 lambda *a: self._mocked_call('AddReviewers', *a)).start()
653 mock.patch(
654 'git_cl.gerrit_util.SetReview',
655 lambda h, i, msg=None, labels=None, notify=None, ready=None: (
656 self._mocked_call(
657 'SetReview', h, i, msg, labels, notify, ready))).start()
658 mock.patch(
659 'git_cl.gerrit_util.LuciContextAuthenticator.is_luci',
660 return_value=False).start()
661 mock.patch(
662 'git_cl.gerrit_util.GceAuthenticator.is_gce',
663 return_value=False).start()
664 mock.patch(
665 'git_cl.gerrit_util.ValidAccounts',
666 lambda *a: self._mocked_call('ValidAccounts', *a)).start()
Edward Lemurd55c5072020-02-20 01:09:07 +0000667 mock.patch('sys.exit', side_effect=SystemExitMock).start()
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000668 mock.patch('git_cl.Settings.GetRoot', return_value='').start()
Edward Lemur85153282020-02-14 22:06:29 +0000669 self.mockGit = GitMocks()
670 mock.patch('scm.GIT.GetBranchRef', self.mockGit.GetBranchRef).start()
671 mock.patch('scm.GIT.GetConfig', self.mockGit.GetConfig).start()
Edward Lesmes50da7702020-03-30 19:23:43 +0000672 mock.patch('scm.GIT.ResolveCommit', return_value='hash').start()
673 mock.patch('scm.GIT.IsValidRevision', return_value=True).start()
Edward Lemur85153282020-02-14 22:06:29 +0000674 mock.patch('scm.GIT.SetConfig', self.mockGit.SetConfig).start()
Edward Lemur84101642020-02-21 21:40:34 +0000675 mock.patch(
676 'git_new_branch.create_new_branch', self.mockGit.NewBranch).start()
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000677 mock.patch(
Edward Lemur85153282020-02-14 22:06:29 +0000678 'scm.GIT.FetchUpstreamTuple',
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000679 return_value=('origin', 'refs/heads/master')).start()
Edward Lemur85153282020-02-14 22:06:29 +0000680 mock.patch(
681 'scm.GIT.CaptureStatus', return_value=[('M', 'foo.txt')]).start()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000682 # It's important to reset settings to not have inter-tests interference.
683 git_cl.settings = None
Edward Lemurda4b6c62020-02-13 00:28:40 +0000684 self.addCleanup(mock.patch.stopall)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000685
686 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000687 try:
Edward Lesmes0dd54822020-03-26 18:24:25 +0000688 if not self.failed:
689 self.assertEqual([], self.calls)
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100690 except AssertionError:
Edward Lemur85153282020-02-14 22:06:29 +0000691 calls = ''.join(' %s\n' % str(call) for call in self.calls[:5])
692 if len(self.calls) > 5:
693 calls += ' ...\n'
694 self.fail(
695 '\n'
696 'There are un-consumed calls after this test has finished:\n' +
697 calls)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000698 finally:
699 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000700
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000701 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000702 self.assertTrue(
703 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700704 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000705 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000706 expected_args, result = top
707
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000708 # Also logs otherwise it could get caught in a try/finally and be hard to
709 # diagnose.
710 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700711 N = 5
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000712 prior_calls = '\n '.join(
tandrii9d206752016-06-20 11:32:47 -0700713 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
714 for i, c in enumerate(self._calls_done[-N:]))
715 following_calls = '\n '.join(
716 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
717 for i, c in enumerate(self.calls[:N]))
718 extended_msg = (
719 'A few prior calls:\n %s\n\n'
720 'This (expected):\n @%d: %r\n'
721 'This (actual):\n @%d: %r\n\n'
722 'A few following expected calls:\n %s' %
723 (prior_calls, len(self._calls_done), expected_args,
724 len(self._calls_done), args, following_calls))
tandrii9d206752016-06-20 11:32:47 -0700725
Edward Lesmes0dd54822020-03-26 18:24:25 +0000726 self.failed = True
tandrii99a72f22016-08-17 14:33:24 -0700727 self.fail('@%d\n'
728 ' Expected: %r\n'
Edward Lemur26964072020-02-19 19:18:51 +0000729 ' Actual: %r\n'
730 '\n'
731 '%s' % (
732 len(self._calls_done), expected_args, args, extended_msg))
tandrii9d206752016-06-20 11:32:47 -0700733
734 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700735 if isinstance(result, Exception):
736 raise result
Edward Lemur0db01f02019-11-12 22:01:51 +0000737 # stdout from git commands is supposed to be a bytestream. Convert it here
738 # instead of converting all test output in this file to bytes.
739 if args[0][0] == 'git' and not isinstance(result, bytes):
740 result = result.encode('utf-8')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000741 return result
742
Edward Lemur1a83da12020-03-04 21:18:36 +0000743 @mock.patch('sys.stdin', StringIO('blah\nye\n'))
744 @mock.patch('sys.stdout', StringIO())
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100745 def test_ask_for_explicit_yes_true(self):
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100746 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
Edward Lemur1a83da12020-03-04 21:18:36 +0000747 self.assertEqual(
748 'prompt [Yes/No]: Please, type yes or no: ',
749 sys.stdout.getvalue())
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100750
tandrii48df5812016-10-17 03:55:37 -0700751 def test_LoadCodereviewSettingsFromFile_gerrit(self):
Edward Lemur79d4f992019-11-11 23:49:02 +0000752 codereview_file = StringIO('GERRIT_HOST: true')
tandrii48df5812016-10-17 03:55:37 -0700753 self.calls = [
754 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700755 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
756 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
757 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
758 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700759 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
760 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700761 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
762 CERR1),
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000763 ((['git', 'config', '--unset-all', 'rietveld.format-full-by-default'],),
764 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700765 ((['git', 'config', 'gerrit.host', 'true'],), ''),
766 ]
767 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
768
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000769 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100770 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200771 fetched_status=None, other_cl_owner=None,
Anthony Polito8b955342019-09-24 19:01:36 +0000772 custom_cl_base=None, short_hostname='chromium',
Edward Lesmes8c43c3f2021-01-20 00:20:26 +0000773 change_id=None, default_branch='master'):
Edward Lemur26964072020-02-19 19:18:51 +0000774 calls = []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200775 if custom_cl_base:
776 ancestor_revision = custom_cl_base
777 else:
778 # Determine ancestor_revision to be merge base.
Edward Lesmes8c43c3f2021-01-20 00:20:26 +0000779 ancestor_revision = 'origin/' + default_branch
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200780
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100781 if issue:
Edward Lesmes7677e5c2020-02-19 20:39:03 +0000782 gerrit_util.GetChangeDetail.return_value = {
783 'owner': {'email': (other_cl_owner or 'owner@example.com')},
784 'change_id': (change_id or '123456789'),
785 'current_revision': 'sha1_of_current_revision',
786 'revisions': {'sha1_of_current_revision': {
787 'commit': {'message': fetched_description},
788 }},
789 'status': fetched_status or 'NEW',
790 }
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100791 if fetched_status == 'ABANDONED':
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100792 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100793 if other_cl_owner:
794 calls += [
795 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
796 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100797
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100798 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200799 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
800 ([custom_cl_base] if custom_cl_base else
801 [ancestor_revision, 'HEAD']),),
802 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100803 ]
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000804 calls += [
805 ((['git', 'show-branch', 'refs/remotes/origin/main'], ),
Edward Lesmes8c43c3f2021-01-20 00:20:26 +0000806 '1' if default_branch == 'main' else callError(1)),
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000807 ]
Edward Lemur2c62b332020-03-12 22:12:33 +0000808
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100809 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +0000810
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000811 def _gerrit_upload_calls(self,
812 description,
813 reviewers,
814 squash,
tandriia60502f2016-06-20 02:01:53 -0700815 squash_mode='default',
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000816 title=None,
817 notify=False,
818 post_amend_description=None,
819 issue=None,
820 cc=None,
821 custom_cl_base=None,
822 tbr=None,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +0000823 short_hostname='chromium',
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000824 labels=None,
825 change_id=None,
826 final_description=None,
827 gitcookies_exists=True,
828 force=False,
829 edit_description=None,
830 default_branch='master',
831 push_opts=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000832 if post_amend_description is None:
833 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -0700834 cc = cc or []
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000835 push_opts = push_opts if push_opts else []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200836
837 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000838
Edward Lesmes4de54132020-05-05 19:41:33 +0000839 if squash_mode in ('override_squash', 'override_nosquash'):
840 self.mockGit.config['gerrit.override-squash-uploads'] = (
841 'true' if squash_mode == 'override_squash' else 'false')
842
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000843 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000844 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200845 (('DownloadGerritHook', False), ''),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200846 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000847 if squash:
Edward Lemur5a644f82020-03-18 16:44:57 +0000848 if not issue and not force:
Edward Lemur5fb22242020-03-12 22:05:13 +0000849 calls += [
850 ((['RunEditor'],), description),
851 ]
Josipe827b0f2020-01-30 00:07:20 +0000852 # user wants to edit description
853 if edit_description:
854 calls += [
Josipe827b0f2020-01-30 00:07:20 +0000855 ((['RunEditor'],), edit_description),
856 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000857 ref_to_push = 'abcdef0123456789'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200858
859 if custom_cl_base is None:
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000860 parent = 'origin/' + default_branch
Edward Lesmes8c43c3f2021-01-20 00:20:26 +0000861 git_common.get_or_create_merge_base.return_value = parent
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200862 else:
863 calls += [
864 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000865 'refs/remotes/origin/' + default_branch],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200866 callError(1)), # Means not ancenstor.
867 (('ask_for_data',
868 'Do you take responsibility for cleaning up potential mess '
869 'resulting from proceeding with upload? Press Enter to upload, '
870 'or Ctrl+C to abort'), ''),
871 ]
872 parent = custom_cl_base
873
874 calls += [
875 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
876 '0123456789abcdef'),
Edward Lemur1773f372020-02-22 00:27:14 +0000877 ((['FileWrite', '/tmp/fake-temp1', description],), None),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200878 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Edward Lemur1773f372020-02-22 00:27:14 +0000879 '-F', '/tmp/fake-temp1'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200880 ref_to_push),
881 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000882 else:
883 ref_to_push = 'HEAD'
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000884 parent = 'origin/refs/heads/' + default_branch
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000885
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000886 calls += [
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000887 (('SaveDescriptionBackup',), None),
Edward Lemur5a644f82020-03-18 16:44:57 +0000888 ((['git', 'rev-list', parent + '..' + ref_to_push],),'1hashPerLine\n'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200889 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000890
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000891
892 metrics_arguments = [arg for arg in push_opts if arg != '-o']
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000893
Aaron Gableafd52772017-06-27 16:40:10 -0700894 if notify:
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000895 push_opts += ['-o', 'ready', '-o', 'notify=ALL']
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000896 metrics_arguments += ['ready', 'notify=ALL']
Aaron Gable844cf292017-06-28 11:32:59 -0700897 else:
Jamie Madill276da0b2018-04-27 14:41:20 -0400898 if not issue and squash:
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000899 push_opts += ['-o', 'wip']
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000900 metrics_arguments.append('wip')
Aaron Gable844cf292017-06-28 11:32:59 -0700901 else:
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000902 push_opts += ['-o', 'notify=NONE']
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000903 metrics_arguments.append('notify=NONE')
Aaron Gable9b713dd2016-12-14 16:04:21 -0800904
Edward Lemur5a644f82020-03-18 16:44:57 +0000905 # If issue is given, then description is fetched from Gerrit instead.
906 if issue is None:
907 if squash:
908 title = 'Initial upload'
909 else:
910 if not title:
911 calls += [
912 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
913 (('ask_for_data', 'Title for patchset []: '), 'User input'),
914 ]
915 title = 'User input'
Aaron Gable70f4e242017-06-26 10:45:59 -0700916 if title:
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000917 push_opts += ['-o', 'm=' + gerrit_util.PercentEncodeForGitRef(title)]
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000918 metrics_arguments.append('m')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000919
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000920 if short_hostname == 'chromium':
Quinten Yearsley925cedb2020-04-13 17:49:39 +0000921 # All reviewers and ccs get into ref_suffix.
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000922 for r in sorted(reviewers):
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000923 push_opts += ['-o', 'r=%s' % r]
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000924 metrics_arguments.append('r')
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000925
Edward Lemur4508b422019-10-03 21:56:35 +0000926 if issue is None:
Edward Lemur227d5102020-02-25 23:45:35 +0000927 cc += ['test-more-cc@chromium.org', 'joe@example.com']
Edward Lemur4508b422019-10-03 21:56:35 +0000928 for c in sorted(cc):
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000929 push_opts += ['-o', 'cc=%s' % c]
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000930 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000931 reviewers, cc = [], []
932 else:
933 # TODO(crbug/877717): remove this case.
934 calls += [
935 (('ValidAccounts', '%s-review.googlesource.com' % short_hostname,
936 sorted(reviewers) + ['joe@example.com',
Edward Lemur227d5102020-02-25 23:45:35 +0000937 'test-more-cc@chromium.org'] + cc),
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000938 {
939 e: {'email': e}
940 for e in (reviewers + ['joe@example.com'] + cc)
941 })
942 ]
943 for r in sorted(reviewers):
944 if r != 'bad-account-or-email':
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000945 push_opts += ['-o', 'r=%s' % r]
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000946 metrics_arguments.append('r')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000947 reviewers.remove(r)
Edward Lemur4508b422019-10-03 21:56:35 +0000948 if issue is None:
949 cc += ['joe@example.com']
950 for c in sorted(cc):
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000951 push_opts += ['-o', 'cc=%s' % c]
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000952 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000953 if c in cc:
954 cc.remove(c)
Andrii Shyshkalov76988a82018-10-15 03:12:25 +0000955
Edward Lemur687ca902018-12-05 02:30:30 +0000956 for k, v in sorted((labels or {}).items()):
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000957 push_opts += ['-o', 'l=%s+%d' % (k, v)]
Edward Lemur687ca902018-12-05 02:30:30 +0000958 metrics_arguments.append('l=%s+%d' % (k, v))
959
960 if tbr:
961 calls += [
962 (('GetCodeReviewTbrScore',
963 '%s-review.googlesource.com' % short_hostname,
964 'my/repo'),
965 2,),
966 ]
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +0000967
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000968 calls += [
Josip Sokcevice2c65d72021-03-25 16:07:27 +0000969 (
970 ('time.time', ),
971 1000,
972 ),
973 (
974 ([
975 'git', 'push',
976 'https://%s.googlesource.com/my/repo' % short_hostname,
977 ref_to_push + ':refs/for/refs/heads/' + default_branch
978 ] + push_opts, ),
979 (('remote:\n'
980 'remote: Processing changes: (\)\n'
981 'remote: Processing changes: (|)\n'
982 'remote: Processing changes: (/)\n'
983 'remote: Processing changes: (-)\n'
984 'remote: Processing changes: new: 1 (/)\n'
985 'remote: Processing changes: new: 1, done\n'
986 'remote:\n'
987 'remote: New Changes:\n'
988 'remote: '
989 'https://%s-review.googlesource.com/#/c/my/repo/+/123456'
990 ' XXX\n'
991 'remote:\n'
992 'To https://%s.googlesource.com/my/repo\n'
993 ' * [new branch] hhhh -> refs/for/refs/heads/%s\n') %
994 (short_hostname, short_hostname, default_branch)),
995 ),
996 (
997 ('time.time', ),
998 2000,
999 ),
1000 (
1001 ('add_repeated', 'sub_commands', {
1002 'execution_time': 1000,
1003 'command': 'git push',
1004 'exit_code': 0,
1005 'arguments': sorted(metrics_arguments),
1006 }),
1007 None,
1008 ),
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001009 ]
1010
Edward Lemur1b52d872019-05-09 21:12:12 +00001011 final_description = final_description or post_amend_description.strip()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001012
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001013 trace_name = os.path.join('TRACES_DIR', '20170316T200041.000000')
1014
Edward Lemur1b52d872019-05-09 21:12:12 +00001015 # Trace-related calls
1016 calls += [
1017 # Write a description with context for the current trace.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001018 (
1019 ([
1020 'FileWrite', trace_name + '-README',
1021 '%(date)s\n'
1022 '%(short_hostname)s-review.googlesource.com\n'
1023 '%(change_id)s\n'
1024 '%(title)s\n'
1025 '%(description)s\n'
1026 '1000\n'
1027 '0\n'
1028 '%(trace_name)s' % {
Josip Sokcevic5e18b602020-04-23 21:47:00 +00001029 'date': '2017-03-16T20:00:41.000000',
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001030 'short_hostname': short_hostname,
1031 'change_id': change_id,
1032 'description': final_description,
1033 'title': title or '<untitled>',
1034 'trace_name': trace_name,
1035 }
1036 ], ),
1037 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001038 ),
1039 # Read traces and shorten git hashes.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001040 (
1041 (['os.path.isfile',
1042 os.path.join('TEMP_DIR', 'trace-packet')], ),
1043 True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001044 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001045 (
1046 (['FileRead', os.path.join('TEMP_DIR', 'trace-packet')], ),
1047 ('git-hash: 0123456789012345678901234567890123456789\n'
1048 'git-hash: abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde\n'),
Edward Lemur1b52d872019-05-09 21:12:12 +00001049 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001050 (
1051 ([
1052 'FileWrite',
1053 os.path.join('TEMP_DIR', 'trace-packet'), 'git-hash: 012345\n'
1054 'git-hash: abcdea\n'
1055 ], ),
1056 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001057 ),
1058 # Make zip file for the git traces.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001059 (
1060 (['make_archive', trace_name + '-traces', 'zip', 'TEMP_DIR'], ),
1061 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001062 ),
1063 # Collect git config and gitcookies.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001064 (
1065 (['git', 'config', '-l'], ),
1066 'git-config-output',
Edward Lemur1b52d872019-05-09 21:12:12 +00001067 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001068 (
1069 ([
1070 'FileWrite',
1071 os.path.join('TEMP_DIR', 'git-config'), 'git-config-output'
1072 ], ),
1073 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001074 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001075 (
1076 (['os.path.isfile',
1077 os.path.join('~', '.gitcookies')], ),
1078 gitcookies_exists,
Edward Lemur1b52d872019-05-09 21:12:12 +00001079 ),
1080 ]
1081 if gitcookies_exists:
1082 calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001083 (
1084 (['FileRead', os.path.join('~', '.gitcookies')], ),
1085 'gitcookies 1/SECRET',
Edward Lemur1b52d872019-05-09 21:12:12 +00001086 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001087 (
1088 ([
1089 'FileWrite',
1090 os.path.join('TEMP_DIR', 'gitcookies'), 'gitcookies REDACTED'
1091 ], ),
1092 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001093 ),
1094 ]
1095 calls += [
1096 # Make zip file for the git config and gitcookies.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001097 (
1098 (['make_archive', trace_name + '-git-info', 'zip', 'TEMP_DIR'], ),
1099 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001100 ),
1101 ]
1102
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001103 # TODO(crbug/877717): this should never be used.
1104 if squash and short_hostname != 'chromium':
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001105 calls += [
1106 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001107 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001108 sorted(reviewers),
Edward Lemur227d5102020-02-25 23:45:35 +00001109 cc + ['test-more-cc@chromium.org'],
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00001110 notify),
1111 ''),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001112 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001113 return calls
1114
Josip Sokcevice2c65d72021-03-25 16:07:27 +00001115 def _run_gerrit_upload_test(self,
1116 upload_args,
1117 description,
1118 reviewers=None,
1119 squash=True,
1120 squash_mode=None,
1121 title=None,
1122 notify=False,
1123 post_amend_description=None,
1124 issue=None,
1125 cc=None,
1126 fetched_status=None,
1127 other_cl_owner=None,
1128 custom_cl_base=None,
1129 tbr=None,
1130 short_hostname='chromium',
1131 labels=None,
1132 change_id=None,
1133 final_description=None,
1134 gitcookies_exists=True,
1135 force=False,
1136 log_description=None,
1137 edit_description=None,
1138 fetched_description=None,
1139 default_branch='master',
1140 push_opts=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001141 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001142 if squash_mode is None:
1143 if '--no-squash' in upload_args:
1144 squash_mode = 'nosquash'
1145 elif '--squash' in upload_args:
1146 squash_mode = 'squash'
1147 else:
1148 squash_mode = 'default'
1149
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001150 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001151 cc = cc or []
Edward Lemurda4b6c62020-02-13 00:28:40 +00001152 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001153 CookiesAuthenticatorMockFactory(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001154 same_auth=('git-owner.example.com', '', 'pass'))).start()
1155 mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck',
1156 lambda _, offer_removal: None).start()
1157 mock.patch('git_cl.gclient_utils.RunEditor',
1158 lambda *_, **__: self._mocked_call(['RunEditor'])).start()
1159 mock.patch('git_cl.DownloadGerritHook', lambda force: self._mocked_call(
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001160 'DownloadGerritHook', force)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00001161 mock.patch('git_cl.gclient_utils.FileRead',
1162 lambda path: self._mocked_call(['FileRead', path])).start()
1163 mock.patch('git_cl.gclient_utils.FileWrite',
Edward Lemur1b52d872019-05-09 21:12:12 +00001164 lambda path, contents: self._mocked_call(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001165 ['FileWrite', path, contents])).start()
1166 mock.patch('git_cl.datetime_now',
1167 lambda: datetime.datetime(2017, 3, 16, 20, 0, 41, 0)).start()
1168 mock.patch('git_cl.tempfile.mkdtemp', lambda: 'TEMP_DIR').start()
1169 mock.patch('git_cl.TRACES_DIR', 'TRACES_DIR').start()
1170 mock.patch('git_cl.TRACES_README_FORMAT',
Edward Lemur75391d42019-05-14 23:35:56 +00001171 '%(now)s\n'
1172 '%(gerrit_host)s\n'
1173 '%(change_id)s\n'
1174 '%(title)s\n'
1175 '%(description)s\n'
1176 '%(execution_time)s\n'
1177 '%(exit_code)s\n'
Edward Lemurda4b6c62020-02-13 00:28:40 +00001178 '%(trace_name)s').start()
1179 mock.patch('git_cl.shutil.make_archive',
1180 lambda *args: self._mocked_call(['make_archive'] +
1181 list(args))).start()
1182 mock.patch('os.path.isfile',
1183 lambda path: self._mocked_call(['os.path.isfile', path])).start()
Edward Lemur9aa1a962020-02-25 00:58:38 +00001184 mock.patch(
Edward Lesmes0dd54822020-03-26 18:24:25 +00001185 'git_cl._create_description_from_log',
1186 return_value=log_description or description).start()
Edward Lemura12175c2020-03-09 16:58:26 +00001187 mock.patch(
1188 'git_cl.Changelist._AddChangeIdToCommitMessage',
1189 return_value=post_amend_description or description).start()
Edward Lemur1a83da12020-03-04 21:18:36 +00001190 mock.patch(
Edward Lemur5a644f82020-03-18 16:44:57 +00001191 'git_cl.GenerateGerritChangeId', return_value=change_id).start()
1192 mock.patch(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001193 'git_common.get_or_create_merge_base',
1194 return_value='origin/' + default_branch).start()
1195 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00001196 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00001197 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
tandriia60502f2016-06-20 02:01:53 -07001198
Edward Lemur26964072020-02-19 19:18:51 +00001199 self.mockGit.config['gerrit.host'] = 'true'
Edward Lemur85153282020-02-14 22:06:29 +00001200 self.mockGit.config['branch.master.gerritissue'] = (
1201 str(issue) if issue else None)
1202 self.mockGit.config['remote.origin.url'] = (
1203 'https://%s.googlesource.com/my/repo' % short_hostname)
Edward Lemur9aa1a962020-02-25 00:58:38 +00001204 self.mockGit.config['user.email'] = 'me@example.com'
Edward Lemur85153282020-02-14 22:06:29 +00001205
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001206 self.calls = self._gerrit_base_calls(
1207 issue=issue,
Anthony Polito8b955342019-09-24 19:01:36 +00001208 fetched_description=fetched_description or description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001209 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001210 other_cl_owner=other_cl_owner,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001211 custom_cl_base=custom_cl_base,
Anthony Polito8b955342019-09-24 19:01:36 +00001212 short_hostname=short_hostname,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001213 change_id=change_id,
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001214 default_branch=default_branch)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001215 if fetched_status != 'ABANDONED':
Edward Lemurda4b6c62020-02-13 00:28:40 +00001216 mock.patch(
Edward Lemur1773f372020-02-22 00:27:14 +00001217 'gclient_utils.temporary_file', TemporaryFileMock()).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00001218 mock.patch('os.remove', return_value=True).start()
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001219 self.calls += self._gerrit_upload_calls(
Josip Sokcevice2c65d72021-03-25 16:07:27 +00001220 description,
1221 reviewers,
1222 squash,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001223 squash_mode=squash_mode,
Josip Sokcevice2c65d72021-03-25 16:07:27 +00001224 title=title,
1225 notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001226 post_amend_description=post_amend_description,
Josip Sokcevice2c65d72021-03-25 16:07:27 +00001227 issue=issue,
1228 cc=cc,
1229 custom_cl_base=custom_cl_base,
1230 tbr=tbr,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001231 short_hostname=short_hostname,
Edward Lemur1b52d872019-05-09 21:12:12 +00001232 labels=labels,
1233 change_id=change_id,
Edward Lemur1b52d872019-05-09 21:12:12 +00001234 final_description=final_description,
Anthony Polito8b955342019-09-24 19:01:36 +00001235 gitcookies_exists=gitcookies_exists,
Josipe827b0f2020-01-30 00:07:20 +00001236 force=force,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001237 edit_description=edit_description,
Josip Sokcevice2c65d72021-03-25 16:07:27 +00001238 default_branch=default_branch,
1239 push_opts=push_opts)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001240 # Uncomment when debugging.
Raul Tambre80ee78e2019-05-06 22:41:05 +00001241 # print('\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001242 git_cl.main(['upload'] + upload_args)
Edward Lemur85153282020-02-14 22:06:29 +00001243 if squash:
Edward Lemur26964072020-02-19 19:18:51 +00001244 self.assertIssueAndPatchset(patchset=None)
Edward Lemur85153282020-02-14 22:06:29 +00001245 self.assertEqual(
1246 'abcdef0123456789',
Edward Lemur26964072020-02-19 19:18:51 +00001247 scm.GIT.GetBranchConfig('', 'master', 'gerritsquashhash'))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001248
Edward Lemur1b52d872019-05-09 21:12:12 +00001249 def test_gerrit_upload_traces_no_gitcookies(self):
1250 self._run_gerrit_upload_test(
1251 ['--no-squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001252 'desc ✔\n\nBUG=\n',
Edward Lemur1b52d872019-05-09 21:12:12 +00001253 [],
1254 squash=False,
Edward Lemur0db01f02019-11-12 22:01:51 +00001255 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001256 change_id='Ixxx',
1257 gitcookies_exists=False)
1258
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001259 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001260 self._run_gerrit_upload_test(
Edward Lemur5a644f82020-03-18 16:44:57 +00001261 [],
1262 'desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
1263 [],
1264 change_id='Ixxx')
1265
1266 def test_gerrit_upload_without_change_id_nosquash(self):
1267 self._run_gerrit_upload_test(
tandriia60502f2016-06-20 02:01:53 -07001268 ['--no-squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001269 'desc ✔\n\nBUG=\n',
tandriia60502f2016-06-20 02:01:53 -07001270 [],
1271 squash=False,
Edward Lemur0db01f02019-11-12 22:01:51 +00001272 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001273 change_id='Ixxx')
tandriia60502f2016-06-20 02:01:53 -07001274
Edward Lesmes4de54132020-05-05 19:41:33 +00001275 def test_gerrit_upload_without_change_id_override_nosquash(self):
1276 self._run_gerrit_upload_test(
1277 [],
1278 'desc ✔\n\nBUG=\n',
1279 [],
1280 squash=False,
1281 squash_mode='override_nosquash',
1282 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
1283 change_id='Ixxx')
1284
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001285 def test_gerrit_no_reviewer(self):
1286 self._run_gerrit_upload_test(
Edward Lesmes4de54132020-05-05 19:41:33 +00001287 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001288 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001289 [],
1290 squash=False,
Edward Lesmes4de54132020-05-05 19:41:33 +00001291 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001292 change_id='I123456789')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001293
Josip Sokcevice2c65d72021-03-25 16:07:27 +00001294 def test_gerrit_push_opts(self):
1295 self._run_gerrit_upload_test(['-o', 'wip'],
1296 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
1297 [],
1298 squash=False,
1299 squash_mode='override_nosquash',
1300 change_id='I123456789',
1301 push_opts=['-o', 'wip'])
1302
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001303 def test_gerrit_no_reviewer_non_chromium_host(self):
1304 # TODO(crbug/877717): remove this test case.
Josip Sokcevice2c65d72021-03-25 16:07:27 +00001305 self._run_gerrit_upload_test([],
1306 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
1307 [],
1308 squash=False,
1309 squash_mode='override_nosquash',
1310 short_hostname='other',
1311 change_id='I123456789')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001312
Edward Lesmes0dd54822020-03-26 18:24:25 +00001313 def test_gerrit_patchset_title_special_chars_nosquash(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001314 self._run_gerrit_upload_test(
Edward Lesmes4de54132020-05-05 19:41:33 +00001315 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001316 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001317 squash=False,
Edward Lesmes4de54132020-05-05 19:41:33 +00001318 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001319 change_id='I123456789',
Edward Lemur5a644f82020-03-18 16:44:57 +00001320 title='We\'ll escape ^_ ^ special chars...@{u}')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001321
ukai@chromium.orge8077812012-02-03 03:41:46 +00001322 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001323 self._run_gerrit_upload_test(
Edward Lesmes4de54132020-05-05 19:41:33 +00001324 ['-r', 'foo@example.com', '--send-mail'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001325 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
Edward Lemur5a644f82020-03-18 16:44:57 +00001326 reviewers=['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001327 squash=False,
Edward Lesmes4de54132020-05-05 19:41:33 +00001328 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001329 notify=True,
1330 change_id='I123456789',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001331 final_description=(
Edward Lemur0db01f02019-11-12 22:01:51 +00001332 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001333
Anthony Polito8b955342019-09-24 19:01:36 +00001334 def test_gerrit_upload_force_sets_bug(self):
1335 self._run_gerrit_upload_test(
1336 ['-b', '10000', '-f'],
1337 u'desc=\n\nBug: 10000\nChange-Id: Ixxx',
1338 [],
1339 force=True,
Anthony Polito8b955342019-09-24 19:01:36 +00001340 fetched_description='desc=\n\nChange-Id: Ixxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001341 change_id='Ixxx')
1342
Edward Lemur5fb22242020-03-12 22:05:13 +00001343 def test_gerrit_upload_corrects_wrong_change_id(self):
Anthony Polito8b955342019-09-24 19:01:36 +00001344 self._run_gerrit_upload_test(
Edward Lemur5fb22242020-03-12 22:05:13 +00001345 ['-b', '10000', '-m', 'Title', '--edit-description'],
1346 u'desc=\n\nBug: 10000\nChange-Id: Ixxxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001347 [],
Anthony Polito8b955342019-09-24 19:01:36 +00001348 issue='123456',
Edward Lemur5fb22242020-03-12 22:05:13 +00001349 edit_description='desc=\n\nBug: 10000\nChange-Id: Izzzz',
Anthony Polito8b955342019-09-24 19:01:36 +00001350 fetched_description='desc=\n\nChange-Id: Ixxxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001351 title='Title',
Edward Lemur5fb22242020-03-12 22:05:13 +00001352 change_id='Ixxxx')
Anthony Polito8b955342019-09-24 19:01:36 +00001353
Dan Beamd8b04ca2019-10-10 21:23:26 +00001354 def test_gerrit_upload_force_sets_fixed(self):
1355 self._run_gerrit_upload_test(
1356 ['-x', '10000', '-f'],
1357 u'desc=\n\nFixed: 10000\nChange-Id: Ixxx',
1358 [],
1359 force=True,
Dan Beamd8b04ca2019-10-10 21:23:26 +00001360 fetched_description='desc=\n\nChange-Id: Ixxx',
Dan Beamd8b04ca2019-10-10 21:23:26 +00001361 change_id='Ixxx')
1362
ukai@chromium.orge8077812012-02-03 03:41:46 +00001363 def test_gerrit_reviewer_multiple(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001364 mock.patch('git_cl.gerrit_util.GetCodeReviewTbrScore',
1365 lambda *a: self._mocked_call('GetCodeReviewTbrScore', *a)).start()
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001366 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001367 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001368 'desc ✔\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
bradnelsond975b302016-10-23 12:20:23 -07001369 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001370 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001371 ['reviewer@example.com', 'another@example.com'],
Aaron Gablefd238082017-06-07 13:42:34 -07001372 cc=['more@example.com', 'people@example.com'],
Edward Lemur687ca902018-12-05 02:30:30 +00001373 tbr='reviewer@example.com',
Edward Lemur1b52d872019-05-09 21:12:12 +00001374 labels={'Code-Review': 2},
Edward Lemur5a644f82020-03-18 16:44:57 +00001375 change_id='123456789')
tandriia60502f2016-06-20 02:01:53 -07001376
1377 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001378 self._run_gerrit_upload_test(
1379 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001380 'desc ✔\nBUG=\n\nChange-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001381 [],
Edward Lemur5a644f82020-03-18 16:44:57 +00001382 change_id='123456789')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001383
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001384 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001385 self._run_gerrit_upload_test(
1386 ['--squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001387 'desc ✔\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001388 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001389 squash=True,
Edward Lemur5a644f82020-03-18 16:44:57 +00001390 change_id='123456789')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001391
Edward Lesmes0dd54822020-03-26 18:24:25 +00001392 def test_gerrit_upload_squash_first_title(self):
1393 self._run_gerrit_upload_test(
1394 ['-f', '-t', 'title'],
1395 'title\n\ndesc\n\nChange-Id: 123456789',
1396 [],
1397 force=True,
1398 squash=True,
1399 log_description='desc',
1400 change_id='123456789')
1401
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001402 def test_gerrit_upload_squash_first_with_labels(self):
1403 self._run_gerrit_upload_test(
1404 ['--squash', '--cq-dry-run', '--enable-auto-submit'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001405 'desc ✔\nBUG=\n\nChange-Id: 123456789',
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001406 [],
1407 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001408 labels={'Commit-Queue': 1, 'Auto-Submit': 1},
Edward Lemur5a644f82020-03-18 16:44:57 +00001409 change_id='123456789')
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001410
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001411 def test_gerrit_upload_squash_first_against_rev(self):
1412 custom_cl_base = 'custom_cl_base_rev_or_branch'
1413 self._run_gerrit_upload_test(
1414 ['--squash', custom_cl_base],
Edward Lemur0db01f02019-11-12 22:01:51 +00001415 'desc ✔\nBUG=\n\nChange-Id: 123456789',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001416 [],
1417 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001418 custom_cl_base=custom_cl_base,
Edward Lemur5a644f82020-03-18 16:44:57 +00001419 change_id='123456789')
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001420 self.assertIn(
1421 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1422 sys.stdout.getvalue())
1423
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001424 def test_gerrit_upload_squash_reupload(self):
Edward Lemur0db01f02019-11-12 22:01:51 +00001425 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001426 self._run_gerrit_upload_test(
1427 ['--squash'],
1428 description,
1429 [],
1430 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001431 issue=123456,
Edward Lemur5a644f82020-03-18 16:44:57 +00001432 change_id='123456789')
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001433
Edward Lemurd55c5072020-02-20 01:09:07 +00001434 @mock.patch('sys.stderr', StringIO())
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001435 def test_gerrit_upload_squash_reupload_to_abandoned(self):
Edward Lemur0db01f02019-11-12 22:01:51 +00001436 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001437 with self.assertRaises(SystemExitMock):
1438 self._run_gerrit_upload_test(
1439 ['--squash'],
1440 description,
1441 [],
1442 squash=True,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001443 issue=123456,
Edward Lemur1b52d872019-05-09 21:12:12 +00001444 fetched_status='ABANDONED',
1445 change_id='123456789')
Edward Lemurd55c5072020-02-20 01:09:07 +00001446 self.assertEqual(
1447 'Change https://chromium-review.googlesource.com/123456 has been '
1448 'abandoned, new uploads are not allowed\n',
1449 sys.stderr.getvalue())
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001450
Edward Lemurda4b6c62020-02-13 00:28:40 +00001451 @mock.patch(
1452 'gerrit_util.GetAccountDetails',
1453 return_value={'email': 'yet-another@example.com'})
1454 def test_gerrit_upload_squash_reupload_to_not_owned(self, _mock):
Edward Lemur0db01f02019-11-12 22:01:51 +00001455 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001456 self._run_gerrit_upload_test(
1457 ['--squash'],
1458 description,
1459 [],
1460 squash=True,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001461 issue=123456,
Edward Lemur1b52d872019-05-09 21:12:12 +00001462 other_cl_owner='other@example.com',
Edward Lemur5a644f82020-03-18 16:44:57 +00001463 change_id='123456789')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001464 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001465 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001466 'authenticate to Gerrit as yet-another@example.com.\n'
1467 'Uploading may fail due to lack of permissions',
Edward Lemurda4b6c62020-02-13 00:28:40 +00001468 sys.stdout.getvalue())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001469
Josipe827b0f2020-01-30 00:07:20 +00001470 def test_upload_change_description_editor(self):
1471 fetched_description = 'foo\n\nChange-Id: 123456789'
1472 description = 'bar\n\nChange-Id: 123456789'
1473 self._run_gerrit_upload_test(
1474 ['--squash', '--edit-description'],
1475 description,
1476 [],
1477 fetched_description=fetched_description,
1478 squash=True,
Josipe827b0f2020-01-30 00:07:20 +00001479 issue=123456,
1480 change_id='123456789',
Josipe827b0f2020-01-30 00:07:20 +00001481 edit_description=description)
1482
Edward Lemurda4b6c62020-02-13 00:28:40 +00001483 @mock.patch('git_cl.RunGit')
1484 @mock.patch('git_cl.CMDupload')
Edward Lemur1a83da12020-03-04 21:18:36 +00001485 @mock.patch('sys.stdin', StringIO('\n'))
1486 @mock.patch('sys.stdout', StringIO())
Edward Lemurda4b6c62020-02-13 00:28:40 +00001487 def test_upload_branch_deps(self, *_mocks):
rmistry@google.com2dd99862015-06-22 12:22:18 +00001488 def mock_run_git(*args, **_kwargs):
1489 if args[0] == ['for-each-ref',
1490 '--format=%(refname:short) %(upstream:short)',
1491 'refs/heads']:
1492 # Create a local branch dependency tree that looks like this:
1493 # test1 -> test2 -> test3 -> test4 -> test5
1494 # -> test3.1
1495 # test6 -> test0
1496 branch_deps = [
1497 'test2 test1', # test1 -> test2
1498 'test3 test2', # test2 -> test3
1499 'test3.1 test2', # test2 -> test3.1
1500 'test4 test3', # test3 -> test4
1501 'test5 test4', # test4 -> test5
1502 'test6 test0', # test0 -> test6
1503 'test7', # test7
1504 ]
1505 return '\n'.join(branch_deps)
Edward Lemurda4b6c62020-02-13 00:28:40 +00001506 git_cl.RunGit.side_effect = mock_run_git
1507 git_cl.CMDupload.return_value = 0
rmistry@google.com2dd99862015-06-22 12:22:18 +00001508
1509 class MockChangelist():
1510 def __init__(self):
1511 pass
1512 def GetBranch(self):
1513 return 'test1'
1514 def GetIssue(self):
1515 return '123'
1516 def GetPatchset(self):
1517 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001518 def IsGerrit(self):
1519 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001520
1521 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1522 # CMDupload should have been called 5 times because of 5 dependent branches.
Edward Lemurda4b6c62020-02-13 00:28:40 +00001523 self.assertEqual(5, len(git_cl.CMDupload.mock_calls))
Edward Lemur1a83da12020-03-04 21:18:36 +00001524 self.assertIn(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001525 'This command will checkout all dependent branches '
1526 'and run "git cl upload". Press Enter to continue, '
Edward Lemur1a83da12020-03-04 21:18:36 +00001527 'or Ctrl+C to abort',
1528 sys.stdout.getvalue())
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001529 self.assertEqual(0, ret)
rmistry@google.com2dd99862015-06-22 12:22:18 +00001530
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001531 def test_gerrit_change_id(self):
1532 self.calls = [
1533 ((['git', 'write-tree'], ),
1534 'hashtree'),
1535 ((['git', 'rev-parse', 'HEAD~0'], ),
1536 'branch-parent'),
1537 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1538 'A B <a@b.org> 1456848326 +0100'),
1539 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1540 'C D <c@d.org> 1456858326 +0100'),
1541 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1542 'hashchange'),
1543 ]
1544 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1545 self.assertEqual(change_id, 'Ihashchange')
1546
Edward Lesmes8170c292021-03-19 20:04:43 +00001547 @mock.patch('gerrit_util.IsCodeOwnersEnabledOnHost')
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001548 @mock.patch('git_cl.Settings.GetBugPrefix')
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001549 @mock.patch('git_cl.Changelist.FetchDescription')
1550 @mock.patch('git_cl.Changelist.GetBranch')
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001551 @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
Edward Lesmese1576912021-02-16 21:53:34 +00001552 @mock.patch('git_cl.Changelist.GetGerritHost')
1553 @mock.patch('git_cl.Changelist.GetGerritProject')
1554 @mock.patch('git_cl.Changelist.GetRemoteBranch')
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001555 @mock.patch('owners_client.OwnersClient.BatchListOwners')
1556 def getDescriptionForUploadTest(
Edward Lesmese1576912021-02-16 21:53:34 +00001557 self, mockBatchListOwners=None, mockGetRemoteBranch=None,
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001558 mockGetGerritProject=None, mockGetGerritHost=None,
1559 mockGetCommonAncestorWithUpstream=None, mockGetBranch=None,
Edward Lesmese1576912021-02-16 21:53:34 +00001560 mockFetchDescription=None, mockGetBugPrefix=None,
Edward Lesmes8170c292021-03-19 20:04:43 +00001561 mockIsCodeOwnersEnabledOnHost=None,
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001562 initial_description='desc', bug=None, fixed=None, branch='branch',
1563 reviewers=None, tbrs=None, add_owners_to=None,
1564 expected_description='desc'):
1565 reviewers = reviewers or []
1566 tbrs = tbrs or []
1567 owners_by_path = {
1568 'a': ['a@example.com'],
1569 'b': ['b@example.com'],
1570 'c': ['c@example.com'],
1571 }
Edward Lesmes8170c292021-03-19 20:04:43 +00001572 mockIsCodeOwnersEnabledOnHost.return_value = True
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001573 mockGetBranch.return_value = branch
1574 mockGetBugPrefix.return_value = 'prefix'
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001575 mockGetCommonAncestorWithUpstream.return_value = 'upstream'
Edward Lesmese1576912021-02-16 21:53:34 +00001576 mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001577 mockFetchDescription.return_value = 'desc'
1578 mockBatchListOwners.side_effect = lambda ps: {
1579 p: owners_by_path.get(p)
1580 for p in ps
1581 }
1582
1583 cl = git_cl.Changelist(issue=1234)
1584 actual = cl._GetDescriptionForUpload(
1585 options=mock.Mock(
1586 bug=bug,
1587 fixed=fixed,
1588 reviewers=reviewers,
1589 tbrs=tbrs,
1590 add_owners_to=add_owners_to),
1591 git_diff_args=None,
1592 files=list(owners_by_path))
1593 self.assertEqual(expected_description, actual.description)
1594
1595 def testGetDescriptionForUpload(self):
1596 self.getDescriptionForUploadTest()
1597
1598 def testGetDescriptionForUpload_Bug(self):
1599 self.getDescriptionForUploadTest(
1600 bug='1234',
1601 expected_description='\n'.join([
1602 'desc',
1603 '',
1604 'Bug: prefix:1234',
1605 ]))
1606
1607 def testGetDescriptionForUpload_Fixed(self):
1608 self.getDescriptionForUploadTest(
1609 fixed='1234',
1610 expected_description='\n'.join([
1611 'desc',
1612 '',
1613 'Fixed: prefix:1234',
1614 ]))
1615
1616
1617 def testGetDescriptionForUpload_BugFromBranch(self):
1618 self.getDescriptionForUploadTest(
1619 branch='bug-1234',
1620 expected_description='\n'.join([
1621 'desc',
1622 '',
1623 'Bug: prefix:1234',
1624 ]))
1625
1626 def testGetDescriptionForUpload_FixedFromBranch(self):
1627 self.getDescriptionForUploadTest(
1628 branch='fix-1234',
1629 expected_description='\n'.join([
1630 'desc',
1631 '',
1632 'Fixed: prefix:1234',
1633 ]))
1634
1635 def testGetDescriptionForUpload_AddOwnersToR(self):
1636 self.getDescriptionForUploadTest(
1637 reviewers=['a@example.com'],
1638 tbrs=['b@example.com'],
1639 add_owners_to='R',
1640 expected_description='\n'.join([
1641 'desc',
1642 '',
1643 'R=a@example.com, c@example.com',
1644 'TBR=b@example.com',
1645 ]))
1646
1647 def testGetDescriptionForUpload_AddOwnersToTBR(self):
1648 self.getDescriptionForUploadTest(
1649 reviewers=['a@example.com'],
1650 tbrs=['b@example.com'],
1651 add_owners_to='TBR',
1652 expected_description='\n'.join([
1653 'desc',
1654 '',
1655 'R=a@example.com',
1656 'TBR=b@example.com, c@example.com',
1657 ]))
1658
1659 def testGetDescriptionForUpload_AddOwnersToNoOwnersNeeded(self):
1660 self.getDescriptionForUploadTest(
1661 reviewers=['a@example.com', 'c@example.com'],
1662 tbrs=['b@example.com'],
1663 add_owners_to='TBR',
1664 expected_description='\n'.join([
1665 'desc',
1666 '',
1667 'R=a@example.com, c@example.com',
1668 'TBR=b@example.com',
1669 ]))
1670
1671 def testGetDescriptionForUpload_Reviewers(self):
1672 self.getDescriptionForUploadTest(
1673 reviewers=['a@example.com', 'b@example.com'],
1674 expected_description='\n'.join([
1675 'desc',
1676 '',
1677 'R=a@example.com, b@example.com',
1678 ]))
1679
1680 def testGetDescriptionForUpload_TBRs(self):
1681 self.getDescriptionForUploadTest(
1682 tbrs=['a@example.com', 'b@example.com'],
1683 expected_description='\n'.join([
1684 'desc',
1685 '',
1686 'TBR=a@example.com, b@example.com',
1687 ]))
1688
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001689 def test_desecription_append_footer(self):
1690 for init_desc, footer_line, expected_desc in [
1691 # Use unique desc first lines for easy test failure identification.
1692 ('foo', 'R=one', 'foo\n\nR=one'),
1693 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1694 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1695 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1696 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1697 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1698 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1699 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1700 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1701 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1702 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1703 ]:
1704 desc = git_cl.ChangeDescription(init_desc)
1705 desc.append_footer(footer_line)
1706 self.assertEqual(desc.description, expected_desc)
1707
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001708 def test_update_reviewers(self):
1709 data = [
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001710 ('foo', [], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001711 'foo'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001712 ('foo\nR=xx', [], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001713 'foo\nR=xx'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001714 ('foo\nTBR=xx', [], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001715 'foo\nTBR=xx'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001716 ('foo', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001717 'foo\n\nR=a@c'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001718 ('foo\nR=xx', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001719 'foo\n\nR=a@c, xx'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001720 ('foo\nTBR=xx', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001721 'foo\n\nR=a@c\nTBR=xx'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001722 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001723 'foo\n\nR=a@c, yy\nTBR=xx'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001724 ('foo\nBUG=', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001725 'foo\nBUG=\nR=a@c'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001726 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001727 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001728 ('foo', ['a@c', 'b@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001729 'foo\n\nR=a@c, b@c'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001730 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001731 'foo\nBar\n\nR=c@c\nBUG='),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001732 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001733 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001734 # Same as the line before, but full of whitespaces.
1735 (
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001736 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001737 'foo\nBar\n\nR=c@c\n BUG =',
1738 ),
1739 # Whitespaces aren't interpreted as new lines.
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001740 ('foo BUG=allo R=joe ', ['c@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001741 'foo BUG=allo R=joe\n\nR=c@c'),
1742 # Redundant TBRs get promoted to Rs
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001743 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001744 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001745 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001746 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001747 actual = []
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001748 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001749 obj = git_cl.ChangeDescription(orig)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001750 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001751 actual.append(obj.description)
1752 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001753
Nodir Turakulov23b82142017-11-16 11:04:25 -08001754 def test_get_hash_tags(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001755 self.calls = [
1756 ((['git', 'show-branch', 'refs/remotes/origin/main'], ),
1757 callError(1)),
1758 ] * 9
Nodir Turakulov23b82142017-11-16 11:04:25 -08001759 cases = [
1760 ('', []),
1761 ('a', []),
1762 ('[a]', ['a']),
1763 ('[aa]', ['aa']),
1764 ('[a ]', ['a']),
1765 ('[a- ]', ['a']),
1766 ('[a- b]', ['a-b']),
1767 ('[a--b]', ['a-b']),
1768 ('[a', []),
1769 ('[a]x', ['a']),
1770 ('[aa]x', ['aa']),
1771 ('[a b]', ['a-b']),
1772 ('[a b]', ['a-b']),
1773 ('[a__b]', ['a-b']),
1774 ('[a] x', ['a']),
1775 ('[a][b]', ['a', 'b']),
1776 ('[a] [b]', ['a', 'b']),
1777 ('[a][b]x', ['a', 'b']),
1778 ('[a][b] x', ['a', 'b']),
1779 ('[a]\n[b]', ['a']),
1780 ('[a\nb]', []),
1781 ('[a][', ['a']),
1782 ('Revert "[a] feature"', ['a']),
1783 ('Reland "[a] feature"', ['a']),
1784 ('Revert: [a] feature', ['a']),
1785 ('Reland: [a] feature', ['a']),
1786 ('Revert "Reland: [a] feature"', ['a']),
1787 ('Foo: feature', ['foo']),
1788 ('Foo Bar: feature', ['foo-bar']),
Anthony Polito02b5af32019-12-02 19:49:47 +00001789 ('Change Foo::Bar', []),
1790 ('Foo: Change Foo::Bar', ['foo']),
Nodir Turakulov23b82142017-11-16 11:04:25 -08001791 ('Revert "Foo bar: feature"', ['foo-bar']),
1792 ('Reland "Foo bar: feature"', ['foo-bar']),
1793 ]
1794 for desc, expected in cases:
1795 change_desc = git_cl.ChangeDescription(desc)
1796 actual = change_desc.get_hash_tags()
1797 self.assertEqual(
1798 actual,
1799 expected,
1800 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1801
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001802 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001803 self.assertEqual(None, git_cl.GetTargetRef(None,
1804 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001805 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001806
wittman@chromium.org455dc922015-01-26 20:15:50 +00001807 # Check default target refs for branches.
1808 self.assertEqual('refs/heads/master',
1809 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001810 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001811 self.assertEqual('refs/heads/master',
1812 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001813 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001814 self.assertEqual('refs/heads/master',
1815 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001816 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001817 self.assertEqual('refs/branch-heads/123',
1818 git_cl.GetTargetRef('origin',
1819 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001820 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001821 self.assertEqual('refs/diff/test',
1822 git_cl.GetTargetRef('origin',
1823 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001824 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001825 self.assertEqual('refs/heads/chrome/m42',
1826 git_cl.GetTargetRef('origin',
1827 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001828 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001829
1830 # Check target refs for user-specified target branch.
1831 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1832 'refs/remotes/branch-heads/123'):
1833 self.assertEqual('refs/branch-heads/123',
1834 git_cl.GetTargetRef('origin',
1835 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001836 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001837 for branch in ('origin/master', 'remotes/origin/master',
1838 'refs/remotes/origin/master'):
1839 self.assertEqual('refs/heads/master',
1840 git_cl.GetTargetRef('origin',
1841 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001842 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001843 for branch in ('master', 'heads/master', 'refs/heads/master'):
1844 self.assertEqual('refs/heads/master',
1845 git_cl.GetTargetRef('origin',
1846 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001847 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001848
Edward Lemurda4b6c62020-02-13 00:28:40 +00001849 @mock.patch('git_common.is_dirty_git_tree', return_value=True)
1850 def test_patch_when_dirty(self, *_mocks):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001851 # Patch when local tree is dirty.
wychen@chromium.orga872e752015-04-28 23:42:18 +00001852 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1853
Edward Lemur85153282020-02-14 22:06:29 +00001854 def assertIssueAndPatchset(
1855 self, branch='master', issue='123456', patchset='7',
1856 git_short_host='chromium'):
1857 self.assertEqual(
Edward Lemur26964072020-02-19 19:18:51 +00001858 issue, scm.GIT.GetBranchConfig('', branch, 'gerritissue'))
Edward Lemur85153282020-02-14 22:06:29 +00001859 self.assertEqual(
Edward Lemur26964072020-02-19 19:18:51 +00001860 patchset, scm.GIT.GetBranchConfig('', branch, 'gerritpatchset'))
Edward Lemur85153282020-02-14 22:06:29 +00001861 self.assertEqual(
1862 'https://%s-review.googlesource.com' % git_short_host,
Edward Lemur26964072020-02-19 19:18:51 +00001863 scm.GIT.GetBranchConfig('', branch, 'gerritserver'))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001864
Edward Lemur85153282020-02-14 22:06:29 +00001865 def _patch_common(self, git_short_host='chromium'):
Edward Lesmes50da7702020-03-30 19:23:43 +00001866 mock.patch('scm.GIT.ResolveCommit', return_value='deadbeef').start()
Edward Lemur26964072020-02-19 19:18:51 +00001867 self.mockGit.config['remote.origin.url'] = (
1868 'https://%s.googlesource.com/my/repo' % git_short_host)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001869 gerrit_util.GetChangeDetail.return_value = {
1870 'current_revision': '7777777777',
1871 'revisions': {
1872 '1111111111': {
1873 '_number': 1,
1874 'fetch': {'http': {
1875 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1876 'ref': 'refs/changes/56/123456/1',
1877 }},
1878 },
1879 '7777777777': {
1880 '_number': 7,
1881 'fetch': {'http': {
1882 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1883 'ref': 'refs/changes/56/123456/7',
1884 }},
1885 },
1886 },
1887 }
wychen@chromium.orga872e752015-04-28 23:42:18 +00001888
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001889 def test_patch_gerrit_default(self):
Edward Lemur85153282020-02-14 22:06:29 +00001890 self._patch_common()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001891 self.calls += [
1892 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1893 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001894 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001895 ]
1896 self.assertEqual(git_cl.main(['patch', '123456']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001897 self.assertIssueAndPatchset()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001898
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001899 def test_patch_gerrit_new_branch(self):
Edward Lemur85153282020-02-14 22:06:29 +00001900 self._patch_common()
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001901 self.calls += [
1902 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1903 'refs/changes/56/123456/7'],), ''),
1904 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001905 ]
Edward Lemur85153282020-02-14 22:06:29 +00001906 self.assertEqual(git_cl.main(['patch', '-b', 'feature', '123456']), 0)
1907 self.assertIssueAndPatchset(branch='feature')
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001908
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001909 def test_patch_gerrit_force(self):
Edward Lemur85153282020-02-14 22:06:29 +00001910 self._patch_common('host')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001911 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001912 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001913 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001914 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001915 ]
Edward Lemur52969c92020-02-06 18:15:28 +00001916 self.assertEqual(git_cl.main(['patch', '123456', '--force']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001917 self.assertIssueAndPatchset(git_short_host='host')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001918
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001919 def test_patch_gerrit_guess_by_url(self):
Edward Lemur85153282020-02-14 22:06:29 +00001920 self._patch_common('else')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001921 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001922 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001923 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001924 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001925 ]
1926 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001927 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001928 self.assertIssueAndPatchset(patchset='1', git_short_host='else')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001929
Aaron Gable697a91b2018-01-19 15:20:15 -08001930 def test_patch_gerrit_guess_by_url_with_repo(self):
Edward Lemur85153282020-02-14 22:06:29 +00001931 self._patch_common('else')
Aaron Gable697a91b2018-01-19 15:20:15 -08001932 self.calls += [
1933 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1934 'refs/changes/56/123456/1'],), ''),
1935 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Aaron Gable697a91b2018-01-19 15:20:15 -08001936 ]
1937 self.assertEqual(git_cl.main(
1938 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1939 0)
Edward Lemur85153282020-02-14 22:06:29 +00001940 self.assertIssueAndPatchset(patchset='1', git_short_host='else')
Aaron Gable697a91b2018-01-19 15:20:15 -08001941
Edward Lemurd55c5072020-02-20 01:09:07 +00001942 @mock.patch('sys.stderr', StringIO())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001943 def test_patch_gerrit_conflict(self):
Edward Lemur85153282020-02-14 22:06:29 +00001944 self._patch_common()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001945 self.calls += [
1946 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001947 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001948 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001949 ]
1950 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001951 git_cl.main(['patch', '123456'])
Edward Lemurd55c5072020-02-20 01:09:07 +00001952 self.assertEqual(
1953 'Command "git cherry-pick FETCH_HEAD" failed.\n\n',
1954 sys.stderr.getvalue())
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001955
Edward Lemurda4b6c62020-02-13 00:28:40 +00001956 @mock.patch(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001957 'gerrit_util.GetChangeDetail',
Edward Lemurda4b6c62020-02-13 00:28:40 +00001958 side_effect=gerrit_util.GerritError(404, ''))
Edward Lemurd55c5072020-02-20 01:09:07 +00001959 @mock.patch('sys.stderr', StringIO())
Edward Lemurda4b6c62020-02-13 00:28:40 +00001960 def test_patch_gerrit_not_exists(self, *_mocks):
Edward Lemur26964072020-02-19 19:18:51 +00001961 self.mockGit.config['remote.origin.url'] = (
1962 'https://chromium.googlesource.com/my/repo')
tandriic2405f52016-10-10 08:13:15 -07001963 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001964 self.assertEqual(1, git_cl.main(['patch', '123456']))
Edward Lemurd55c5072020-02-20 01:09:07 +00001965 self.assertEqual(
1966 'change 123456 at https://chromium-review.googlesource.com does not '
1967 'exist or you have no access to it\n',
1968 sys.stderr.getvalue())
tandriic2405f52016-10-10 08:13:15 -07001969
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001970 def _checkout_calls(self):
1971 return [
1972 ((['git', 'config', '--local', '--get-regexp',
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001973 'branch\\..*\\.gerritissue'], ),
1974 ('branch.ger-branch.gerritissue 123456\n'
1975 'branch.gbranch654.gerritissue 654321\n')),
1976 ]
1977
1978 def test_checkout_gerrit(self):
1979 """Tests git cl checkout <issue>."""
1980 self.calls = self._checkout_calls()
1981 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1982 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1983
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001984 def test_checkout_not_found(self):
1985 """Tests git cl checkout <issue>."""
1986 self.calls = self._checkout_calls()
1987 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1988
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001989 def test_checkout_no_branch_issues(self):
1990 """Tests git cl checkout <issue>."""
1991 self.calls = [
1992 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001993 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001994 ]
1995 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1996
Edward Lemur26964072020-02-19 19:18:51 +00001997 def _test_gerrit_ensure_authenticated_common(self, auth):
Edward Lemur1a83da12020-03-04 21:18:36 +00001998 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00001999 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00002000 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002001 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2002 CookiesAuthenticatorMockFactory(hosts_with_creds=auth)).start()
Edward Lemur26964072020-02-19 19:18:51 +00002003 self.mockGit.config['remote.origin.url'] = (
2004 'https://chromium.googlesource.com/my/repo')
Edward Lemurf38bc172019-09-03 21:02:13 +00002005 cl = git_cl.Changelist()
tandrii@chromium.org28253532016-04-14 13:46:56 +00002006 cl.branch = 'master'
2007 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002008 return cl
2009
Edward Lemurd55c5072020-02-20 01:09:07 +00002010 @mock.patch('sys.stderr', StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002011 def test_gerrit_ensure_authenticated_missing(self):
2012 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002013 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002014 })
Edward Lemurd55c5072020-02-20 01:09:07 +00002015 with self.assertRaises(SystemExitMock):
2016 cl.EnsureAuthenticated(force=False)
2017 self.assertEqual(
2018 'Credentials for the following hosts are required:\n'
2019 ' chromium-review.googlesource.com\n'
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002020 'These are read from ~%(sep)s.gitcookies '
2021 '(or legacy ~%(sep)s%(netrc)s)\n'
Edward Lemurd55c5072020-02-20 01:09:07 +00002022 'You can (re)generate your credentials by visiting '
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002023 'https://chromium-review.googlesource.com/new-password\n' % {
2024 'sep': os.sep,
2025 'netrc': NETRC_FILENAME,
2026 }, sys.stderr.getvalue())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002027
2028 def test_gerrit_ensure_authenticated_conflict(self):
2029 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002030 'chromium.googlesource.com':
2031 ('git-one.example.com', None, 'secret1'),
2032 'chromium-review.googlesource.com':
2033 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002034 })
2035 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002036 (('ask_for_data', 'If you know what you are doing '
2037 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002038 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2039
2040 def test_gerrit_ensure_authenticated_ok(self):
2041 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002042 'chromium.googlesource.com':
2043 ('git-same.example.com', None, 'secret'),
2044 'chromium-review.googlesource.com':
2045 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002046 })
2047 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2048
tandrii@chromium.org28253532016-04-14 13:46:56 +00002049 def test_gerrit_ensure_authenticated_skipped(self):
Edward Lemur26964072020-02-19 19:18:51 +00002050 self.mockGit.config['gerrit.skip-ensure-authenticated'] = 'true'
2051 cl = self._test_gerrit_ensure_authenticated_common(auth={})
tandrii@chromium.org28253532016-04-14 13:46:56 +00002052 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2053
Eric Boren2fb63102018-10-05 13:05:03 +00002054 def test_gerrit_ensure_authenticated_bearer_token(self):
2055 cl = self._test_gerrit_ensure_authenticated_common(auth={
2056 'chromium.googlesource.com':
2057 ('', None, 'secret'),
2058 'chromium-review.googlesource.com':
2059 ('', None, 'secret'),
2060 })
2061 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2062 header = gerrit_util.CookiesAuthenticator().get_auth_header(
2063 'chromium.googlesource.com')
2064 self.assertTrue('Bearer' in header)
2065
Daniel Chengcf6269b2019-05-18 01:02:12 +00002066 def test_gerrit_ensure_authenticated_non_https(self):
Edward Lemur26964072020-02-19 19:18:51 +00002067 self.mockGit.config['remote.origin.url'] = 'custom-scheme://repo'
Daniel Chengcf6269b2019-05-18 01:02:12 +00002068 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00002069 (('logging.warning',
2070 'Ignoring branch %(branch)s with non-https remote '
2071 '%(remote)s', {
2072 'branch': 'master',
2073 'remote': 'custom-scheme://repo'}
2074 ), None),
Daniel Chengcf6269b2019-05-18 01:02:12 +00002075 ]
Edward Lemurda4b6c62020-02-13 00:28:40 +00002076 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2077 CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
2078 mock.patch('logging.warning',
2079 lambda *a: self._mocked_call('logging.warning', *a)).start()
Edward Lemurf38bc172019-09-03 21:02:13 +00002080 cl = git_cl.Changelist()
Daniel Chengcf6269b2019-05-18 01:02:12 +00002081 cl.branch = 'master'
2082 cl.branchref = 'refs/heads/master'
2083 cl.lookedup_issue = True
2084 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2085
Florian Mayerae510e82020-01-30 21:04:48 +00002086 def test_gerrit_ensure_authenticated_non_url(self):
Edward Lemur26964072020-02-19 19:18:51 +00002087 self.mockGit.config['remote.origin.url'] = (
2088 'git@somehost.example:foo/bar.git')
Florian Mayerae510e82020-01-30 21:04:48 +00002089 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00002090 (('logging.error',
2091 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2092 'but it doesn\'t exist.', {
2093 'remote': 'origin',
2094 'branch': 'master',
2095 'url': 'git@somehost.example:foo/bar.git'}
2096 ), None),
Florian Mayerae510e82020-01-30 21:04:48 +00002097 ]
Edward Lemurda4b6c62020-02-13 00:28:40 +00002098 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2099 CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
2100 mock.patch('logging.error',
2101 lambda *a: self._mocked_call('logging.error', *a)).start()
Florian Mayerae510e82020-01-30 21:04:48 +00002102 cl = git_cl.Changelist()
2103 cl.branch = 'master'
2104 cl.branchref = 'refs/heads/master'
2105 cl.lookedup_issue = True
2106 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2107
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002108 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
Edward Lemur85153282020-02-14 22:06:29 +00002109 self.mockGit.config['branch.master.gerritissue'] = '123'
2110 self.mockGit.config['branch.master.gerritserver'] = (
2111 'https://chromium-review.googlesource.com')
Edward Lemur26964072020-02-19 19:18:51 +00002112 self.mockGit.config['remote.origin.url'] = (
2113 'https://chromium.googlesource.com/infra/infra')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002114 self.calls = [
Edward Lemurda4b6c62020-02-13 00:28:40 +00002115 (('SetReview', 'chromium-review.googlesource.com',
2116 'infra%2Finfra~123', None,
2117 {'Commit-Queue': vote}, notify, None), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002118 ]
tandriid9e5ce52016-07-13 02:32:59 -07002119
2120 def test_cmd_set_commit_gerrit_clear(self):
2121 self._cmd_set_commit_gerrit_common(0)
2122 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2123
2124 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002125 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002126 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2127
tandriid9e5ce52016-07-13 02:32:59 -07002128 def test_cmd_set_commit_gerrit(self):
2129 self._cmd_set_commit_gerrit_common(2)
2130 self.assertEqual(0, git_cl.main(['set-commit']))
2131
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002132 def test_description_display(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002133 mock.patch('git_cl.Changelist', ChangelistMock).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002134 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002135
2136 self.assertEqual(0, git_cl.main(['description', '-d']))
Edward Lemurda4b6c62020-02-13 00:28:40 +00002137 self.assertEqual('foo\n', sys.stdout.getvalue())
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002138
Edward Lemurda4b6c62020-02-13 00:28:40 +00002139 @mock.patch('sys.stderr', StringIO())
iannucci3c972b92016-08-17 13:24:10 -07002140 def test_StatusFieldOverrideIssueMissingArgs(self):
iannucci3c972b92016-08-17 13:24:10 -07002141 try:
2142 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
Edward Lemurd55c5072020-02-20 01:09:07 +00002143 except SystemExitMock:
Edward Lemur6c6827c2020-02-06 21:15:18 +00002144 self.assertIn(
Edward Lemurda4b6c62020-02-13 00:28:40 +00002145 '--field must be given when --issue is set.', sys.stderr.getvalue())
iannucci3c972b92016-08-17 13:24:10 -07002146
2147 def test_StatusFieldOverrideIssue(self):
iannucci3c972b92016-08-17 13:24:10 -07002148 def assertIssue(cl_self, *_args):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002149 self.assertEqual(cl_self.issue, 1)
iannucci3c972b92016-08-17 13:24:10 -07002150 return 'foobar'
2151
Edward Lemurda4b6c62020-02-13 00:28:40 +00002152 mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
iannuccie53c9352016-08-17 14:40:40 -07002153 self.assertEqual(
Edward Lemur52969c92020-02-06 18:15:28 +00002154 git_cl.main(['status', '--issue', '1', '--field', 'desc']),
iannuccie53c9352016-08-17 14:40:40 -07002155 0)
Edward Lemurda4b6c62020-02-13 00:28:40 +00002156 self.assertEqual(sys.stdout.getvalue(), 'foobar\n')
iannucci3c972b92016-08-17 13:24:10 -07002157
iannuccie53c9352016-08-17 14:40:40 -07002158 def test_SetCloseOverrideIssue(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002159
iannuccie53c9352016-08-17 14:40:40 -07002160 def assertIssue(cl_self, *_args):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002161 self.assertEqual(cl_self.issue, 1)
iannuccie53c9352016-08-17 14:40:40 -07002162 return 'foobar'
2163
Edward Lemurda4b6c62020-02-13 00:28:40 +00002164 mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
2165 mock.patch('git_cl.Changelist.CloseIssue', lambda *_: None).start()
iannuccie53c9352016-08-17 14:40:40 -07002166 self.assertEqual(
Edward Lemur52969c92020-02-06 18:15:28 +00002167 git_cl.main(['set-close', '--issue', '1']), 0)
iannuccie53c9352016-08-17 14:40:40 -07002168
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00002169 def test_description(self):
Edward Lemur26964072020-02-19 19:18:51 +00002170 self.mockGit.config['remote.origin.url'] = (
2171 'https://chromium.googlesource.com/my/repo')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002172 gerrit_util.GetChangeDetail.return_value = {
2173 'current_revision': 'sha1',
2174 'revisions': {'sha1': {
2175 'commit': {'message': 'foobar'},
2176 }},
2177 }
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002178 self.assertEqual(0, git_cl.main([
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00002179 'description',
2180 'https://chromium-review.googlesource.com/c/my/repo/+/123123',
2181 '-d']))
Edward Lemurda4b6c62020-02-13 00:28:40 +00002182 self.assertEqual('foobar\n', sys.stdout.getvalue())
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002183
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002184 def test_description_set_raw(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002185 mock.patch('git_cl.Changelist', ChangelistMock).start()
2186 mock.patch('git_cl.sys.stdin', StringIO('hihi')).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002187
2188 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2189 self.assertEqual('hihi', ChangelistMock.desc)
2190
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002191 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002192 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002193
2194 def RunEditor(desc, _, **kwargs):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002195 self.assertEqual(
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002196 '# Enter a description of the change.\n'
2197 '# This will be displayed on the codereview site.\n'
2198 '# The first line will also be used as the subject of the review.\n'
2199 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002200 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002201 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002202 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002203 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002204 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002205
Edward Lemur6c6827c2020-02-06 21:15:18 +00002206 def UpdateDescription(_, desc, force=False):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002207 self.assertEqual(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002208
Edward Lemurda4b6c62020-02-13 00:28:40 +00002209 mock.patch('git_cl.Changelist.FetchDescription',
2210 lambda *args: current_desc).start()
2211 mock.patch('git_cl.Changelist.UpdateDescription',
2212 UpdateDescription).start()
2213 mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002214
Edward Lemur85153282020-02-14 22:06:29 +00002215 self.mockGit.config['branch.master.gerritissue'] = '123'
Edward Lemur52969c92020-02-06 18:15:28 +00002216 self.assertEqual(0, git_cl.main(['description']))
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002217
Dan Beamd8b04ca2019-10-10 21:23:26 +00002218 def test_description_does_not_append_bug_line_if_fixed_is_present(self):
2219 current_desc = 'Some.\n\nFixed: 123\nChange-Id: xxx'
2220
2221 def RunEditor(desc, _, **kwargs):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002222 self.assertEqual(
Dan Beamd8b04ca2019-10-10 21:23:26 +00002223 '# Enter a description of the change.\n'
2224 '# This will be displayed on the codereview site.\n'
2225 '# The first line will also be used as the subject of the review.\n'
2226 '#--------------------This line is 72 characters long'
2227 '--------------------\n'
2228 'Some.\n\nFixed: 123\nChange-Id: xxx',
2229 desc)
2230 return desc
2231
Edward Lemurda4b6c62020-02-13 00:28:40 +00002232 mock.patch('git_cl.Changelist.FetchDescription',
2233 lambda *args: current_desc).start()
2234 mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002235
Edward Lemur85153282020-02-14 22:06:29 +00002236 self.mockGit.config['branch.master.gerritissue'] = '123'
Edward Lemur52969c92020-02-06 18:15:28 +00002237 self.assertEqual(0, git_cl.main(['description']))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002238
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002239 def test_description_set_stdin(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002240 mock.patch('git_cl.Changelist', ChangelistMock).start()
2241 mock.patch('git_cl.sys.stdin', StringIO('hi \r\n\t there\n\nman')).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002242
2243 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2244 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2245
kmarshall3bff56b2016-06-06 18:31:47 -07002246 def test_archive(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002247 self.calls = [
2248 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
Edward Lemurf38bc172019-09-03 21:02:13 +00002249 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002250 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002251 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
Edward Lemurf38bc172019-09-03 21:02:13 +00002252 ((['git', 'branch', '-D', 'foo'],), '')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002253 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002254
Edward Lemurda4b6c62020-02-13 00:28:40 +00002255 mock.patch('git_cl.get_cl_statuses',
kmarshall3bff56b2016-06-06 18:31:47 -07002256 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002257 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2258 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002259 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall3bff56b2016-06-06 18:31:47 -07002260
2261 self.assertEqual(0, git_cl.main(['archive', '-f']))
2262
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002263 def test_archive_tag_collision(self):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002264 self.calls = [
2265 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2266 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2267 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],),
2268 'refs/tags/git-cl-archived-456-foo'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002269 ((['git', 'tag', 'git-cl-archived-456-foo-2', 'foo'],), ''),
2270 ((['git', 'branch', '-D', 'foo'],), '')
2271 ]
2272
Edward Lemurda4b6c62020-02-13 00:28:40 +00002273 mock.patch('git_cl.get_cl_statuses',
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002274 lambda branches, fine_grained, max_processes:
2275 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2276 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002277 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002278
2279 self.assertEqual(0, git_cl.main(['archive', '-f']))
2280
kmarshall3bff56b2016-06-06 18:31:47 -07002281 def test_archive_current_branch_fails(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002282 self.calls = [
2283 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2284 'refs/heads/master'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002285 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002286 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002287
Edward Lemurda4b6c62020-02-13 00:28:40 +00002288 mock.patch('git_cl.get_cl_statuses',
kmarshall9249e012016-08-23 12:02:16 -07002289 lambda branches, fine_grained, max_processes:
Edward Lemurda4b6c62020-02-13 00:28:40 +00002290 [(MockChangelistWithBranchAndIssue('master', 1),
2291 'closed')]).start()
kmarshall9249e012016-08-23 12:02:16 -07002292
2293 self.assertEqual(1, git_cl.main(['archive', '-f']))
2294
2295 def test_archive_dry_run(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002296 self.calls = [
2297 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2298 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002299 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002300 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002301
Edward Lemurda4b6c62020-02-13 00:28:40 +00002302 mock.patch('git_cl.get_cl_statuses',
kmarshall3bff56b2016-06-06 18:31:47 -07002303 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002304 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2305 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002306 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall3bff56b2016-06-06 18:31:47 -07002307
kmarshall9249e012016-08-23 12:02:16 -07002308 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2309
2310 def test_archive_no_tags(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002311 self.calls = [
2312 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2313 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002314 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002315 ((['git', 'branch', '-D', 'foo'],), '')
2316 ]
kmarshall9249e012016-08-23 12:02:16 -07002317
Edward Lemurda4b6c62020-02-13 00:28:40 +00002318 mock.patch('git_cl.get_cl_statuses',
kmarshall9249e012016-08-23 12:02:16 -07002319 lambda branches, fine_grained, max_processes:
2320 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2321 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002322 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall9249e012016-08-23 12:02:16 -07002323
2324 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002325
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002326 def test_archive_tag_cleanup_on_branch_deletion_error(self):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002327 self.calls = [
2328 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2329 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2330 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002331 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],),
2332 'refs/tags/git-cl-archived-456-foo'),
2333 ((['git', 'branch', '-D', 'foo'],), CERR1),
2334 ((['git', 'tag', '-d', 'git-cl-archived-456-foo'],),
2335 'refs/tags/git-cl-archived-456-foo'),
2336 ]
2337
Edward Lemurda4b6c62020-02-13 00:28:40 +00002338 mock.patch('git_cl.get_cl_statuses',
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002339 lambda branches, fine_grained, max_processes:
2340 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2341 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002342 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002343
2344 self.assertEqual(0, git_cl.main(['archive', '-f']))
2345
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00002346 def test_archive_with_format(self):
2347 self.calls = [
2348 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'], ),
2349 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2350 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'], ), ''),
2351 ((['git', 'tag', 'archived/12-foo', 'foo'], ), ''),
2352 ((['git', 'branch', '-D', 'foo'], ), ''),
2353 ]
2354
2355 mock.patch('git_cl.get_cl_statuses',
2356 lambda branches, fine_grained, max_processes:
2357 [(MockChangelistWithBranchAndIssue('foo', 12), 'closed')]).start()
2358
2359 self.assertEqual(
2360 0, git_cl.main(['archive', '-f', '-p', 'archived/{issue}-{branch}']))
2361
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002362 def test_cmd_issue_erase_existing(self):
Edward Lemur85153282020-02-14 22:06:29 +00002363 self.mockGit.config['branch.master.gerritissue'] = '123'
2364 self.mockGit.config['branch.master.gerritserver'] = (
2365 'https://chromium-review.googlesource.com')
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002366 self.calls = [
Aaron Gableca01e2c2017-07-19 11:16:02 -07002367 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002368 ]
2369 self.assertEqual(0, git_cl.main(['issue', '0']))
Edward Lemur85153282020-02-14 22:06:29 +00002370 self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
2371 self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002372
Aaron Gable400e9892017-07-12 15:31:21 -07002373 def test_cmd_issue_erase_existing_with_change_id(self):
Edward Lemur85153282020-02-14 22:06:29 +00002374 self.mockGit.config['branch.master.gerritissue'] = '123'
2375 self.mockGit.config['branch.master.gerritserver'] = (
2376 'https://chromium-review.googlesource.com')
Edward Lemurda4b6c62020-02-13 00:28:40 +00002377 mock.patch('git_cl.Changelist.FetchDescription',
2378 lambda _: 'This is a description\n\nChange-Id: Ideadbeef').start()
Aaron Gable400e9892017-07-12 15:31:21 -07002379 self.calls = [
Aaron Gableca01e2c2017-07-19 11:16:02 -07002380 ((['git', 'log', '-1', '--format=%B'],),
2381 'This is a description\n\nChange-Id: Ideadbeef'),
2382 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002383 ]
2384 self.assertEqual(0, git_cl.main(['issue', '0']))
Edward Lemur85153282020-02-14 22:06:29 +00002385 self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
2386 self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
Aaron Gable400e9892017-07-12 15:31:21 -07002387
phajdan.jre328cf92016-08-22 04:12:17 -07002388 def test_cmd_issue_json(self):
Edward Lemur85153282020-02-14 22:06:29 +00002389 self.mockGit.config['branch.master.gerritissue'] = '123'
2390 self.mockGit.config['branch.master.gerritserver'] = (
2391 'https://chromium-review.googlesource.com')
Nodir Turakulov27379632021-03-17 18:53:29 +00002392 self.mockGit.config['remote.origin.url'] = (
2393 'https://chromium.googlesource.com/chromium/src'
2394 )
2395 self.calls = [(
2396 (
2397 'write_json',
2398 'output.json',
2399 {
2400 'issue': 123,
2401 'issue_url': 'https://chromium-review.googlesource.com/123',
2402 'gerrit_host': 'chromium-review.googlesource.com',
2403 'gerrit_project': 'chromium/src',
2404 },
2405 ),
2406 '',
2407 )]
phajdan.jre328cf92016-08-22 04:12:17 -07002408 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2409
tandrii16e0b4e2016-06-07 10:34:28 -07002410 def _common_GerritCommitMsgHookCheck(self):
Edward Lemur15a9b8c2020-02-13 00:52:30 +00002411 mock.patch(
2412 'git_cl.os.path.abspath',
2413 lambda path: self._mocked_call(['abspath', path])).start()
2414 mock.patch(
2415 'git_cl.os.path.exists',
2416 lambda path: self._mocked_call(['exists', path])).start()
2417 mock.patch(
2418 'git_cl.gclient_utils.FileRead',
2419 lambda path: self._mocked_call(['FileRead', path])).start()
2420 mock.patch(
2421 'git_cl.gclient_utils.rm_file_or_tree',
2422 lambda path: self._mocked_call(['rm_file_or_tree', path])).start()
Edward Lemur1a83da12020-03-04 21:18:36 +00002423 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00002424 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00002425 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurf38bc172019-09-03 21:02:13 +00002426 return git_cl.Changelist(issue=123)
tandrii16e0b4e2016-06-07 10:34:28 -07002427
2428 def test_GerritCommitMsgHookCheck_custom_hook(self):
2429 cl = self._common_GerritCommitMsgHookCheck()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002430 self.calls += [((['exists',
2431 os.path.join('.git', 'hooks', 'commit-msg')], ), True),
2432 ((['FileRead',
2433 os.path.join('.git', 'hooks', 'commit-msg')], ),
2434 '#!/bin/sh\necho "custom hook"')]
Edward Lemur125d60a2019-09-13 18:25:41 +00002435 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002436
2437 def test_GerritCommitMsgHookCheck_not_exists(self):
2438 cl = self._common_GerritCommitMsgHookCheck()
2439 self.calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002440 ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), False),
tandrii16e0b4e2016-06-07 10:34:28 -07002441 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002442 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002443
2444 def test_GerritCommitMsgHookCheck(self):
2445 cl = self._common_GerritCommitMsgHookCheck()
2446 self.calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002447 ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), True),
2448 ((['FileRead', os.path.join('.git', 'hooks', 'commit-msg')], ),
tandrii16e0b4e2016-06-07 10:34:28 -07002449 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002450 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002451 ((['rm_file_or_tree',
2452 os.path.join('.git', 'hooks', 'commit-msg')], ), ''),
tandrii16e0b4e2016-06-07 10:34:28 -07002453 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002454 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002455
tandriic4344b52016-08-29 06:04:54 -07002456 def test_GerritCmdLand(self):
Edward Lemur85153282020-02-14 22:06:29 +00002457 self.mockGit.config['branch.master.gerritsquashhash'] = 'deadbeaf'
2458 self.mockGit.config['branch.master.gerritserver'] = (
2459 'chromium-review.googlesource.com')
tandriic4344b52016-08-29 06:04:54 -07002460 self.calls += [
tandriic4344b52016-08-29 06:04:54 -07002461 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
tandriic4344b52016-08-29 06:04:54 -07002462 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002463 cl = git_cl.Changelist(issue=123)
Edward Lemur125d60a2019-09-13 18:25:41 +00002464 cl._GetChangeDetail = lambda *args, **kwargs: {
tandriic4344b52016-08-29 06:04:54 -07002465 'labels': {},
2466 'current_revision': 'deadbeaf',
2467 }
Edward Lemur125d60a2019-09-13 18:25:41 +00002468 cl._GetChangeCommit = lambda: {
agable32978d92016-11-01 12:55:02 -07002469 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002470 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002471 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2472 }
Edward Lemur125d60a2019-09-13 18:25:41 +00002473 cl.SubmitIssue = lambda wait_for_merge: None
Olivier Robin75ee7252018-04-13 10:02:56 +02002474 self.assertEqual(0, cl.CMDLand(force=True,
2475 bypass_hooks=True,
2476 verbose=True,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002477 parallel=False,
2478 resultdb=False,
2479 realm=None))
Edward Lemur73c76702020-02-06 23:57:18 +00002480 self.assertIn(
2481 'Issue chromium-review.googlesource.com/123 has been submitted',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002482 sys.stdout.getvalue())
Edward Lemur73c76702020-02-06 23:57:18 +00002483 self.assertIn(
2484 'Landed as: https://git.googlesource.com/test/+/deadbeef',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002485 sys.stdout.getvalue())
tandriic4344b52016-08-29 06:04:54 -07002486
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002487 def _mock_gerrit_changes_for_detail_cache(self):
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002488 mock.patch('git_cl.Changelist.GetGerritHost', lambda _: 'host').start()
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002489
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002490 def test_gerrit_change_detail_cache_simple(self):
2491 self._mock_gerrit_changes_for_detail_cache()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002492 gerrit_util.GetChangeDetail.side_effect = ['a', 'b']
Edward Lemurf38bc172019-09-03 21:02:13 +00002493 cl1 = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002494 cl1._cached_remote_url = (
2495 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemurf38bc172019-09-03 21:02:13 +00002496 cl2 = git_cl.Changelist(issue=2)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002497 cl2._cached_remote_url = (
2498 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002499 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
2500 self.assertEqual(cl1._GetChangeDetail(), 'a')
2501 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002502
2503 def test_gerrit_change_detail_cache_options(self):
2504 self._mock_gerrit_changes_for_detail_cache()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002505 gerrit_util.GetChangeDetail.side_effect = ['cab', 'ad']
Edward Lemurf38bc172019-09-03 21:02:13 +00002506 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002507 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002508 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2509 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2510 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2511 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2512 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2513 self.assertEqual(cl._GetChangeDetail(), 'cab')
2514
2515 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2516 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2517 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2518 self.assertEqual(cl._GetChangeDetail(), 'cab')
2519
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002520 def test_gerrit_description_caching(self):
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002521 gerrit_util.GetChangeDetail.return_value = {
2522 'current_revision': 'rev1',
2523 'revisions': {
2524 'rev1': {'commit': {'message': 'desc1'}},
2525 },
2526 }
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002527
2528 self._mock_gerrit_changes_for_detail_cache()
Edward Lemurf38bc172019-09-03 21:02:13 +00002529 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002530 cl._cached_remote_url = (
2531 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemur6c6827c2020-02-06 21:15:18 +00002532 self.assertEqual(cl.FetchDescription(), 'desc1')
2533 self.assertEqual(cl.FetchDescription(), 'desc1') # cache hit.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002534
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002535 def test_print_current_creds(self):
2536 class CookiesAuthenticatorMock(object):
2537 def __init__(self):
2538 self.gitcookies = {
2539 'host.googlesource.com': ('user', 'pass'),
2540 'host-review.googlesource.com': ('user', 'pass'),
2541 }
2542 self.netrc = self
2543 self.netrc.hosts = {
2544 'github.com': ('user2', None, 'pass2'),
2545 'host2.googlesource.com': ('user3', None, 'pass'),
2546 }
Edward Lemurda4b6c62020-02-13 00:28:40 +00002547 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2548 CookiesAuthenticatorMock).start()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002549 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
2550 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2551 ' Host\t User\t Which file',
2552 '============================\t=====\t===========',
2553 'host-review.googlesource.com\t user\t.gitcookies',
2554 ' host.googlesource.com\t user\t.gitcookies',
2555 ' host2.googlesource.com\tuser3\t .netrc',
2556 ])
Edward Lemur79d4f992019-11-11 23:49:02 +00002557 sys.stdout.seek(0)
2558 sys.stdout.truncate(0)
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002559 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
2560 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2561 ' Host\tUser\t Which file',
2562 '============================\t====\t===========',
2563 'host-review.googlesource.com\tuser\t.gitcookies',
2564 ' host.googlesource.com\tuser\t.gitcookies',
2565 ])
2566
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002567 def _common_creds_check_mocks(self):
2568 def exists_mock(path):
2569 dirname = os.path.dirname(path)
2570 if dirname == os.path.expanduser('~'):
2571 dirname = '~'
2572 base = os.path.basename(path)
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002573 if base in (NETRC_FILENAME, '.gitcookies'):
2574 return self._mocked_call('os.path.exists', os.path.join(dirname, base))
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002575 # git cl also checks for existence other files not relevant to this test.
2576 return None
Edward Lemur1a83da12020-03-04 21:18:36 +00002577 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00002578 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00002579 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002580 mock.patch('os.path.exists', exists_mock).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002581
2582 def test_creds_check_gitcookies_not_configured(self):
2583 self._common_creds_check_mocks()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002584 mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
2585 lambda _, include_netrc=False: []).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002586 self.calls = [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002587 ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
2588 ((['git', 'config', '--global', 'http.cookiefile'], ), CERR1),
2589 (('os.path.exists', os.path.join('~', NETRC_FILENAME)), True),
2590 (('ask_for_data', 'Press Enter to setup .gitcookies, '
2591 'or Ctrl+C to abort'), ''),
2592 (([
2593 'git', 'config', '--global', 'http.cookiefile',
2594 os.path.expanduser(os.path.join('~', '.gitcookies'))
2595 ], ), ''),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002596 ]
2597 self.assertEqual(0, git_cl.main(['creds-check']))
Edward Lemur73c76702020-02-06 23:57:18 +00002598 self.assertTrue(
2599 sys.stdout.getvalue().startswith(
2600 'You seem to be using outdated .netrc for git credentials:'))
2601 self.assertIn(
2602 '\nConfigured git to use .gitcookies from',
2603 sys.stdout.getvalue())
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002604
2605 def test_creds_check_gitcookies_configured_custom_broken(self):
2606 self._common_creds_check_mocks()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002607 mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
2608 lambda _, include_netrc=False: []).start()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002609 custom_cookie_path = ('C:\\.gitcookies'
2610 if sys.platform == 'win32' else '/custom/.gitcookies')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002611 self.calls = [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002612 ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
2613 ((['git', 'config', '--global', 'http.cookiefile'], ),
2614 custom_cookie_path),
2615 (('os.path.exists', custom_cookie_path), False),
2616 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
2617 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
2618 (([
2619 'git', 'config', '--global', 'http.cookiefile',
2620 os.path.expanduser(os.path.join('~', '.gitcookies'))
2621 ], ), ''),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002622 ]
2623 self.assertEqual(0, git_cl.main(['creds-check']))
Edward Lemur73c76702020-02-06 23:57:18 +00002624 self.assertIn(
2625 'WARNING: You have configured custom path to .gitcookies: ',
2626 sys.stdout.getvalue())
2627 self.assertIn(
2628 'However, your configured .gitcookies file is missing.',
2629 sys.stdout.getvalue())
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002630
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002631 def test_git_cl_comment_add_gerrit(self):
Edward Lemur85153282020-02-14 22:06:29 +00002632 self.mockGit.branchref = None
Edward Lemur26964072020-02-19 19:18:51 +00002633 self.mockGit.config['remote.origin.url'] = (
2634 'https://chromium.googlesource.com/infra/infra')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002635 self.calls = [
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002636 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002637 'msg', None, None, None),
Aaron Gable636b13f2017-07-14 10:42:48 -07002638 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002639 ]
Edward Lemur52969c92020-02-06 18:15:28 +00002640 self.assertEqual(0, git_cl.main(['comment', '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002641
Edward Lemurda4b6c62020-02-13 00:28:40 +00002642 @mock.patch('git_cl.Changelist.GetBranch', return_value='foo')
2643 def test_git_cl_comments_fetch_gerrit(self, *_mocks):
Edward Lemur26964072020-02-19 19:18:51 +00002644 self.mockGit.config['remote.origin.url'] = (
2645 'https://chromium.googlesource.com/infra/infra')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002646 gerrit_util.GetChangeDetail.return_value = {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002647 'owner': {'email': 'owner@example.com'},
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002648 'current_revision': 'ba5eba11',
2649 'revisions': {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002650 'deadbeaf': {
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002651 '_number': 1,
2652 },
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002653 'ba5eba11': {
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002654 '_number': 2,
2655 },
2656 },
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002657 'messages': [
2658 {
2659 u'_revision_number': 1,
2660 u'author': {
2661 u'_account_id': 1111084,
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002662 u'email': u'could-be-anything@example.com',
2663 u'name': u'LUCI CQ'
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002664 },
2665 u'date': u'2017-03-15 20:08:45.000000000',
2666 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07002667 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002668 u'tag': u'autogenerated:cq:dry-run'
2669 },
2670 {
2671 u'_revision_number': 2,
2672 u'author': {
2673 u'_account_id': 11151243,
2674 u'email': u'owner@example.com',
2675 u'name': u'owner'
2676 },
2677 u'date': u'2017-03-16 20:00:41.000000000',
2678 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2679 u'message': u'PTAL',
2680 },
2681 {
2682 u'_revision_number': 2,
2683 u'author': {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002684 u'_account_id': 148512,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002685 u'email': u'reviewer@example.com',
2686 u'name': u'reviewer'
2687 },
2688 u'date': u'2017-03-17 05:19:37.500000000',
2689 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2690 u'message': u'Patch Set 2: Code-Review+1',
2691 },
2692 ]
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002693 }
2694 self.calls = [
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002695 (('GetChangeComments', 'chromium-review.googlesource.com',
2696 'infra%2Finfra~1'), {
2697 '/COMMIT_MSG': [
2698 {
2699 'author': {
2700 'email': u'reviewer@example.com'
2701 },
2702 'updated': u'2017-03-17 05:19:37.500000000',
2703 'patch_set': 2,
2704 'side': 'REVISION',
2705 'message': 'Please include a bug link',
2706 },
2707 ],
2708 'codereview.settings': [
2709 {
2710 'author': {
2711 'email': u'owner@example.com'
2712 },
2713 'updated': u'2017-03-16 20:00:41.000000000',
2714 'patch_set': 2,
2715 'side': 'PARENT',
2716 'line': 42,
2717 'message': 'I removed this because it is bad',
2718 },
2719 ]
2720 }),
2721 (('GetChangeRobotComments', 'chromium-review.googlesource.com',
2722 'infra%2Finfra~1'), {}),
2723 ] * 2 + [(('write_json', 'output.json', [{
2724 u'date':
2725 u'2017-03-16 20:00:41.000000',
2726 u'message': (u'PTAL\n' + u'\n' + u'codereview.settings\n' +
2727 u' Base, Line 42: https://crrev.com/c/1/2/'
2728 u'codereview.settings#b42\n' +
2729 u' I removed this because it is bad\n'),
2730 u'autogenerated':
2731 False,
2732 u'approval':
2733 False,
2734 u'disapproval':
2735 False,
2736 u'sender':
2737 u'owner@example.com'
2738 }, {
2739 u'date':
2740 u'2017-03-17 05:19:37.500000',
2741 u'message':
2742 (u'Patch Set 2: Code-Review+1\n' + u'\n' + u'/COMMIT_MSG\n' +
2743 u' PS2, File comment: https://crrev.com/c/1/2//COMMIT_MSG#\n' +
2744 u' Please include a bug link\n'),
2745 u'autogenerated':
2746 False,
2747 u'approval':
2748 False,
2749 u'disapproval':
2750 False,
2751 u'sender':
2752 u'reviewer@example.com'
2753 }]), '')]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002754 expected_comments_summary = [
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002755 git_cl._CommentSummary(
2756 message=(u'PTAL\n' + u'\n' + u'codereview.settings\n' +
2757 u' Base, Line 42: https://crrev.com/c/1/2/' +
2758 u'codereview.settings#b42\n' +
2759 u' I removed this because it is bad\n'),
2760 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
2761 autogenerated=False,
2762 disapproval=False,
2763 approval=False,
2764 sender=u'owner@example.com'),
2765 git_cl._CommentSummary(message=(
2766 u'Patch Set 2: Code-Review+1\n' + u'\n' + u'/COMMIT_MSG\n' +
2767 u' PS2, File comment: https://crrev.com/c/1/2//COMMIT_MSG#\n' +
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002768 u' Please include a bug link\n'),
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002769 date=datetime.datetime(2017, 3, 17, 5, 19, 37,
2770 500000),
2771 autogenerated=False,
2772 disapproval=False,
2773 approval=False,
2774 sender=u'reviewer@example.com'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002775 ]
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002776 cl = git_cl.Changelist(
Edward Lemurf38bc172019-09-03 21:02:13 +00002777 issue=1, branchref='refs/heads/foo')
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002778 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002779 self.assertEqual(
2780 0, git_cl.main(['comments', '-i', '1', '-j', 'output.json']))
2781
2782 def test_git_cl_comments_robot_comments(self):
2783 # git cl comments also fetches robot comments (which are considered a type
2784 # of autogenerated comment), and unlike other types of comments, only robot
2785 # comments from the latest patchset are shown.
Edward Lemur26964072020-02-19 19:18:51 +00002786 self.mockGit.config['remote.origin.url'] = (
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002787 'https://x.googlesource.com/infra/infra')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002788 gerrit_util.GetChangeDetail.return_value = {
2789 'owner': {'email': 'owner@example.com'},
2790 'current_revision': 'ba5eba11',
2791 'revisions': {
2792 'deadbeaf': {
2793 '_number': 1,
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002794 },
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002795 'ba5eba11': {
2796 '_number': 2,
2797 },
2798 },
2799 'messages': [
2800 {
2801 u'_revision_number': 1,
2802 u'author': {
2803 u'_account_id': 1111084,
2804 u'email': u'commit-bot@chromium.org',
2805 u'name': u'Commit Bot'
2806 },
2807 u'date': u'2017-03-15 20:08:45.000000000',
2808 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
2809 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
2810 u'tag': u'autogenerated:cq:dry-run'
2811 },
2812 {
2813 u'_revision_number': 1,
2814 u'author': {
2815 u'_account_id': 123,
2816 u'email': u'tricium@serviceaccount.com',
2817 u'name': u'Tricium'
2818 },
2819 u'date': u'2017-03-16 20:00:41.000000000',
2820 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2821 u'message': u'(1 comment)',
2822 u'tag': u'autogenerated:tricium',
2823 },
2824 {
2825 u'_revision_number': 1,
2826 u'author': {
2827 u'_account_id': 123,
2828 u'email': u'tricium@serviceaccount.com',
2829 u'name': u'Tricium'
2830 },
2831 u'date': u'2017-03-16 20:00:41.000000000',
2832 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2833 u'message': u'(1 comment)',
2834 u'tag': u'autogenerated:tricium',
2835 },
2836 {
2837 u'_revision_number': 2,
2838 u'author': {
2839 u'_account_id': 123,
2840 u'email': u'tricium@serviceaccount.com',
2841 u'name': u'reviewer'
2842 },
2843 u'date': u'2017-03-17 05:30:37.000000000',
2844 u'tag': u'autogenerated:tricium',
2845 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2846 u'message': u'(1 comment)',
2847 },
2848 ]
2849 }
2850 self.calls = [
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002851 (('GetChangeComments', 'x-review.googlesource.com', 'infra%2Finfra~1'),
2852 {}),
2853 (('GetChangeRobotComments', 'x-review.googlesource.com',
2854 'infra%2Finfra~1'), {
2855 'codereview.settings': [
2856 {
2857 u'author': {
2858 u'email': u'tricium@serviceaccount.com'
2859 },
2860 u'updated': u'2017-03-17 05:30:37.000000000',
2861 u'robot_run_id': u'5565031076855808',
2862 u'robot_id': u'Linter/Category',
2863 u'tag': u'autogenerated:tricium',
2864 u'patch_set': 2,
2865 u'side': u'REVISION',
2866 u'message': u'Linter warning message text',
2867 u'line': 32,
2868 },
2869 ],
2870 }),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002871 ]
2872 expected_comments_summary = [
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002873 git_cl._CommentSummary(
2874 date=datetime.datetime(2017, 3, 17, 5, 30, 37),
2875 message=(u'(1 comment)\n\ncodereview.settings\n'
2876 u' PS2, Line 32: https://x-review.googlesource.com/c/1/2/'
2877 u'codereview.settings#32\n'
2878 u' Linter warning message text\n'),
2879 sender=u'tricium@serviceaccount.com',
2880 autogenerated=True,
2881 approval=False,
2882 disapproval=False)
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002883 ]
2884 cl = git_cl.Changelist(
Edward Lemurf38bc172019-09-03 21:02:13 +00002885 issue=1, branchref='refs/heads/foo')
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002886 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002887
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002888 def test_get_remote_url_with_mirror(self):
2889 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002890
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002891 def selective_os_path_isdir_mock(path):
2892 if path == '/cache/this-dir-exists':
2893 return self._mocked_call('os.path.isdir', path)
2894 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002895
Edward Lemurda4b6c62020-02-13 00:28:40 +00002896 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002897
2898 url = 'https://chromium.googlesource.com/my/repo'
Edward Lemur26964072020-02-19 19:18:51 +00002899 self.mockGit.config['remote.origin.url'] = (
2900 '/cache/this-dir-exists')
2901 self.mockGit.config['/cache/this-dir-exists:remote.origin.url'] = (
2902 url)
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002903 self.calls = [
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002904 (('os.path.isdir', '/cache/this-dir-exists'),
2905 True),
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002906 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002907 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002908 self.assertEqual(cl.GetRemoteUrl(), url)
2909 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
2910
Edward Lemur298f2cf2019-02-22 21:40:39 +00002911 def test_get_remote_url_non_existing_mirror(self):
2912 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002913
Edward Lemur298f2cf2019-02-22 21:40:39 +00002914 def selective_os_path_isdir_mock(path):
2915 if path == '/cache/this-dir-doesnt-exist':
2916 return self._mocked_call('os.path.isdir', path)
2917 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002918
Edward Lemurda4b6c62020-02-13 00:28:40 +00002919 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
2920 mock.patch('logging.error',
2921 lambda *a: self._mocked_call('logging.error', *a)).start()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002922
Edward Lemur26964072020-02-19 19:18:51 +00002923 self.mockGit.config['remote.origin.url'] = (
2924 '/cache/this-dir-doesnt-exist')
Edward Lemur298f2cf2019-02-22 21:40:39 +00002925 self.calls = [
Edward Lemur298f2cf2019-02-22 21:40:39 +00002926 (('os.path.isdir', '/cache/this-dir-doesnt-exist'),
2927 False),
2928 (('logging.error',
Josip906bfde2020-01-31 22:38:49 +00002929 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2930 'but it doesn\'t exist.', {
2931 'remote': 'origin',
2932 'branch': 'master',
2933 'url': '/cache/this-dir-doesnt-exist'}
2934 ), None),
Edward Lemur298f2cf2019-02-22 21:40:39 +00002935 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002936 cl = git_cl.Changelist(issue=1)
Edward Lemur298f2cf2019-02-22 21:40:39 +00002937 self.assertIsNone(cl.GetRemoteUrl())
2938
2939 def test_get_remote_url_misconfigured_mirror(self):
2940 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002941
Edward Lemur298f2cf2019-02-22 21:40:39 +00002942 def selective_os_path_isdir_mock(path):
2943 if path == '/cache/this-dir-exists':
2944 return self._mocked_call('os.path.isdir', path)
2945 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002946
Edward Lemurda4b6c62020-02-13 00:28:40 +00002947 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
2948 mock.patch('logging.error',
2949 lambda *a: self._mocked_call('logging.error', *a)).start()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002950
Edward Lemur26964072020-02-19 19:18:51 +00002951 self.mockGit.config['remote.origin.url'] = (
2952 '/cache/this-dir-exists')
Edward Lemur298f2cf2019-02-22 21:40:39 +00002953 self.calls = [
Edward Lemur298f2cf2019-02-22 21:40:39 +00002954 (('os.path.isdir', '/cache/this-dir-exists'), True),
Edward Lemur298f2cf2019-02-22 21:40:39 +00002955 (('logging.error',
2956 'Remote "%(remote)s" for branch "%(branch)s" points to '
2957 '"%(cache_path)s", but it is misconfigured.\n'
2958 '"%(cache_path)s" must be a git repo and must have a remote named '
2959 '"%(remote)s" pointing to the git host.', {
2960 'remote': 'origin',
2961 'cache_path': '/cache/this-dir-exists',
2962 'branch': 'master'}
2963 ), None),
2964 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002965 cl = git_cl.Changelist(issue=1)
Edward Lemur298f2cf2019-02-22 21:40:39 +00002966 self.assertIsNone(cl.GetRemoteUrl())
2967
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002968 def test_gerrit_change_identifier_with_project(self):
Edward Lemur26964072020-02-19 19:18:51 +00002969 self.mockGit.config['remote.origin.url'] = (
2970 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemurf38bc172019-09-03 21:02:13 +00002971 cl = git_cl.Changelist(issue=123456)
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002972 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
2973
2974 def test_gerrit_change_identifier_without_project(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002975 mock.patch('logging.error',
2976 lambda *a: self._mocked_call('logging.error', *a)).start()
Josip906bfde2020-01-31 22:38:49 +00002977
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002978 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00002979 (('logging.error',
2980 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2981 'but it doesn\'t exist.', {
2982 'remote': 'origin',
2983 'branch': 'master',
2984 'url': ''}
2985 ), None),
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002986 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002987 cl = git_cl.Changelist(issue=123456)
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002988 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002989
Josip Sokcevicc39ab992020-09-24 20:09:15 +00002990 def test_gerrit_new_default(self):
2991 self._run_gerrit_upload_test(
2992 [],
2993 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
2994 [],
2995 squash=False,
2996 squash_mode='override_nosquash',
2997 change_id='I123456789',
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002998 default_branch='main')
Josip Sokcevicc39ab992020-09-24 20:09:15 +00002999
Quinten Yearsley0c62da92017-05-31 13:39:42 -07003000
Edward Lemur9aa1a962020-02-25 00:58:38 +00003001class ChangelistTest(unittest.TestCase):
Edward Lemur227d5102020-02-25 23:45:35 +00003002 def setUp(self):
3003 super(ChangelistTest, self).setUp()
3004 mock.patch('gclient_utils.FileRead').start()
3005 mock.patch('gclient_utils.FileWrite').start()
3006 mock.patch('gclient_utils.temporary_file', TemporaryFileMock()).start()
3007 mock.patch(
3008 'git_cl.Changelist.GetCodereviewServer',
3009 return_value='https://chromium-review.googlesource.com').start()
3010 mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start()
3011 mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
3012 mock.patch('git_cl.Changelist.GetPatchset', return_value=7).start()
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003013 mock.patch(
3014 'git_cl.Changelist.GetRemoteBranch',
3015 return_value=('origin', 'refs/remotes/origin/main')).start()
Edward Lemur227d5102020-02-25 23:45:35 +00003016 mock.patch('git_cl.PRESUBMIT_SUPPORT', 'PRESUBMIT_SUPPORT').start()
3017 mock.patch('git_cl.Settings.GetRoot', return_value='root').start()
3018 mock.patch('git_cl.time_time').start()
3019 mock.patch('metrics.collector').start()
3020 mock.patch('subprocess2.Popen').start()
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003021 mock.patch(
3022 'git_cl.Changelist.GetGerritProject', return_value='project').start()
Edward Lemur227d5102020-02-25 23:45:35 +00003023 self.addCleanup(mock.patch.stopall)
3024 self.temp_count = 0
3025
Edward Lemur227d5102020-02-25 23:45:35 +00003026 def testRunHook(self):
3027 expected_results = {
3028 'more_cc': ['more@example.com', 'cc@example.com'],
3029 'should_continue': True,
3030 }
3031 gclient_utils.FileRead.return_value = json.dumps(expected_results)
3032 git_cl.time_time.side_effect = [100, 200]
3033 mockProcess = mock.Mock()
3034 mockProcess.wait.return_value = 0
3035 subprocess2.Popen.return_value = mockProcess
3036
3037 cl = git_cl.Changelist()
3038 results = cl.RunHook(
3039 committing=True,
3040 may_prompt=True,
3041 verbose=2,
3042 parallel=True,
3043 upstream='upstream',
3044 description='description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003045 all_files=True,
3046 resultdb=False)
Edward Lemur227d5102020-02-25 23:45:35 +00003047
3048 self.assertEqual(expected_results, results)
3049 subprocess2.Popen.assert_called_once_with([
3050 'vpython', 'PRESUBMIT_SUPPORT',
Edward Lemur227d5102020-02-25 23:45:35 +00003051 '--root', 'root',
3052 '--upstream', 'upstream',
3053 '--verbose', '--verbose',
Edward Lemur99df04e2020-03-05 19:39:43 +00003054 '--gerrit_url', 'https://chromium-review.googlesource.com',
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003055 '--gerrit_project', 'project',
3056 '--gerrit_branch', 'refs/heads/main',
3057 '--author', 'author',
Edward Lemur227d5102020-02-25 23:45:35 +00003058 '--issue', '123456',
3059 '--patchset', '7',
Edward Lemur75526302020-02-27 22:31:05 +00003060 '--commit',
Edward Lemur227d5102020-02-25 23:45:35 +00003061 '--may_prompt',
3062 '--parallel',
3063 '--all_files',
3064 '--json_output', '/tmp/fake-temp2',
3065 '--description_file', '/tmp/fake-temp1',
3066 ])
3067 gclient_utils.FileWrite.assert_called_once_with(
Edward Lemur1a83da12020-03-04 21:18:36 +00003068 '/tmp/fake-temp1', 'description')
Edward Lemur227d5102020-02-25 23:45:35 +00003069 metrics.collector.add_repeated('sub_commands', {
3070 'command': 'presubmit',
3071 'execution_time': 100,
3072 'exit_code': 0,
3073 })
3074
Edward Lemur99df04e2020-03-05 19:39:43 +00003075 def testRunHook_FewerOptions(self):
3076 expected_results = {
3077 'more_cc': ['more@example.com', 'cc@example.com'],
3078 'should_continue': True,
3079 }
3080 gclient_utils.FileRead.return_value = json.dumps(expected_results)
3081 git_cl.time_time.side_effect = [100, 200]
3082 mockProcess = mock.Mock()
3083 mockProcess.wait.return_value = 0
3084 subprocess2.Popen.return_value = mockProcess
3085
3086 git_cl.Changelist.GetAuthor.return_value = None
3087 git_cl.Changelist.GetIssue.return_value = None
3088 git_cl.Changelist.GetPatchset.return_value = None
Edward Lemur99df04e2020-03-05 19:39:43 +00003089
3090 cl = git_cl.Changelist()
3091 results = cl.RunHook(
3092 committing=False,
3093 may_prompt=False,
3094 verbose=0,
3095 parallel=False,
3096 upstream='upstream',
3097 description='description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003098 all_files=False,
3099 resultdb=False)
Edward Lemur99df04e2020-03-05 19:39:43 +00003100
3101 self.assertEqual(expected_results, results)
3102 subprocess2.Popen.assert_called_once_with([
3103 'vpython', 'PRESUBMIT_SUPPORT',
3104 '--root', 'root',
3105 '--upstream', 'upstream',
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003106 '--gerrit_url', 'https://chromium-review.googlesource.com',
3107 '--gerrit_project', 'project',
3108 '--gerrit_branch', 'refs/heads/main',
Edward Lemur99df04e2020-03-05 19:39:43 +00003109 '--upload',
3110 '--json_output', '/tmp/fake-temp2',
3111 '--description_file', '/tmp/fake-temp1',
3112 ])
3113 gclient_utils.FileWrite.assert_called_once_with(
3114 '/tmp/fake-temp1', 'description')
3115 metrics.collector.add_repeated('sub_commands', {
3116 'command': 'presubmit',
3117 'execution_time': 100,
3118 'exit_code': 0,
3119 })
3120
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003121 def testRunHook_FewerOptionsResultDB(self):
3122 expected_results = {
3123 'more_cc': ['more@example.com', 'cc@example.com'],
3124 'should_continue': True,
3125 }
3126 gclient_utils.FileRead.return_value = json.dumps(expected_results)
3127 git_cl.time_time.side_effect = [100, 200]
3128 mockProcess = mock.Mock()
3129 mockProcess.wait.return_value = 0
3130 subprocess2.Popen.return_value = mockProcess
3131
3132 git_cl.Changelist.GetAuthor.return_value = None
3133 git_cl.Changelist.GetIssue.return_value = None
3134 git_cl.Changelist.GetPatchset.return_value = None
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003135
3136 cl = git_cl.Changelist()
3137 results = cl.RunHook(
3138 committing=False,
3139 may_prompt=False,
3140 verbose=0,
3141 parallel=False,
3142 upstream='upstream',
3143 description='description',
3144 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003145 resultdb=True,
3146 realm='chromium:public')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003147
3148 self.assertEqual(expected_results, results)
3149 subprocess2.Popen.assert_called_once_with([
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003150 'rdb', 'stream', '-new', '-realm', 'chromium:public', '--',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003151 'vpython', 'PRESUBMIT_SUPPORT',
3152 '--root', 'root',
3153 '--upstream', 'upstream',
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003154 '--gerrit_url', 'https://chromium-review.googlesource.com',
3155 '--gerrit_project', 'project',
3156 '--gerrit_branch', 'refs/heads/main',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003157 '--upload',
3158 '--json_output', '/tmp/fake-temp2',
3159 '--description_file', '/tmp/fake-temp1',
3160 ])
3161
Edward Lemur227d5102020-02-25 23:45:35 +00003162 @mock.patch('sys.exit', side_effect=SystemExitMock)
3163 def testRunHook_Failure(self, _mock):
3164 git_cl.time_time.side_effect = [100, 200]
3165 mockProcess = mock.Mock()
3166 mockProcess.wait.return_value = 2
3167 subprocess2.Popen.return_value = mockProcess
3168
3169 cl = git_cl.Changelist()
3170 with self.assertRaises(SystemExitMock):
3171 cl.RunHook(
3172 committing=True,
3173 may_prompt=True,
3174 verbose=2,
3175 parallel=True,
3176 upstream='upstream',
3177 description='description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003178 all_files=True,
3179 resultdb=False)
Edward Lemur227d5102020-02-25 23:45:35 +00003180
3181 sys.exit.assert_called_once_with(2)
3182
Edward Lemur75526302020-02-27 22:31:05 +00003183 def testRunPostUploadHook(self):
3184 cl = git_cl.Changelist()
3185 cl.RunPostUploadHook(2, 'upstream', 'description')
3186
3187 subprocess2.Popen.assert_called_once_with([
3188 'vpython', 'PRESUBMIT_SUPPORT',
Edward Lemur75526302020-02-27 22:31:05 +00003189 '--root', 'root',
3190 '--upstream', 'upstream',
3191 '--verbose', '--verbose',
Edward Lemur99df04e2020-03-05 19:39:43 +00003192 '--gerrit_url', 'https://chromium-review.googlesource.com',
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003193 '--gerrit_project', 'project',
3194 '--gerrit_branch', 'refs/heads/main',
3195 '--author', 'author',
Edward Lemur75526302020-02-27 22:31:05 +00003196 '--issue', '123456',
3197 '--patchset', '7',
Edward Lemur75526302020-02-27 22:31:05 +00003198 '--post_upload',
3199 '--description_file', '/tmp/fake-temp1',
3200 ])
3201 gclient_utils.FileWrite.assert_called_once_with(
Edward Lemur1a83da12020-03-04 21:18:36 +00003202 '/tmp/fake-temp1', 'description')
Edward Lemur75526302020-02-27 22:31:05 +00003203
Edward Lemur9aa1a962020-02-25 00:58:38 +00003204
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003205class CMDTestCaseBase(unittest.TestCase):
3206 _STATUSES = [
3207 'STATUS_UNSPECIFIED', 'SCHEDULED', 'STARTED', 'SUCCESS', 'FAILURE',
3208 'INFRA_FAILURE', 'CANCELED',
3209 ]
3210 _CHANGE_DETAIL = {
3211 'project': 'depot_tools',
3212 'status': 'OPEN',
3213 'owner': {'email': 'owner@e.mail'},
3214 'current_revision': 'beeeeeef',
3215 'revisions': {
Gavin Make61ccc52020-11-13 00:12:57 +00003216 'deadbeaf': {
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003217 '_number': 6,
Gavin Make61ccc52020-11-13 00:12:57 +00003218 'kind': 'REWORK',
3219 },
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003220 'beeeeeef': {
3221 '_number': 7,
Gavin Make61ccc52020-11-13 00:12:57 +00003222 'kind': 'NO_CODE_CHANGE',
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003223 'fetch': {'http': {
3224 'url': 'https://chromium.googlesource.com/depot_tools',
3225 'ref': 'refs/changes/56/123456/7'
3226 }},
3227 },
3228 },
3229 }
3230 _DEFAULT_RESPONSE = {
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003231 'builds': [{
3232 'id': str(100 + idx),
3233 'builder': {
3234 'project': 'chromium',
3235 'bucket': 'try',
3236 'builder': 'bot_' + status.lower(),
3237 },
3238 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
3239 'tags': [],
3240 'status': status,
3241 } for idx, status in enumerate(_STATUSES)]
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003242 }
3243
Edward Lemur4c707a22019-09-24 21:13:43 +00003244 def setUp(self):
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003245 super(CMDTestCaseBase, self).setUp()
Edward Lemur79d4f992019-11-11 23:49:02 +00003246 mock.patch('git_cl.sys.stdout', StringIO()).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003247 mock.patch('git_cl.uuid.uuid4', return_value='uuid4').start()
3248 mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003249 mock.patch(
3250 'git_cl.Changelist.GetCodereviewServer',
3251 return_value='https://chromium-review.googlesource.com').start()
3252 mock.patch(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00003253 'git_cl.Changelist.GetGerritHost',
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003254 return_value='chromium-review.googlesource.com').start()
3255 mock.patch(
3256 'git_cl.Changelist.GetMostRecentPatchset',
3257 return_value=7).start()
3258 mock.patch(
Gavin Make61ccc52020-11-13 00:12:57 +00003259 'git_cl.Changelist.GetMostRecentDryRunPatchset',
3260 return_value=6).start()
3261 mock.patch(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003262 'git_cl.Changelist.GetRemoteUrl',
3263 return_value='https://chromium.googlesource.com/depot_tools').start()
3264 mock.patch(
3265 'auth.Authenticator',
3266 return_value=AuthenticatorMock()).start()
3267 mock.patch(
3268 'gerrit_util.GetChangeDetail',
3269 return_value=self._CHANGE_DETAIL).start()
3270 mock.patch(
3271 'git_cl._call_buildbucket',
3272 return_value = self._DEFAULT_RESPONSE).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003273 mock.patch('git_common.is_dirty_git_tree', return_value=False).start()
Edward Lemur4c707a22019-09-24 21:13:43 +00003274 self.addCleanup(mock.patch.stopall)
3275
Edward Lemur4c707a22019-09-24 21:13:43 +00003276
Edward Lemur9468eba2020-02-27 19:07:22 +00003277class CMDPresubmitTestCase(CMDTestCaseBase):
3278 def setUp(self):
3279 super(CMDPresubmitTestCase, self).setUp()
3280 mock.patch(
3281 'git_cl.Changelist.GetCommonAncestorWithUpstream',
3282 return_value='upstream').start()
3283 mock.patch(
3284 'git_cl.Changelist.FetchDescription',
3285 return_value='fetch description').start()
3286 mock.patch(
Edward Lemura12175c2020-03-09 16:58:26 +00003287 'git_cl._create_description_from_log',
Edward Lemur9468eba2020-02-27 19:07:22 +00003288 return_value='get description').start()
3289 mock.patch('git_cl.Changelist.RunHook').start()
3290
3291 def testDefaultCase(self):
3292 self.assertEqual(0, git_cl.main(['presubmit']))
3293 git_cl.Changelist.RunHook.assert_called_once_with(
3294 committing=True,
3295 may_prompt=False,
3296 verbose=0,
3297 parallel=None,
3298 upstream='upstream',
3299 description='fetch description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003300 all_files=None,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003301 resultdb=None,
3302 realm=None)
Edward Lemur9468eba2020-02-27 19:07:22 +00003303
3304 def testNoIssue(self):
3305 git_cl.Changelist.GetIssue.return_value = None
3306 self.assertEqual(0, git_cl.main(['presubmit']))
3307 git_cl.Changelist.RunHook.assert_called_once_with(
3308 committing=True,
3309 may_prompt=False,
3310 verbose=0,
3311 parallel=None,
3312 upstream='upstream',
3313 description='get description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003314 all_files=None,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003315 resultdb=None,
3316 realm=None)
Edward Lemur9468eba2020-02-27 19:07:22 +00003317
3318 def testCustomBranch(self):
3319 self.assertEqual(0, git_cl.main(['presubmit', 'custom_branch']))
3320 git_cl.Changelist.RunHook.assert_called_once_with(
3321 committing=True,
3322 may_prompt=False,
3323 verbose=0,
3324 parallel=None,
3325 upstream='custom_branch',
3326 description='fetch description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003327 all_files=None,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003328 resultdb=None,
3329 realm=None)
Edward Lemur9468eba2020-02-27 19:07:22 +00003330
3331 def testOptions(self):
3332 self.assertEqual(
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003333 0, git_cl.main(['presubmit', '-v', '-v', '--all', '--parallel', '-u',
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003334 '--resultdb', '--realm', 'chromium:public']))
Edward Lemur9468eba2020-02-27 19:07:22 +00003335 git_cl.Changelist.RunHook.assert_called_once_with(
3336 committing=False,
3337 may_prompt=False,
3338 verbose=2,
3339 parallel=True,
3340 upstream='upstream',
3341 description='fetch description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003342 all_files=True,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003343 resultdb=True,
3344 realm='chromium:public')
Edward Lemur9468eba2020-02-27 19:07:22 +00003345
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003346class CMDTryResultsTestCase(CMDTestCaseBase):
3347 _DEFAULT_REQUEST = {
3348 'predicate': {
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003349 "gerritChanges": [{
3350 "project": "depot_tools",
3351 "host": "chromium-review.googlesource.com",
Gavin Make61ccc52020-11-13 00:12:57 +00003352 "patchset": 6,
3353 "change": 123456,
3354 }],
3355 },
3356 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
3357 ',builds.*.createTime,builds.*.tags'),
3358 }
3359
3360 _TRIVIAL_REQUEST = {
3361 'predicate': {
3362 "gerritChanges": [{
3363 "project": "depot_tools",
3364 "host": "chromium-review.googlesource.com",
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003365 "patchset": 7,
3366 "change": 123456,
3367 }],
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003368 },
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003369 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
3370 ',builds.*.createTime,builds.*.tags'),
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003371 }
3372
3373 def testNoJobs(self):
3374 git_cl._call_buildbucket.return_value = {}
3375
3376 self.assertEqual(0, git_cl.main(['try-results']))
3377 self.assertEqual('No tryjobs scheduled.\n', sys.stdout.getvalue())
3378 git_cl._call_buildbucket.assert_called_once_with(
3379 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3380 self._DEFAULT_REQUEST)
3381
Gavin Make61ccc52020-11-13 00:12:57 +00003382 def testTrivialCommits(self):
3383 self.assertEqual(0, git_cl.main(['try-results']))
3384 git_cl._call_buildbucket.assert_called_with(
3385 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3386 self._DEFAULT_REQUEST)
3387
3388 git_cl._call_buildbucket.return_value = {}
3389 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '7']))
3390 git_cl._call_buildbucket.assert_called_with(
3391 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3392 self._TRIVIAL_REQUEST)
3393 self.assertEqual([
3394 'Successes:',
3395 ' bot_success https://ci.chromium.org/b/103',
3396 'Infra Failures:',
3397 ' bot_infra_failure https://ci.chromium.org/b/105',
3398 'Failures:',
3399 ' bot_failure https://ci.chromium.org/b/104',
3400 'Canceled:',
3401 ' bot_canceled ',
3402 'Started:',
3403 ' bot_started https://ci.chromium.org/b/102',
3404 'Scheduled:',
3405 ' bot_scheduled id=101',
3406 'Other:',
3407 ' bot_status_unspecified id=100',
3408 'Total: 7 tryjobs',
3409 'No tryjobs scheduled.',
3410 ], sys.stdout.getvalue().splitlines())
3411
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003412 def testPrintToStdout(self):
3413 self.assertEqual(0, git_cl.main(['try-results']))
3414 self.assertEqual([
3415 'Successes:',
3416 ' bot_success https://ci.chromium.org/b/103',
3417 'Infra Failures:',
3418 ' bot_infra_failure https://ci.chromium.org/b/105',
3419 'Failures:',
3420 ' bot_failure https://ci.chromium.org/b/104',
3421 'Canceled:',
3422 ' bot_canceled ',
3423 'Started:',
3424 ' bot_started https://ci.chromium.org/b/102',
3425 'Scheduled:',
3426 ' bot_scheduled id=101',
3427 'Other:',
3428 ' bot_status_unspecified id=100',
3429 'Total: 7 tryjobs',
3430 ], sys.stdout.getvalue().splitlines())
3431 git_cl._call_buildbucket.assert_called_once_with(
3432 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3433 self._DEFAULT_REQUEST)
3434
3435 def testPrintToStdoutWithMasters(self):
3436 self.assertEqual(0, git_cl.main(['try-results', '--print-master']))
3437 self.assertEqual([
3438 'Successes:',
3439 ' try bot_success https://ci.chromium.org/b/103',
3440 'Infra Failures:',
3441 ' try bot_infra_failure https://ci.chromium.org/b/105',
3442 'Failures:',
3443 ' try bot_failure https://ci.chromium.org/b/104',
3444 'Canceled:',
3445 ' try bot_canceled ',
3446 'Started:',
3447 ' try bot_started https://ci.chromium.org/b/102',
3448 'Scheduled:',
3449 ' try bot_scheduled id=101',
3450 'Other:',
3451 ' try bot_status_unspecified id=100',
3452 'Total: 7 tryjobs',
3453 ], sys.stdout.getvalue().splitlines())
3454 git_cl._call_buildbucket.assert_called_once_with(
3455 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3456 self._DEFAULT_REQUEST)
3457
3458 @mock.patch('git_cl.write_json')
3459 def testWriteToJson(self, mockJsonDump):
3460 self.assertEqual(0, git_cl.main(['try-results', '--json', 'file.json']))
3461 git_cl._call_buildbucket.assert_called_once_with(
3462 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3463 self._DEFAULT_REQUEST)
3464 mockJsonDump.assert_called_once_with(
3465 'file.json', self._DEFAULT_RESPONSE['builds'])
3466
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003467 def test_filter_failed_for_one_simple(self):
Edward Lemur45768512020-03-02 19:03:14 +00003468 self.assertEqual([], git_cl._filter_failed_for_retry([]))
3469 self.assertEqual(
3470 [
3471 ('chromium', 'try', 'bot_failure'),
3472 ('chromium', 'try', 'bot_infra_failure'),
3473 ],
3474 git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds']))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003475
3476 def test_filter_failed_for_retry_many_builds(self):
3477
3478 def _build(name, created_sec, status, experimental=False):
3479 assert 0 <= created_sec < 100, created_sec
3480 b = {
3481 'id': 112112,
3482 'builder': {
3483 'project': 'chromium',
3484 'bucket': 'try',
3485 'builder': name,
3486 },
3487 'createTime': '2019-10-09T08:00:%02d.854286Z' % created_sec,
3488 'status': status,
3489 'tags': [],
3490 }
3491 if experimental:
3492 b['tags'].append({'key': 'cq_experimental', 'value': 'true'})
3493 return b
3494
3495 builds = [
3496 _build('flaky-last-green', 1, 'FAILURE'),
3497 _build('flaky-last-green', 2, 'SUCCESS'),
3498 _build('flaky', 1, 'SUCCESS'),
3499 _build('flaky', 2, 'FAILURE'),
3500 _build('running', 1, 'FAILED'),
3501 _build('running', 2, 'SCHEDULED'),
3502 _build('yep-still-running', 1, 'STARTED'),
3503 _build('yep-still-running', 2, 'FAILURE'),
3504 _build('cq-experimental', 1, 'SUCCESS', experimental=True),
3505 _build('cq-experimental', 2, 'FAILURE', experimental=True),
3506
3507 # Simulate experimental in CQ builder, which developer decided
3508 # to retry manually which resulted in 2nd build non-experimental.
3509 _build('sometimes-experimental', 1, 'FAILURE', experimental=True),
3510 _build('sometimes-experimental', 2, 'FAILURE', experimental=False),
3511 ]
3512 builds.sort(key=lambda b: b['status']) # ~deterministic shuffle.
Edward Lemur45768512020-03-02 19:03:14 +00003513 self.assertEqual(
3514 [
3515 ('chromium', 'try', 'flaky'),
3516 ('chromium', 'try', 'sometimes-experimental'),
3517 ],
3518 git_cl._filter_failed_for_retry(builds))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003519
3520
3521class CMDTryTestCase(CMDTestCaseBase):
3522
3523 @mock.patch('git_cl.Changelist.SetCQState')
Edward Lemur45768512020-03-02 19:03:14 +00003524 def testSetCQDryRunByDefault(self, mockSetCQState):
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003525 mockSetCQState.return_value = 0
Edward Lemur4c707a22019-09-24 21:13:43 +00003526 self.assertEqual(0, git_cl.main(['try']))
3527 git_cl.Changelist.SetCQState.assert_called_with(git_cl._CQState.DRY_RUN)
3528 self.assertEqual(
3529 sys.stdout.getvalue(),
3530 'Scheduling CQ dry run on: '
3531 'https://chromium-review.googlesource.com/123456\n')
3532
Edward Lemur4c707a22019-09-24 21:13:43 +00003533 @mock.patch('git_cl._call_buildbucket')
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003534 def testScheduleOnBuildbucket(self, mockCallBuildbucket):
Edward Lemur4c707a22019-09-24 21:13:43 +00003535 mockCallBuildbucket.return_value = {}
Edward Lemur4c707a22019-09-24 21:13:43 +00003536
3537 self.assertEqual(0, git_cl.main([
3538 'try', '-B', 'luci.chromium.try', '-b', 'win',
3539 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
3540 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003541 'Scheduling jobs on:\n'
3542 ' chromium/try: win',
Edward Lemur4c707a22019-09-24 21:13:43 +00003543 git_cl.sys.stdout.getvalue())
3544
3545 expected_request = {
3546 "requests": [{
3547 "scheduleBuild": {
3548 "requestId": "uuid4",
3549 "builder": {
3550 "project": "chromium",
3551 "builder": "win",
3552 "bucket": "try",
3553 },
3554 "gerritChanges": [{
3555 "project": "depot_tools",
3556 "host": "chromium-review.googlesource.com",
3557 "patchset": 7,
3558 "change": 123456,
3559 }],
3560 "properties": {
3561 "category": "git_cl_try",
3562 "json": [{"a": 1}, None],
3563 "key": "val",
3564 },
3565 "tags": [
3566 {"value": "win", "key": "builder"},
3567 {"value": "git_cl_try", "key": "user_agent"},
3568 ],
3569 },
3570 }],
3571 }
3572 mockCallBuildbucket.assert_called_with(
3573 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3574
Anthony Polito1a5fe232020-01-24 23:17:52 +00003575 @mock.patch('git_cl._call_buildbucket')
3576 def testScheduleOnBuildbucketWithRevision(self, mockCallBuildbucket):
3577 mockCallBuildbucket.return_value = {}
Josip Sokcevic9011a5b2021-02-12 18:59:44 +00003578 mock.patch('git_cl.Changelist.GetRemoteBranch',
3579 return_value=('origin', 'refs/remotes/origin/main')).start()
Anthony Polito1a5fe232020-01-24 23:17:52 +00003580
3581 self.assertEqual(0, git_cl.main([
3582 'try', '-B', 'luci.chromium.try', '-b', 'win', '-b', 'linux',
3583 '-p', 'key=val', '-p', 'json=[{"a":1}, null]',
3584 '-r', 'beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef']))
3585 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003586 'Scheduling jobs on:\n'
3587 ' chromium/try: linux\n'
3588 ' chromium/try: win',
Anthony Polito1a5fe232020-01-24 23:17:52 +00003589 git_cl.sys.stdout.getvalue())
3590
3591 expected_request = {
3592 "requests": [{
3593 "scheduleBuild": {
3594 "requestId": "uuid4",
3595 "builder": {
3596 "project": "chromium",
3597 "builder": "linux",
3598 "bucket": "try",
3599 },
3600 "gerritChanges": [{
3601 "project": "depot_tools",
3602 "host": "chromium-review.googlesource.com",
3603 "patchset": 7,
3604 "change": 123456,
3605 }],
3606 "properties": {
3607 "category": "git_cl_try",
3608 "json": [{"a": 1}, None],
3609 "key": "val",
3610 },
3611 "tags": [
3612 {"value": "linux", "key": "builder"},
3613 {"value": "git_cl_try", "key": "user_agent"},
3614 ],
3615 "gitilesCommit": {
3616 "host": "chromium-review.googlesource.com",
3617 "project": "depot_tools",
3618 "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
Josip Sokcevic9011a5b2021-02-12 18:59:44 +00003619 "ref": "refs/heads/main",
Anthony Polito1a5fe232020-01-24 23:17:52 +00003620 }
3621 },
3622 },
3623 {
3624 "scheduleBuild": {
3625 "requestId": "uuid4",
3626 "builder": {
3627 "project": "chromium",
3628 "builder": "win",
3629 "bucket": "try",
3630 },
3631 "gerritChanges": [{
3632 "project": "depot_tools",
3633 "host": "chromium-review.googlesource.com",
3634 "patchset": 7,
3635 "change": 123456,
3636 }],
3637 "properties": {
3638 "category": "git_cl_try",
3639 "json": [{"a": 1}, None],
3640 "key": "val",
3641 },
3642 "tags": [
3643 {"value": "win", "key": "builder"},
3644 {"value": "git_cl_try", "key": "user_agent"},
3645 ],
3646 "gitilesCommit": {
3647 "host": "chromium-review.googlesource.com",
3648 "project": "depot_tools",
3649 "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
Josip Sokcevic9011a5b2021-02-12 18:59:44 +00003650 "ref": "refs/heads/main",
Anthony Polito1a5fe232020-01-24 23:17:52 +00003651 }
3652 },
3653 }],
3654 }
3655 mockCallBuildbucket.assert_called_with(
3656 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3657
Edward Lemur45768512020-03-02 19:03:14 +00003658 @mock.patch('sys.stderr', StringIO())
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003659 def testScheduleOnBuildbucket_WrongBucket(self):
Edward Lemur45768512020-03-02 19:03:14 +00003660 with self.assertRaises(SystemExit):
3661 git_cl.main([
3662 'try', '-B', 'not-a-bucket', '-b', 'win',
3663 '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])
Edward Lemur4c707a22019-09-24 21:13:43 +00003664 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003665 'Invalid bucket: not-a-bucket.',
3666 sys.stderr.getvalue())
Edward Lemur4c707a22019-09-24 21:13:43 +00003667
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003668 @mock.patch('git_cl._call_buildbucket')
Quinten Yearsley777660f2020-03-04 23:37:06 +00003669 @mock.patch('git_cl._fetch_tryjobs')
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003670 def testScheduleOnBuildbucketRetryFailed(
3671 self, mockFetchTryJobs, mockCallBuildbucket):
Quinten Yearsley777660f2020-03-04 23:37:06 +00003672 git_cl._fetch_tryjobs.side_effect = lambda *_, **kw: {
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003673 7: [],
3674 6: [{
3675 'id': 112112,
3676 'builder': {
3677 'project': 'chromium',
3678 'bucket': 'try',
Quinten Yearsley777660f2020-03-04 23:37:06 +00003679 'builder': 'linux', },
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003680 'createTime': '2019-10-09T08:00:01.854286Z',
3681 'tags': [],
Quinten Yearsley777660f2020-03-04 23:37:06 +00003682 'status': 'FAILURE', }], }[kw['patchset']]
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003683 mockCallBuildbucket.return_value = {}
3684
3685 self.assertEqual(0, git_cl.main(['try', '--retry-failed']))
3686 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003687 'Scheduling jobs on:\n'
3688 ' chromium/try: linux',
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003689 git_cl.sys.stdout.getvalue())
3690
3691 expected_request = {
3692 "requests": [{
3693 "scheduleBuild": {
3694 "requestId": "uuid4",
3695 "builder": {
3696 "project": "chromium",
3697 "bucket": "try",
3698 "builder": "linux",
3699 },
3700 "gerritChanges": [{
3701 "project": "depot_tools",
3702 "host": "chromium-review.googlesource.com",
3703 "patchset": 7,
3704 "change": 123456,
3705 }],
3706 "properties": {
3707 "category": "git_cl_try",
3708 },
3709 "tags": [
3710 {"value": "linux", "key": "builder"},
3711 {"value": "git_cl_try", "key": "user_agent"},
3712 {"value": "1", "key": "retry_failed"},
3713 ],
3714 },
3715 }],
3716 }
3717 mockCallBuildbucket.assert_called_with(
3718 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3719
Edward Lemur4c707a22019-09-24 21:13:43 +00003720 def test_parse_bucket(self):
3721 test_cases = [
3722 {
3723 'bucket': 'chromium/try',
3724 'result': ('chromium', 'try'),
3725 },
3726 {
3727 'bucket': 'luci.chromium.try',
3728 'result': ('chromium', 'try'),
3729 'has_warning': True,
3730 },
3731 {
3732 'bucket': 'skia.primary',
3733 'result': ('skia', 'skia.primary'),
3734 'has_warning': True,
3735 },
3736 {
3737 'bucket': 'not-a-bucket',
3738 'result': (None, None),
3739 },
3740 ]
3741
3742 for test_case in test_cases:
3743 git_cl.sys.stdout.truncate(0)
3744 self.assertEqual(
3745 test_case['result'], git_cl._parse_bucket(test_case['bucket']))
3746 if test_case.get('has_warning'):
Edward Lemur6215c792019-10-03 21:59:05 +00003747 expected_warning = 'WARNING Please use %s/%s to specify the bucket' % (
3748 test_case['result'])
3749 self.assertIn(expected_warning, git_cl.sys.stdout.getvalue())
Edward Lemur4c707a22019-09-24 21:13:43 +00003750
3751
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003752class CMDUploadTestCase(CMDTestCaseBase):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003753
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003754 def setUp(self):
3755 super(CMDUploadTestCase, self).setUp()
Quinten Yearsley777660f2020-03-04 23:37:06 +00003756 mock.patch('git_cl._fetch_tryjobs').start()
3757 mock.patch('git_cl._trigger_tryjobs', return_value={}).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003758 mock.patch('git_cl.Changelist.CMDUpload', return_value=0).start()
Edward Lesmes0dd54822020-03-26 18:24:25 +00003759 mock.patch('git_cl.Settings.GetRoot', return_value='').start()
3760 mock.patch(
3761 'git_cl.Settings.GetSquashGerritUploads',
3762 return_value=True).start()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003763 self.addCleanup(mock.patch.stopall)
3764
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003765 def testWarmUpChangeDetailCache(self):
3766 self.assertEqual(0, git_cl.main(['upload']))
3767 gerrit_util.GetChangeDetail.assert_called_once_with(
3768 'chromium-review.googlesource.com', 'depot_tools~123456',
3769 frozenset([
3770 'LABELS', 'CURRENT_REVISION', 'DETAILED_ACCOUNTS',
3771 'CURRENT_COMMIT']))
3772
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003773 def testUploadRetryFailed(self):
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003774 # This test mocks out the actual upload part, and just asserts that after
3775 # upload, if --retry-failed is added, then the tool will fetch try jobs
3776 # from the previous patchset and trigger the right builders on the latest
3777 # patchset.
Quinten Yearsley777660f2020-03-04 23:37:06 +00003778 git_cl._fetch_tryjobs.side_effect = [
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003779 # Latest patchset: No builds.
3780 [],
3781 # Patchset before latest: Some builds.
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003782 [{
3783 'id': str(100 + idx),
3784 'builder': {
3785 'project': 'chromium',
3786 'bucket': 'try',
3787 'builder': 'bot_' + status.lower(),
3788 },
3789 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
3790 'tags': [],
3791 'status': status,
3792 } for idx, status in enumerate(self._STATUSES)],
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00003793 ]
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003794
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003795 self.assertEqual(0, git_cl.main(['upload', '--retry-failed']))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003796 self.assertEqual([
Edward Lemur5b929a42019-10-21 17:57:39 +00003797 mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
3798 mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
Quinten Yearsley777660f2020-03-04 23:37:06 +00003799 ], git_cl._fetch_tryjobs.mock_calls)
Edward Lemur45768512020-03-02 19:03:14 +00003800 expected_buckets = [
3801 ('chromium', 'try', 'bot_failure'),
3802 ('chromium', 'try', 'bot_infra_failure'),
3803 ]
Quinten Yearsley777660f2020-03-04 23:37:06 +00003804 git_cl._trigger_tryjobs.assert_called_once_with(mock.ANY, expected_buckets,
3805 mock.ANY, 8)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003806
Brian Sheedy59b06a82019-10-14 17:03:29 +00003807
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003808class MakeRequestsHelperTestCase(unittest.TestCase):
3809
3810 def exampleGerritChange(self):
3811 return {
3812 'host': 'chromium-review.googlesource.com',
3813 'project': 'depot_tools',
3814 'change': 1,
3815 'patchset': 2,
3816 }
3817
3818 def testMakeRequestsHelperNoOptions(self):
3819 # Basic test for the helper function _make_tryjob_schedule_requests;
3820 # it shouldn't throw AttributeError even when options doesn't have any
3821 # of the expected values; it will use default option values.
3822 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3823 jobs = [('chromium', 'try', 'my-builder')]
3824 options = optparse.Values()
3825 requests = git_cl._make_tryjob_schedule_requests(
3826 changelist, jobs, options, patchset=None)
3827
3828 # requestId is non-deterministic. Just assert that it's there and has
3829 # a particular length.
3830 self.assertEqual(len(requests[0]['scheduleBuild'].pop('requestId')), 36)
3831 self.assertEqual(requests, [{
3832 'scheduleBuild': {
3833 'builder': {
3834 'bucket': 'try',
3835 'builder': 'my-builder',
3836 'project': 'chromium'
3837 },
3838 'gerritChanges': [self.exampleGerritChange()],
3839 'properties': {
3840 'category': 'git_cl_try'
3841 },
3842 'tags': [{
3843 'key': 'builder',
3844 'value': 'my-builder'
3845 }, {
3846 'key': 'user_agent',
3847 'value': 'git_cl_try'
3848 }]
3849 }
3850 }])
3851
3852 def testMakeRequestsHelperPresubmitSetsDryRunProperty(self):
3853 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3854 jobs = [('chromium', 'try', 'presubmit')]
3855 options = optparse.Values()
3856 requests = git_cl._make_tryjob_schedule_requests(
3857 changelist, jobs, options, patchset=None)
3858 self.assertEqual(requests[0]['scheduleBuild']['properties'], {
3859 'category': 'git_cl_try',
3860 'dry_run': 'true'
3861 })
3862
3863 def testMakeRequestsHelperRevisionSet(self):
3864 # Gitiles commit is specified when revision is in options.
3865 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3866 jobs = [('chromium', 'try', 'my-builder')]
3867 options = optparse.Values({'revision': 'ba5eba11'})
3868 requests = git_cl._make_tryjob_schedule_requests(
3869 changelist, jobs, options, patchset=None)
3870 self.assertEqual(
3871 requests[0]['scheduleBuild']['gitilesCommit'], {
3872 'host': 'chromium-review.googlesource.com',
3873 'id': 'ba5eba11',
Josip Sokcevic9011a5b2021-02-12 18:59:44 +00003874 'project': 'depot_tools',
3875 'ref': 'refs/heads/main',
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003876 })
3877
3878 def testMakeRequestsHelperRetryFailedSet(self):
3879 # An extra tag is added when retry_failed is in options.
3880 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3881 jobs = [('chromium', 'try', 'my-builder')]
3882 options = optparse.Values({'retry_failed': 'true'})
3883 requests = git_cl._make_tryjob_schedule_requests(
3884 changelist, jobs, options, patchset=None)
3885 self.assertEqual(
3886 requests[0]['scheduleBuild']['tags'], [
3887 {
3888 'key': 'builder',
3889 'value': 'my-builder'
3890 },
3891 {
3892 'key': 'user_agent',
3893 'value': 'git_cl_try'
3894 },
3895 {
3896 'key': 'retry_failed',
3897 'value': '1'
3898 }
3899 ])
3900
3901 def testMakeRequestsHelperCategorySet(self):
Quinten Yearsley925cedb2020-04-13 17:49:39 +00003902 # The category property can be overridden with options.
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003903 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3904 jobs = [('chromium', 'try', 'my-builder')]
3905 options = optparse.Values({'category': 'my-special-category'})
3906 requests = git_cl._make_tryjob_schedule_requests(
3907 changelist, jobs, options, patchset=None)
3908 self.assertEqual(requests[0]['scheduleBuild']['properties'],
3909 {'category': 'my-special-category'})
3910
3911
Edward Lemurda4b6c62020-02-13 00:28:40 +00003912class CMDFormatTestCase(unittest.TestCase):
Brian Sheedy59b06a82019-10-14 17:03:29 +00003913
3914 def setUp(self):
3915 super(CMDFormatTestCase, self).setUp()
Jamie Madill5e96ad12020-01-13 16:08:35 +00003916 mock.patch('git_cl.RunCommand').start()
3917 mock.patch('clang_format.FindClangFormatToolInChromiumTree').start()
3918 mock.patch('clang_format.FindClangFormatScriptInChromiumTree').start()
3919 mock.patch('git_cl.settings').start()
Brian Sheedy59b06a82019-10-14 17:03:29 +00003920 self._top_dir = tempfile.mkdtemp()
Jamie Madill5e96ad12020-01-13 16:08:35 +00003921 self.addCleanup(mock.patch.stopall)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003922
3923 def tearDown(self):
3924 shutil.rmtree(self._top_dir)
3925 super(CMDFormatTestCase, self).tearDown()
3926
Jamie Madill5e96ad12020-01-13 16:08:35 +00003927 def _make_temp_file(self, fname, contents):
3928 with open(os.path.join(self._top_dir, fname), 'w') as tf:
3929 tf.write('\n'.join(contents))
3930
Brian Sheedy59b06a82019-10-14 17:03:29 +00003931 def _make_yapfignore(self, contents):
Jamie Madill5e96ad12020-01-13 16:08:35 +00003932 self._make_temp_file('.yapfignore', contents)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003933
Brian Sheedyb4307d52019-12-02 19:18:17 +00003934 def _check_yapf_filtering(self, files, expected):
3935 self.assertEqual(expected, git_cl._FilterYapfIgnoredFiles(
3936 files, git_cl._GetYapfIgnorePatterns(self._top_dir)))
Brian Sheedy59b06a82019-10-14 17:03:29 +00003937
Edward Lemur1a83da12020-03-04 21:18:36 +00003938 def _run_command_mock(self, return_value):
3939 def f(*args, **kwargs):
3940 if 'stdin' in kwargs:
3941 self.assertIsInstance(kwargs['stdin'], bytes)
3942 return return_value
3943 return f
3944
Jamie Madill5e96ad12020-01-13 16:08:35 +00003945 def testClangFormatDiffFull(self):
3946 self._make_temp_file('test.cc', ['// test'])
3947 git_cl.settings.GetFormatFullByDefault.return_value = False
3948 diff_file = [os.path.join(self._top_dir, 'test.cc')]
3949 mock_opts = mock.Mock(full=True, dry_run=True, diff=False)
3950
3951 # Diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003952 git_cl.RunCommand.side_effect = self._run_command_mock(' // test')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003953 return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
3954 self._top_dir, 'HEAD')
3955 self.assertEqual(2, return_value)
3956
3957 # No diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003958 git_cl.RunCommand.side_effect = self._run_command_mock('// test')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003959 return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
3960 self._top_dir, 'HEAD')
3961 self.assertEqual(0, return_value)
3962
3963 def testClangFormatDiff(self):
3964 git_cl.settings.GetFormatFullByDefault.return_value = False
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00003965 # A valid file is required, so use this test.
3966 clang_format.FindClangFormatToolInChromiumTree.return_value = __file__
Jamie Madill5e96ad12020-01-13 16:08:35 +00003967 mock_opts = mock.Mock(full=False, dry_run=True, diff=False)
3968
3969 # Diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003970 git_cl.RunCommand.side_effect = self._run_command_mock('error')
3971 return_value = git_cl._RunClangFormatDiff(
3972 mock_opts, ['.'], self._top_dir, 'HEAD')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003973 self.assertEqual(2, return_value)
3974
3975 # No diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003976 git_cl.RunCommand.side_effect = self._run_command_mock('')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003977 return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir,
3978 'HEAD')
3979 self.assertEqual(0, return_value)
3980
Brian Sheedyb4307d52019-12-02 19:18:17 +00003981 def testYapfignoreExplicit(self):
3982 self._make_yapfignore(['foo/bar.py', 'foo/bar/baz.py'])
3983 files = [
3984 'bar.py',
3985 'foo/bar.py',
3986 'foo/baz.py',
3987 'foo/bar/baz.py',
3988 'foo/bar/foobar.py',
3989 ]
3990 expected = [
3991 'bar.py',
3992 'foo/baz.py',
3993 'foo/bar/foobar.py',
3994 ]
3995 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003996
Brian Sheedyb4307d52019-12-02 19:18:17 +00003997 def testYapfignoreSingleWildcards(self):
3998 self._make_yapfignore(['*bar.py', 'foo*', 'baz*.py'])
3999 files = [
4000 'bar.py', # Matched by *bar.py.
4001 'bar.txt',
4002 'foobar.py', # Matched by *bar.py, foo*.
4003 'foobar.txt', # Matched by foo*.
4004 'bazbar.py', # Matched by *bar.py, baz*.py.
4005 'bazbar.txt',
4006 'foo/baz.txt', # Matched by foo*.
4007 'bar/bar.py', # Matched by *bar.py.
4008 'baz/foo.py', # Matched by baz*.py, foo*.
4009 'baz/foo.txt',
4010 ]
4011 expected = [
4012 'bar.txt',
4013 'bazbar.txt',
4014 'baz/foo.txt',
4015 ]
4016 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004017
Brian Sheedyb4307d52019-12-02 19:18:17 +00004018 def testYapfignoreMultiplewildcards(self):
4019 self._make_yapfignore(['*bar*', '*foo*baz.txt'])
4020 files = [
4021 'bar.py', # Matched by *bar*.
4022 'bar.txt', # Matched by *bar*.
4023 'abar.py', # Matched by *bar*.
4024 'foobaz.txt', # Matched by *foo*baz.txt.
4025 'foobaz.py',
4026 'afoobaz.txt', # Matched by *foo*baz.txt.
4027 ]
4028 expected = [
4029 'foobaz.py',
4030 ]
4031 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004032
4033 def testYapfignoreComments(self):
4034 self._make_yapfignore(['test.py', '#test2.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00004035 files = [
4036 'test.py',
4037 'test2.py',
4038 ]
4039 expected = [
4040 'test2.py',
4041 ]
4042 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004043
4044 def testYapfignoreBlankLines(self):
4045 self._make_yapfignore(['test.py', '', '', 'test2.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00004046 files = [
4047 'test.py',
4048 'test2.py',
4049 'test3.py',
4050 ]
4051 expected = [
4052 'test3.py',
4053 ]
4054 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004055
4056 def testYapfignoreWhitespace(self):
4057 self._make_yapfignore([' test.py '])
Brian Sheedyb4307d52019-12-02 19:18:17 +00004058 files = [
4059 'test.py',
4060 'test2.py',
4061 ]
4062 expected = [
4063 'test2.py',
4064 ]
4065 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004066
Brian Sheedyb4307d52019-12-02 19:18:17 +00004067 def testYapfignoreNoFiles(self):
Brian Sheedy59b06a82019-10-14 17:03:29 +00004068 self._make_yapfignore(['test.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00004069 self._check_yapf_filtering([], [])
4070
4071 def testYapfignoreMissingYapfignore(self):
4072 files = [
4073 'test.py',
4074 ]
4075 expected = [
4076 'test.py',
4077 ]
4078 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004079
4080
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004081class CMDStatusTestCase(CMDTestCaseBase):
4082 # Return branch names a,..,f with comitterdates in increasing order, i.e.
4083 # 'f' is the most-recently changed branch.
4084 def _mock_run_git(commands):
4085 if commands == [
4086 'for-each-ref', '--format=%(refname) %(committerdate:unix)',
4087 'refs/heads'
4088 ]:
4089 branches_and_committerdates = [
4090 'refs/heads/a 1',
4091 'refs/heads/b 2',
4092 'refs/heads/c 3',
4093 'refs/heads/d 4',
4094 'refs/heads/e 5',
4095 'refs/heads/f 6',
4096 ]
4097 return '\n'.join(branches_and_committerdates)
4098
4099 # Mock the status in such a way that the issue number gives us an
4100 # indication of the commit date (simplifies manual debugging).
4101 def _mock_get_cl_statuses(branches, fine_grained, max_processes):
4102 for c in branches:
4103 c.issue = (100 + int(c.GetCommitDate()))
4104 yield (c, 'open')
4105
4106 @mock.patch('git_cl.Changelist.EnsureAuthenticated')
4107 @mock.patch('git_cl.Changelist.FetchDescription', lambda cl, pretty: 'x')
4108 @mock.patch('git_cl.Changelist.GetIssue', lambda cl: cl.issue)
4109 @mock.patch('git_cl.RunGit', _mock_run_git)
4110 @mock.patch('git_cl.get_cl_statuses', _mock_get_cl_statuses)
4111 @mock.patch('git_cl.Settings.GetRoot', return_value='')
4112 @mock.patch('scm.GIT.GetBranch', return_value='a')
4113 def testStatus(self, *_mocks):
4114 self.assertEqual(0, git_cl.main(['status', '--no-branch-color']))
4115 self.maxDiff = None
4116 self.assertEqual(
4117 sys.stdout.getvalue(), 'Branches associated with reviews:\n'
4118 ' * a : https://crrev.com/c/101 (open)\n'
4119 ' b : https://crrev.com/c/102 (open)\n'
4120 ' c : https://crrev.com/c/103 (open)\n'
4121 ' d : https://crrev.com/c/104 (open)\n'
4122 ' e : https://crrev.com/c/105 (open)\n'
4123 ' f : https://crrev.com/c/106 (open)\n\n'
4124 'Current branch: a\n'
4125 'Issue number: 101 (https://chromium-review.googlesource.com/101)\n'
4126 'Issue description:\n'
4127 'x\n')
4128
4129 @mock.patch('git_cl.Changelist.EnsureAuthenticated')
4130 @mock.patch('git_cl.Changelist.FetchDescription', lambda cl, pretty: 'x')
4131 @mock.patch('git_cl.Changelist.GetIssue', lambda cl: cl.issue)
4132 @mock.patch('git_cl.RunGit', _mock_run_git)
4133 @mock.patch('git_cl.get_cl_statuses', _mock_get_cl_statuses)
4134 @mock.patch('git_cl.Settings.GetRoot', return_value='')
4135 @mock.patch('scm.GIT.GetBranch', return_value='a')
4136 def testStatusByDate(self, *_mocks):
4137 self.assertEqual(
4138 0, git_cl.main(['status', '--no-branch-color', '--date-order']))
4139 self.maxDiff = None
4140 self.assertEqual(
4141 sys.stdout.getvalue(), 'Branches associated with reviews:\n'
4142 ' f : https://crrev.com/c/106 (open)\n'
4143 ' e : https://crrev.com/c/105 (open)\n'
4144 ' d : https://crrev.com/c/104 (open)\n'
4145 ' c : https://crrev.com/c/103 (open)\n'
4146 ' b : https://crrev.com/c/102 (open)\n'
4147 ' * a : https://crrev.com/c/101 (open)\n\n'
4148 'Current branch: a\n'
4149 'Issue number: 101 (https://chromium-review.googlesource.com/101)\n'
4150 'Issue description:\n'
4151 'x\n')
4152
4153
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004154class CMDOwnersTestCase(CMDTestCaseBase):
4155 def setUp(self):
4156 super(CMDOwnersTestCase, self).setUp()
Edward Lesmes82b992a2021-01-11 23:24:55 +00004157 self.owners_by_path = {
4158 'foo': ['a@example.com'],
4159 'bar': ['b@example.com', 'c@example.com'],
4160 }
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004161 mock.patch('git_cl.Settings.GetRoot', return_value='root').start()
4162 mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start()
4163 mock.patch(
Edward Lesmes82b992a2021-01-11 23:24:55 +00004164 'git_cl.Changelist.GetAffectedFiles',
4165 return_value=list(self.owners_by_path)).start()
4166 mock.patch(
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004167 'git_cl.Changelist.GetCommonAncestorWithUpstream',
4168 return_value='upstream').start()
Edward Lesmes82b992a2021-01-11 23:24:55 +00004169 mock.patch(
Edward Lesmese1576912021-02-16 21:53:34 +00004170 'git_cl.Changelist.GetGerritHost',
4171 return_value='host').start()
4172 mock.patch(
4173 'git_cl.Changelist.GetGerritProject',
4174 return_value='project').start()
4175 mock.patch(
4176 'git_cl.Changelist.GetRemoteBranch',
4177 return_value=('origin', 'refs/remotes/origin/main')).start()
4178 mock.patch(
4179 'owners_client.OwnersClient.BatchListOwners',
Edward Lesmes82b992a2021-01-11 23:24:55 +00004180 return_value=self.owners_by_path).start()
Edward Lesmes8170c292021-03-19 20:04:43 +00004181 mock.patch(
4182 'gerrit_util.IsCodeOwnersEnabledOnHost', return_value=True).start()
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004183 self.addCleanup(mock.patch.stopall)
4184
4185 def testShowAllNoArgs(self):
4186 self.assertEqual(0, git_cl.main(['owners', '--show-all']))
4187 self.assertEqual(
4188 'No files specified for --show-all. Nothing to do.\n',
4189 git_cl.sys.stdout.getvalue())
4190
4191 def testShowAll(self):
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004192 self.assertEqual(
4193 0,
4194 git_cl.main(['owners', '--show-all', 'foo', 'bar', 'baz']))
Edward Lesmese1576912021-02-16 21:53:34 +00004195 owners_client.OwnersClient.BatchListOwners.assert_called_once_with(
Edward Lesmes82b992a2021-01-11 23:24:55 +00004196 ['foo', 'bar', 'baz'])
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004197 self.assertEqual(
4198 '\n'.join([
4199 'Owners for foo:',
4200 ' - a@example.com',
4201 'Owners for bar:',
4202 ' - b@example.com',
4203 ' - c@example.com',
4204 'Owners for baz:',
4205 ' - No owners found',
4206 '',
4207 ]),
4208 sys.stdout.getvalue())
4209
Edward Lesmes82b992a2021-01-11 23:24:55 +00004210 def testBatch(self):
4211 self.assertEqual(0, git_cl.main(['owners', '--batch']))
4212 self.assertIn('a@example.com', sys.stdout.getvalue())
4213 self.assertIn('b@example.com', sys.stdout.getvalue())
4214
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004215
maruel@chromium.orgddd59412011-11-30 14:20:38 +00004216if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01004217 logging.basicConfig(
4218 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00004219 unittest.main()