blob: 74234cf9fa62d3c90a75dd16ef68f93326756ee0 [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 Sokcevicf2cfd3d2021-03-30 18:39:18 +0000811 def _gerrit_upload_calls(self,
812 description,
813 reviewers,
814 squash,
tandriia60502f2016-06-20 02:01:53 -0700815 squash_mode='default',
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +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 Sokcevicf2cfd3d2021-03-30 18:39:18 +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 []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200835
836 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000837
Edward Lesmes4de54132020-05-05 19:41:33 +0000838 if squash_mode in ('override_squash', 'override_nosquash'):
839 self.mockGit.config['gerrit.override-squash-uploads'] = (
840 'true' if squash_mode == 'override_squash' else 'false')
841
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000842 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000843 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200844 (('DownloadGerritHook', False), ''),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200845 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000846 if squash:
Edward Lemur5a644f82020-03-18 16:44:57 +0000847 if not issue and not force:
Edward Lemur5fb22242020-03-12 22:05:13 +0000848 calls += [
849 ((['RunEditor'],), description),
850 ]
Josipe827b0f2020-01-30 00:07:20 +0000851 # user wants to edit description
852 if edit_description:
853 calls += [
Josipe827b0f2020-01-30 00:07:20 +0000854 ((['RunEditor'],), edit_description),
855 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000856 ref_to_push = 'abcdef0123456789'
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200857
858 if custom_cl_base is None:
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000859 parent = 'origin/' + default_branch
Edward Lesmes8c43c3f2021-01-20 00:20:26 +0000860 git_common.get_or_create_merge_base.return_value = parent
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200861 else:
862 calls += [
863 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000864 'refs/remotes/origin/' + default_branch],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200865 callError(1)), # Means not ancenstor.
866 (('ask_for_data',
867 'Do you take responsibility for cleaning up potential mess '
868 'resulting from proceeding with upload? Press Enter to upload, '
869 'or Ctrl+C to abort'), ''),
870 ]
871 parent = custom_cl_base
872
873 calls += [
874 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
875 '0123456789abcdef'),
Edward Lemur1773f372020-02-22 00:27:14 +0000876 ((['FileWrite', '/tmp/fake-temp1', description],), None),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200877 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Edward Lemur1773f372020-02-22 00:27:14 +0000878 '-F', '/tmp/fake-temp1'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200879 ref_to_push),
880 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000881 else:
882 ref_to_push = 'HEAD'
Josip Sokcevicc39ab992020-09-24 20:09:15 +0000883 parent = 'origin/refs/heads/' + default_branch
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000884
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000885 calls += [
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000886 (('SaveDescriptionBackup',), None),
Edward Lemur5a644f82020-03-18 16:44:57 +0000887 ((['git', 'rev-list', parent + '..' + ref_to_push],),'1hashPerLine\n'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200888 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000889
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +0000890 metrics_arguments = []
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000891
Aaron Gableafd52772017-06-27 16:40:10 -0700892 if notify:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +0000893 ref_suffix = '%ready,notify=ALL'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000894 metrics_arguments += ['ready', 'notify=ALL']
Aaron Gable844cf292017-06-28 11:32:59 -0700895 else:
Jamie Madill276da0b2018-04-27 14:41:20 -0400896 if not issue and squash:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +0000897 ref_suffix = '%wip'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000898 metrics_arguments.append('wip')
Aaron Gable844cf292017-06-28 11:32:59 -0700899 else:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +0000900 ref_suffix = '%notify=NONE'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000901 metrics_arguments.append('notify=NONE')
Aaron Gable9b713dd2016-12-14 16:04:21 -0800902
Edward Lemur5a644f82020-03-18 16:44:57 +0000903 # If issue is given, then description is fetched from Gerrit instead.
904 if issue is None:
905 if squash:
906 title = 'Initial upload'
907 else:
908 if not title:
909 calls += [
910 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
911 (('ask_for_data', 'Title for patchset []: '), 'User input'),
912 ]
913 title = 'User input'
Aaron Gable70f4e242017-06-26 10:45:59 -0700914 if title:
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +0000915 ref_suffix += ',m=' + gerrit_util.PercentEncodeForGitRef(title)
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000916 metrics_arguments.append('m')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000917
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000918 if short_hostname == 'chromium':
Quinten Yearsley925cedb2020-04-13 17:49:39 +0000919 # All reviewers and ccs get into ref_suffix.
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000920 for r in sorted(reviewers):
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +0000921 ref_suffix += ',r=%s' % r
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000922 metrics_arguments.append('r')
Edward Lemur4508b422019-10-03 21:56:35 +0000923 if issue is None:
Edward Lemur227d5102020-02-25 23:45:35 +0000924 cc += ['test-more-cc@chromium.org', 'joe@example.com']
Edward Lemur4508b422019-10-03 21:56:35 +0000925 for c in sorted(cc):
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +0000926 ref_suffix += ',cc=%s' % c
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000927 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000928 reviewers, cc = [], []
929 else:
930 # TODO(crbug/877717): remove this case.
931 calls += [
932 (('ValidAccounts', '%s-review.googlesource.com' % short_hostname,
933 sorted(reviewers) + ['joe@example.com',
Edward Lemur227d5102020-02-25 23:45:35 +0000934 'test-more-cc@chromium.org'] + cc),
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000935 {
936 e: {'email': e}
937 for e in (reviewers + ['joe@example.com'] + cc)
938 })
939 ]
940 for r in sorted(reviewers):
941 if r != 'bad-account-or-email':
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +0000942 ref_suffix += ',r=%s' % r
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000943 metrics_arguments.append('r')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000944 reviewers.remove(r)
Edward Lemur4508b422019-10-03 21:56:35 +0000945 if issue is None:
946 cc += ['joe@example.com']
947 for c in sorted(cc):
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +0000948 ref_suffix += ',cc=%s' % c
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000949 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000950 if c in cc:
951 cc.remove(c)
Andrii Shyshkalov76988a82018-10-15 03:12:25 +0000952
Edward Lemur687ca902018-12-05 02:30:30 +0000953 for k, v in sorted((labels or {}).items()):
Josip Sokcevicd0ba91f2021-03-29 20:12:09 +0000954 ref_suffix += ',l=%s+%d' % (k, v)
Edward Lemur687ca902018-12-05 02:30:30 +0000955 metrics_arguments.append('l=%s+%d' % (k, v))
956
957 if tbr:
958 calls += [
959 (('GetCodeReviewTbrScore',
960 '%s-review.googlesource.com' % short_hostname,
961 'my/repo'),
962 2,),
963 ]
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +0000964
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000965 calls += [
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +0000966 (
967 ('time.time', ),
968 1000,
969 ),
970 (
971 ([
972 'git', 'push',
973 'https://%s.googlesource.com/my/repo' % short_hostname,
974 ref_to_push + ':refs/for/refs/heads/' + default_branch +
975 ref_suffix
976 ] + (push_opts if push_opts else []), ),
977 (('remote:\n'
978 'remote: Processing changes: (\)\n'
979 'remote: Processing changes: (|)\n'
980 'remote: Processing changes: (/)\n'
981 'remote: Processing changes: (-)\n'
982 'remote: Processing changes: new: 1 (/)\n'
983 'remote: Processing changes: new: 1, done\n'
984 'remote:\n'
985 'remote: New Changes:\n'
986 'remote: '
987 'https://%s-review.googlesource.com/#/c/my/repo/+/123456'
988 ' XXX\n'
989 'remote:\n'
990 'To https://%s.googlesource.com/my/repo\n'
991 ' * [new branch] hhhh -> refs/for/refs/heads/%s\n') %
992 (short_hostname, short_hostname, default_branch)),
993 ),
994 (
995 ('time.time', ),
996 2000,
997 ),
998 (
999 ('add_repeated', 'sub_commands', {
1000 'execution_time': 1000,
1001 'command': 'git push',
1002 'exit_code': 0,
1003 'arguments': sorted(metrics_arguments),
1004 }),
1005 None,
1006 ),
Edward Lemur01f4a4f2018-11-03 00:40:38 +00001007 ]
1008
Edward Lemur1b52d872019-05-09 21:12:12 +00001009 final_description = final_description or post_amend_description.strip()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001010
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001011 trace_name = os.path.join('TRACES_DIR', '20170316T200041.000000')
1012
Edward Lemur1b52d872019-05-09 21:12:12 +00001013 # Trace-related calls
1014 calls += [
1015 # Write a description with context for the current trace.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001016 (
1017 ([
1018 'FileWrite', trace_name + '-README',
1019 '%(date)s\n'
1020 '%(short_hostname)s-review.googlesource.com\n'
1021 '%(change_id)s\n'
1022 '%(title)s\n'
1023 '%(description)s\n'
1024 '1000\n'
1025 '0\n'
1026 '%(trace_name)s' % {
Josip Sokcevic5e18b602020-04-23 21:47:00 +00001027 'date': '2017-03-16T20:00:41.000000',
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001028 'short_hostname': short_hostname,
1029 'change_id': change_id,
1030 'description': final_description,
1031 'title': title or '<untitled>',
1032 'trace_name': trace_name,
1033 }
1034 ], ),
1035 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001036 ),
1037 # Read traces and shorten git hashes.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001038 (
1039 (['os.path.isfile',
1040 os.path.join('TEMP_DIR', 'trace-packet')], ),
1041 True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001042 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001043 (
1044 (['FileRead', os.path.join('TEMP_DIR', 'trace-packet')], ),
1045 ('git-hash: 0123456789012345678901234567890123456789\n'
1046 'git-hash: abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde\n'),
Edward Lemur1b52d872019-05-09 21:12:12 +00001047 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001048 (
1049 ([
1050 'FileWrite',
1051 os.path.join('TEMP_DIR', 'trace-packet'), 'git-hash: 012345\n'
1052 'git-hash: abcdea\n'
1053 ], ),
1054 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001055 ),
1056 # Make zip file for the git traces.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001057 (
1058 (['make_archive', trace_name + '-traces', 'zip', 'TEMP_DIR'], ),
1059 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001060 ),
1061 # Collect git config and gitcookies.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001062 (
1063 (['git', 'config', '-l'], ),
1064 'git-config-output',
Edward Lemur1b52d872019-05-09 21:12:12 +00001065 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001066 (
1067 ([
1068 'FileWrite',
1069 os.path.join('TEMP_DIR', 'git-config'), 'git-config-output'
1070 ], ),
1071 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001072 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001073 (
1074 (['os.path.isfile',
1075 os.path.join('~', '.gitcookies')], ),
1076 gitcookies_exists,
Edward Lemur1b52d872019-05-09 21:12:12 +00001077 ),
1078 ]
1079 if gitcookies_exists:
1080 calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001081 (
1082 (['FileRead', os.path.join('~', '.gitcookies')], ),
1083 'gitcookies 1/SECRET',
Edward Lemur1b52d872019-05-09 21:12:12 +00001084 ),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001085 (
1086 ([
1087 'FileWrite',
1088 os.path.join('TEMP_DIR', 'gitcookies'), 'gitcookies REDACTED'
1089 ], ),
1090 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001091 ),
1092 ]
1093 calls += [
1094 # Make zip file for the git config and gitcookies.
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00001095 (
1096 (['make_archive', trace_name + '-git-info', 'zip', 'TEMP_DIR'], ),
1097 None,
Edward Lemur1b52d872019-05-09 21:12:12 +00001098 ),
1099 ]
1100
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001101 # TODO(crbug/877717): this should never be used.
1102 if squash and short_hostname != 'chromium':
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001103 calls += [
1104 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001105 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001106 sorted(reviewers),
Edward Lemur227d5102020-02-25 23:45:35 +00001107 cc + ['test-more-cc@chromium.org'],
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00001108 notify),
1109 ''),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001110 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001111 return calls
1112
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00001113 def _run_gerrit_upload_test(self,
1114 upload_args,
1115 description,
1116 reviewers=None,
1117 squash=True,
1118 squash_mode=None,
1119 title=None,
1120 notify=False,
1121 post_amend_description=None,
1122 issue=None,
1123 cc=None,
1124 fetched_status=None,
1125 other_cl_owner=None,
1126 custom_cl_base=None,
1127 tbr=None,
1128 short_hostname='chromium',
1129 labels=None,
1130 change_id=None,
1131 final_description=None,
1132 gitcookies_exists=True,
1133 force=False,
1134 log_description=None,
1135 edit_description=None,
1136 fetched_description=None,
1137 default_branch='master',
1138 push_opts=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001139 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001140 if squash_mode is None:
1141 if '--no-squash' in upload_args:
1142 squash_mode = 'nosquash'
1143 elif '--squash' in upload_args:
1144 squash_mode = 'squash'
1145 else:
1146 squash_mode = 'default'
1147
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001148 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001149 cc = cc or []
Edward Lemurda4b6c62020-02-13 00:28:40 +00001150 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001151 CookiesAuthenticatorMockFactory(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001152 same_auth=('git-owner.example.com', '', 'pass'))).start()
1153 mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck',
1154 lambda _, offer_removal: None).start()
1155 mock.patch('git_cl.gclient_utils.RunEditor',
1156 lambda *_, **__: self._mocked_call(['RunEditor'])).start()
1157 mock.patch('git_cl.DownloadGerritHook', lambda force: self._mocked_call(
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00001158 'DownloadGerritHook', force)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00001159 mock.patch('git_cl.gclient_utils.FileRead',
1160 lambda path: self._mocked_call(['FileRead', path])).start()
1161 mock.patch('git_cl.gclient_utils.FileWrite',
Edward Lemur1b52d872019-05-09 21:12:12 +00001162 lambda path, contents: self._mocked_call(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001163 ['FileWrite', path, contents])).start()
1164 mock.patch('git_cl.datetime_now',
1165 lambda: datetime.datetime(2017, 3, 16, 20, 0, 41, 0)).start()
1166 mock.patch('git_cl.tempfile.mkdtemp', lambda: 'TEMP_DIR').start()
1167 mock.patch('git_cl.TRACES_DIR', 'TRACES_DIR').start()
1168 mock.patch('git_cl.TRACES_README_FORMAT',
Edward Lemur75391d42019-05-14 23:35:56 +00001169 '%(now)s\n'
1170 '%(gerrit_host)s\n'
1171 '%(change_id)s\n'
1172 '%(title)s\n'
1173 '%(description)s\n'
1174 '%(execution_time)s\n'
1175 '%(exit_code)s\n'
Edward Lemurda4b6c62020-02-13 00:28:40 +00001176 '%(trace_name)s').start()
1177 mock.patch('git_cl.shutil.make_archive',
1178 lambda *args: self._mocked_call(['make_archive'] +
1179 list(args))).start()
1180 mock.patch('os.path.isfile',
1181 lambda path: self._mocked_call(['os.path.isfile', path])).start()
Edward Lemur9aa1a962020-02-25 00:58:38 +00001182 mock.patch(
Edward Lesmes0dd54822020-03-26 18:24:25 +00001183 'git_cl._create_description_from_log',
1184 return_value=log_description or description).start()
Edward Lemura12175c2020-03-09 16:58:26 +00001185 mock.patch(
1186 'git_cl.Changelist._AddChangeIdToCommitMessage',
1187 return_value=post_amend_description or description).start()
Edward Lemur1a83da12020-03-04 21:18:36 +00001188 mock.patch(
Edward Lemur5a644f82020-03-18 16:44:57 +00001189 'git_cl.GenerateGerritChangeId', return_value=change_id).start()
1190 mock.patch(
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001191 'git_common.get_or_create_merge_base',
1192 return_value='origin/' + default_branch).start()
1193 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00001194 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00001195 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
tandriia60502f2016-06-20 02:01:53 -07001196
Edward Lemur26964072020-02-19 19:18:51 +00001197 self.mockGit.config['gerrit.host'] = 'true'
Edward Lemur85153282020-02-14 22:06:29 +00001198 self.mockGit.config['branch.master.gerritissue'] = (
1199 str(issue) if issue else None)
1200 self.mockGit.config['remote.origin.url'] = (
1201 'https://%s.googlesource.com/my/repo' % short_hostname)
Edward Lemur9aa1a962020-02-25 00:58:38 +00001202 self.mockGit.config['user.email'] = 'me@example.com'
Edward Lemur85153282020-02-14 22:06:29 +00001203
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001204 self.calls = self._gerrit_base_calls(
1205 issue=issue,
Anthony Polito8b955342019-09-24 19:01:36 +00001206 fetched_description=fetched_description or description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001207 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001208 other_cl_owner=other_cl_owner,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001209 custom_cl_base=custom_cl_base,
Anthony Polito8b955342019-09-24 19:01:36 +00001210 short_hostname=short_hostname,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001211 change_id=change_id,
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001212 default_branch=default_branch)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001213 if fetched_status != 'ABANDONED':
Edward Lemurda4b6c62020-02-13 00:28:40 +00001214 mock.patch(
Edward Lemur1773f372020-02-22 00:27:14 +00001215 'gclient_utils.temporary_file', TemporaryFileMock()).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00001216 mock.patch('os.remove', return_value=True).start()
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001217 self.calls += self._gerrit_upload_calls(
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00001218 description,
1219 reviewers,
1220 squash,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001221 squash_mode=squash_mode,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00001222 title=title,
1223 notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001224 post_amend_description=post_amend_description,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00001225 issue=issue,
1226 cc=cc,
1227 custom_cl_base=custom_cl_base,
1228 tbr=tbr,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001229 short_hostname=short_hostname,
Edward Lemur1b52d872019-05-09 21:12:12 +00001230 labels=labels,
1231 change_id=change_id,
Edward Lemur1b52d872019-05-09 21:12:12 +00001232 final_description=final_description,
Anthony Polito8b955342019-09-24 19:01:36 +00001233 gitcookies_exists=gitcookies_exists,
Josipe827b0f2020-01-30 00:07:20 +00001234 force=force,
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001235 edit_description=edit_description,
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00001236 default_branch=default_branch,
1237 push_opts=push_opts)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001238 # Uncomment when debugging.
Raul Tambre80ee78e2019-05-06 22:41:05 +00001239 # print('\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001240 git_cl.main(['upload'] + upload_args)
Edward Lemur85153282020-02-14 22:06:29 +00001241 if squash:
Edward Lemur26964072020-02-19 19:18:51 +00001242 self.assertIssueAndPatchset(patchset=None)
Edward Lemur85153282020-02-14 22:06:29 +00001243 self.assertEqual(
1244 'abcdef0123456789',
Edward Lemur26964072020-02-19 19:18:51 +00001245 scm.GIT.GetBranchConfig('', 'master', 'gerritsquashhash'))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001246
Edward Lemur1b52d872019-05-09 21:12:12 +00001247 def test_gerrit_upload_traces_no_gitcookies(self):
1248 self._run_gerrit_upload_test(
1249 ['--no-squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001250 'desc ✔\n\nBUG=\n',
Edward Lemur1b52d872019-05-09 21:12:12 +00001251 [],
1252 squash=False,
Edward Lemur0db01f02019-11-12 22:01:51 +00001253 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001254 change_id='Ixxx',
1255 gitcookies_exists=False)
1256
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001257 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001258 self._run_gerrit_upload_test(
Edward Lemur5a644f82020-03-18 16:44:57 +00001259 [],
1260 'desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
1261 [],
1262 change_id='Ixxx')
1263
1264 def test_gerrit_upload_without_change_id_nosquash(self):
1265 self._run_gerrit_upload_test(
tandriia60502f2016-06-20 02:01:53 -07001266 ['--no-squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001267 'desc ✔\n\nBUG=\n',
tandriia60502f2016-06-20 02:01:53 -07001268 [],
1269 squash=False,
Edward Lemur0db01f02019-11-12 22:01:51 +00001270 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001271 change_id='Ixxx')
tandriia60502f2016-06-20 02:01:53 -07001272
Edward Lesmes4de54132020-05-05 19:41:33 +00001273 def test_gerrit_upload_without_change_id_override_nosquash(self):
1274 self._run_gerrit_upload_test(
1275 [],
1276 'desc ✔\n\nBUG=\n',
1277 [],
1278 squash=False,
1279 squash_mode='override_nosquash',
1280 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
1281 change_id='Ixxx')
1282
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001283 def test_gerrit_no_reviewer(self):
1284 self._run_gerrit_upload_test(
Edward Lesmes4de54132020-05-05 19:41:33 +00001285 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001286 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001287 [],
1288 squash=False,
Edward Lesmes4de54132020-05-05 19:41:33 +00001289 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001290 change_id='I123456789')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001291
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00001292 def test_gerrit_push_opts(self):
1293 self._run_gerrit_upload_test(['-o', 'wip'],
1294 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
1295 [],
1296 squash=False,
1297 squash_mode='override_nosquash',
1298 change_id='I123456789',
1299 push_opts=['-o', 'wip'])
1300
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001301 def test_gerrit_no_reviewer_non_chromium_host(self):
1302 # TODO(crbug/877717): remove this test case.
Josip Sokcevicf2cfd3d2021-03-30 18:39:18 +00001303 self._run_gerrit_upload_test([],
1304 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
1305 [],
1306 squash=False,
1307 squash_mode='override_nosquash',
1308 short_hostname='other',
1309 change_id='I123456789')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001310
Edward Lesmes0dd54822020-03-26 18:24:25 +00001311 def test_gerrit_patchset_title_special_chars_nosquash(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001312 self._run_gerrit_upload_test(
Edward Lesmes4de54132020-05-05 19:41:33 +00001313 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001314 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001315 squash=False,
Edward Lesmes4de54132020-05-05 19:41:33 +00001316 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001317 change_id='I123456789',
Edward Lemur5a644f82020-03-18 16:44:57 +00001318 title='We\'ll escape ^_ ^ special chars...@{u}')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001319
ukai@chromium.orge8077812012-02-03 03:41:46 +00001320 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001321 self._run_gerrit_upload_test(
Edward Lesmes4de54132020-05-05 19:41:33 +00001322 ['-r', 'foo@example.com', '--send-mail'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001323 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
Edward Lemur5a644f82020-03-18 16:44:57 +00001324 reviewers=['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001325 squash=False,
Edward Lesmes4de54132020-05-05 19:41:33 +00001326 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001327 notify=True,
1328 change_id='I123456789',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001329 final_description=(
Edward Lemur0db01f02019-11-12 22:01:51 +00001330 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001331
Anthony Polito8b955342019-09-24 19:01:36 +00001332 def test_gerrit_upload_force_sets_bug(self):
1333 self._run_gerrit_upload_test(
1334 ['-b', '10000', '-f'],
1335 u'desc=\n\nBug: 10000\nChange-Id: Ixxx',
1336 [],
1337 force=True,
Anthony Polito8b955342019-09-24 19:01:36 +00001338 fetched_description='desc=\n\nChange-Id: Ixxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001339 change_id='Ixxx')
1340
Edward Lemur5fb22242020-03-12 22:05:13 +00001341 def test_gerrit_upload_corrects_wrong_change_id(self):
Anthony Polito8b955342019-09-24 19:01:36 +00001342 self._run_gerrit_upload_test(
Edward Lemur5fb22242020-03-12 22:05:13 +00001343 ['-b', '10000', '-m', 'Title', '--edit-description'],
1344 u'desc=\n\nBug: 10000\nChange-Id: Ixxxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001345 [],
Anthony Polito8b955342019-09-24 19:01:36 +00001346 issue='123456',
Edward Lemur5fb22242020-03-12 22:05:13 +00001347 edit_description='desc=\n\nBug: 10000\nChange-Id: Izzzz',
Anthony Polito8b955342019-09-24 19:01:36 +00001348 fetched_description='desc=\n\nChange-Id: Ixxxx',
Anthony Polito8b955342019-09-24 19:01:36 +00001349 title='Title',
Edward Lemur5fb22242020-03-12 22:05:13 +00001350 change_id='Ixxxx')
Anthony Polito8b955342019-09-24 19:01:36 +00001351
Dan Beamd8b04ca2019-10-10 21:23:26 +00001352 def test_gerrit_upload_force_sets_fixed(self):
1353 self._run_gerrit_upload_test(
1354 ['-x', '10000', '-f'],
1355 u'desc=\n\nFixed: 10000\nChange-Id: Ixxx',
1356 [],
1357 force=True,
Dan Beamd8b04ca2019-10-10 21:23:26 +00001358 fetched_description='desc=\n\nChange-Id: Ixxx',
Dan Beamd8b04ca2019-10-10 21:23:26 +00001359 change_id='Ixxx')
1360
ukai@chromium.orge8077812012-02-03 03:41:46 +00001361 def test_gerrit_reviewer_multiple(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001362 mock.patch('git_cl.gerrit_util.GetCodeReviewTbrScore',
1363 lambda *a: self._mocked_call('GetCodeReviewTbrScore', *a)).start()
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001364 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001365 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001366 'desc ✔\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
bradnelsond975b302016-10-23 12:20:23 -07001367 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001368 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001369 ['reviewer@example.com', 'another@example.com'],
Aaron Gablefd238082017-06-07 13:42:34 -07001370 cc=['more@example.com', 'people@example.com'],
Edward Lemur687ca902018-12-05 02:30:30 +00001371 tbr='reviewer@example.com',
Edward Lemur1b52d872019-05-09 21:12:12 +00001372 labels={'Code-Review': 2},
Edward Lemur5a644f82020-03-18 16:44:57 +00001373 change_id='123456789')
tandriia60502f2016-06-20 02:01:53 -07001374
1375 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001376 self._run_gerrit_upload_test(
1377 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001378 'desc ✔\nBUG=\n\nChange-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001379 [],
Edward Lemur5a644f82020-03-18 16:44:57 +00001380 change_id='123456789')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001381
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001382 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001383 self._run_gerrit_upload_test(
1384 ['--squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001385 'desc ✔\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001386 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001387 squash=True,
Edward Lemur5a644f82020-03-18 16:44:57 +00001388 change_id='123456789')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001389
Edward Lesmes0dd54822020-03-26 18:24:25 +00001390 def test_gerrit_upload_squash_first_title(self):
1391 self._run_gerrit_upload_test(
1392 ['-f', '-t', 'title'],
1393 'title\n\ndesc\n\nChange-Id: 123456789',
1394 [],
1395 force=True,
1396 squash=True,
1397 log_description='desc',
1398 change_id='123456789')
1399
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001400 def test_gerrit_upload_squash_first_with_labels(self):
1401 self._run_gerrit_upload_test(
1402 ['--squash', '--cq-dry-run', '--enable-auto-submit'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001403 'desc ✔\nBUG=\n\nChange-Id: 123456789',
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001404 [],
1405 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001406 labels={'Commit-Queue': 1, 'Auto-Submit': 1},
Edward Lemur5a644f82020-03-18 16:44:57 +00001407 change_id='123456789')
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001408
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001409 def test_gerrit_upload_squash_first_against_rev(self):
1410 custom_cl_base = 'custom_cl_base_rev_or_branch'
1411 self._run_gerrit_upload_test(
1412 ['--squash', custom_cl_base],
Edward Lemur0db01f02019-11-12 22:01:51 +00001413 'desc ✔\nBUG=\n\nChange-Id: 123456789',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001414 [],
1415 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001416 custom_cl_base=custom_cl_base,
Edward Lemur5a644f82020-03-18 16:44:57 +00001417 change_id='123456789')
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001418 self.assertIn(
1419 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1420 sys.stdout.getvalue())
1421
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001422 def test_gerrit_upload_squash_reupload(self):
Edward Lemur0db01f02019-11-12 22:01:51 +00001423 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001424 self._run_gerrit_upload_test(
1425 ['--squash'],
1426 description,
1427 [],
1428 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001429 issue=123456,
Edward Lemur5a644f82020-03-18 16:44:57 +00001430 change_id='123456789')
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001431
Edward Lemurd55c5072020-02-20 01:09:07 +00001432 @mock.patch('sys.stderr', StringIO())
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001433 def test_gerrit_upload_squash_reupload_to_abandoned(self):
Edward Lemur0db01f02019-11-12 22:01:51 +00001434 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001435 with self.assertRaises(SystemExitMock):
1436 self._run_gerrit_upload_test(
1437 ['--squash'],
1438 description,
1439 [],
1440 squash=True,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001441 issue=123456,
Edward Lemur1b52d872019-05-09 21:12:12 +00001442 fetched_status='ABANDONED',
1443 change_id='123456789')
Edward Lemurd55c5072020-02-20 01:09:07 +00001444 self.assertEqual(
1445 'Change https://chromium-review.googlesource.com/123456 has been '
1446 'abandoned, new uploads are not allowed\n',
1447 sys.stderr.getvalue())
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001448
Edward Lemurda4b6c62020-02-13 00:28:40 +00001449 @mock.patch(
1450 'gerrit_util.GetAccountDetails',
1451 return_value={'email': 'yet-another@example.com'})
1452 def test_gerrit_upload_squash_reupload_to_not_owned(self, _mock):
Edward Lemur0db01f02019-11-12 22:01:51 +00001453 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001454 self._run_gerrit_upload_test(
1455 ['--squash'],
1456 description,
1457 [],
1458 squash=True,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001459 issue=123456,
Edward Lemur1b52d872019-05-09 21:12:12 +00001460 other_cl_owner='other@example.com',
Edward Lemur5a644f82020-03-18 16:44:57 +00001461 change_id='123456789')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001462 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001463 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001464 'authenticate to Gerrit as yet-another@example.com.\n'
1465 'Uploading may fail due to lack of permissions',
Edward Lemurda4b6c62020-02-13 00:28:40 +00001466 sys.stdout.getvalue())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001467
Josipe827b0f2020-01-30 00:07:20 +00001468 def test_upload_change_description_editor(self):
1469 fetched_description = 'foo\n\nChange-Id: 123456789'
1470 description = 'bar\n\nChange-Id: 123456789'
1471 self._run_gerrit_upload_test(
1472 ['--squash', '--edit-description'],
1473 description,
1474 [],
1475 fetched_description=fetched_description,
1476 squash=True,
Josipe827b0f2020-01-30 00:07:20 +00001477 issue=123456,
1478 change_id='123456789',
Josipe827b0f2020-01-30 00:07:20 +00001479 edit_description=description)
1480
Edward Lemurda4b6c62020-02-13 00:28:40 +00001481 @mock.patch('git_cl.RunGit')
1482 @mock.patch('git_cl.CMDupload')
Edward Lemur1a83da12020-03-04 21:18:36 +00001483 @mock.patch('sys.stdin', StringIO('\n'))
1484 @mock.patch('sys.stdout', StringIO())
Edward Lemurda4b6c62020-02-13 00:28:40 +00001485 def test_upload_branch_deps(self, *_mocks):
rmistry@google.com2dd99862015-06-22 12:22:18 +00001486 def mock_run_git(*args, **_kwargs):
1487 if args[0] == ['for-each-ref',
1488 '--format=%(refname:short) %(upstream:short)',
1489 'refs/heads']:
1490 # Create a local branch dependency tree that looks like this:
1491 # test1 -> test2 -> test3 -> test4 -> test5
1492 # -> test3.1
1493 # test6 -> test0
1494 branch_deps = [
1495 'test2 test1', # test1 -> test2
1496 'test3 test2', # test2 -> test3
1497 'test3.1 test2', # test2 -> test3.1
1498 'test4 test3', # test3 -> test4
1499 'test5 test4', # test4 -> test5
1500 'test6 test0', # test0 -> test6
1501 'test7', # test7
1502 ]
1503 return '\n'.join(branch_deps)
Edward Lemurda4b6c62020-02-13 00:28:40 +00001504 git_cl.RunGit.side_effect = mock_run_git
1505 git_cl.CMDupload.return_value = 0
rmistry@google.com2dd99862015-06-22 12:22:18 +00001506
1507 class MockChangelist():
1508 def __init__(self):
1509 pass
1510 def GetBranch(self):
1511 return 'test1'
1512 def GetIssue(self):
1513 return '123'
1514 def GetPatchset(self):
1515 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001516 def IsGerrit(self):
1517 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001518
1519 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1520 # CMDupload should have been called 5 times because of 5 dependent branches.
Edward Lemurda4b6c62020-02-13 00:28:40 +00001521 self.assertEqual(5, len(git_cl.CMDupload.mock_calls))
Edward Lemur1a83da12020-03-04 21:18:36 +00001522 self.assertIn(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001523 'This command will checkout all dependent branches '
1524 'and run "git cl upload". Press Enter to continue, '
Edward Lemur1a83da12020-03-04 21:18:36 +00001525 'or Ctrl+C to abort',
1526 sys.stdout.getvalue())
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001527 self.assertEqual(0, ret)
rmistry@google.com2dd99862015-06-22 12:22:18 +00001528
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001529 def test_gerrit_change_id(self):
1530 self.calls = [
1531 ((['git', 'write-tree'], ),
1532 'hashtree'),
1533 ((['git', 'rev-parse', 'HEAD~0'], ),
1534 'branch-parent'),
1535 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1536 'A B <a@b.org> 1456848326 +0100'),
1537 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1538 'C D <c@d.org> 1456858326 +0100'),
1539 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1540 'hashchange'),
1541 ]
1542 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1543 self.assertEqual(change_id, 'Ihashchange')
1544
Edward Lesmes8170c292021-03-19 20:04:43 +00001545 @mock.patch('gerrit_util.IsCodeOwnersEnabledOnHost')
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001546 @mock.patch('git_cl.Settings.GetBugPrefix')
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001547 @mock.patch('git_cl.Changelist.FetchDescription')
1548 @mock.patch('git_cl.Changelist.GetBranch')
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001549 @mock.patch('git_cl.Changelist.GetCommonAncestorWithUpstream')
Edward Lesmese1576912021-02-16 21:53:34 +00001550 @mock.patch('git_cl.Changelist.GetGerritHost')
1551 @mock.patch('git_cl.Changelist.GetGerritProject')
1552 @mock.patch('git_cl.Changelist.GetRemoteBranch')
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001553 @mock.patch('owners_client.OwnersClient.BatchListOwners')
1554 def getDescriptionForUploadTest(
Edward Lesmese1576912021-02-16 21:53:34 +00001555 self, mockBatchListOwners=None, mockGetRemoteBranch=None,
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001556 mockGetGerritProject=None, mockGetGerritHost=None,
1557 mockGetCommonAncestorWithUpstream=None, mockGetBranch=None,
Edward Lesmese1576912021-02-16 21:53:34 +00001558 mockFetchDescription=None, mockGetBugPrefix=None,
Edward Lesmes8170c292021-03-19 20:04:43 +00001559 mockIsCodeOwnersEnabledOnHost=None,
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001560 initial_description='desc', bug=None, fixed=None, branch='branch',
1561 reviewers=None, tbrs=None, add_owners_to=None,
1562 expected_description='desc'):
1563 reviewers = reviewers or []
1564 tbrs = tbrs or []
1565 owners_by_path = {
1566 'a': ['a@example.com'],
1567 'b': ['b@example.com'],
1568 'c': ['c@example.com'],
1569 }
Edward Lesmes8170c292021-03-19 20:04:43 +00001570 mockIsCodeOwnersEnabledOnHost.return_value = True
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001571 mockGetBranch.return_value = branch
1572 mockGetBugPrefix.return_value = 'prefix'
Edward Lesmes1eaaab52021-03-02 23:52:54 +00001573 mockGetCommonAncestorWithUpstream.return_value = 'upstream'
Edward Lesmese1576912021-02-16 21:53:34 +00001574 mockGetRemoteBranch.return_value = ('origin', 'refs/remotes/origin/main')
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001575 mockFetchDescription.return_value = 'desc'
1576 mockBatchListOwners.side_effect = lambda ps: {
1577 p: owners_by_path.get(p)
1578 for p in ps
1579 }
1580
1581 cl = git_cl.Changelist(issue=1234)
1582 actual = cl._GetDescriptionForUpload(
1583 options=mock.Mock(
1584 bug=bug,
1585 fixed=fixed,
1586 reviewers=reviewers,
1587 tbrs=tbrs,
1588 add_owners_to=add_owners_to),
1589 git_diff_args=None,
1590 files=list(owners_by_path))
1591 self.assertEqual(expected_description, actual.description)
1592
1593 def testGetDescriptionForUpload(self):
1594 self.getDescriptionForUploadTest()
1595
1596 def testGetDescriptionForUpload_Bug(self):
1597 self.getDescriptionForUploadTest(
1598 bug='1234',
1599 expected_description='\n'.join([
1600 'desc',
1601 '',
1602 'Bug: prefix:1234',
1603 ]))
1604
1605 def testGetDescriptionForUpload_Fixed(self):
1606 self.getDescriptionForUploadTest(
1607 fixed='1234',
1608 expected_description='\n'.join([
1609 'desc',
1610 '',
1611 'Fixed: prefix:1234',
1612 ]))
1613
1614
1615 def testGetDescriptionForUpload_BugFromBranch(self):
1616 self.getDescriptionForUploadTest(
1617 branch='bug-1234',
1618 expected_description='\n'.join([
1619 'desc',
1620 '',
1621 'Bug: prefix:1234',
1622 ]))
1623
1624 def testGetDescriptionForUpload_FixedFromBranch(self):
1625 self.getDescriptionForUploadTest(
1626 branch='fix-1234',
1627 expected_description='\n'.join([
1628 'desc',
1629 '',
1630 'Fixed: prefix:1234',
1631 ]))
1632
1633 def testGetDescriptionForUpload_AddOwnersToR(self):
1634 self.getDescriptionForUploadTest(
1635 reviewers=['a@example.com'],
1636 tbrs=['b@example.com'],
1637 add_owners_to='R',
1638 expected_description='\n'.join([
1639 'desc',
1640 '',
1641 'R=a@example.com, c@example.com',
1642 'TBR=b@example.com',
1643 ]))
1644
1645 def testGetDescriptionForUpload_AddOwnersToTBR(self):
1646 self.getDescriptionForUploadTest(
1647 reviewers=['a@example.com'],
1648 tbrs=['b@example.com'],
1649 add_owners_to='TBR',
1650 expected_description='\n'.join([
1651 'desc',
1652 '',
1653 'R=a@example.com',
1654 'TBR=b@example.com, c@example.com',
1655 ]))
1656
1657 def testGetDescriptionForUpload_AddOwnersToNoOwnersNeeded(self):
1658 self.getDescriptionForUploadTest(
1659 reviewers=['a@example.com', 'c@example.com'],
1660 tbrs=['b@example.com'],
1661 add_owners_to='TBR',
1662 expected_description='\n'.join([
1663 'desc',
1664 '',
1665 'R=a@example.com, c@example.com',
1666 'TBR=b@example.com',
1667 ]))
1668
1669 def testGetDescriptionForUpload_Reviewers(self):
1670 self.getDescriptionForUploadTest(
1671 reviewers=['a@example.com', 'b@example.com'],
1672 expected_description='\n'.join([
1673 'desc',
1674 '',
1675 'R=a@example.com, b@example.com',
1676 ]))
1677
1678 def testGetDescriptionForUpload_TBRs(self):
1679 self.getDescriptionForUploadTest(
1680 tbrs=['a@example.com', 'b@example.com'],
1681 expected_description='\n'.join([
1682 'desc',
1683 '',
1684 'TBR=a@example.com, b@example.com',
1685 ]))
1686
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001687 def test_desecription_append_footer(self):
1688 for init_desc, footer_line, expected_desc in [
1689 # Use unique desc first lines for easy test failure identification.
1690 ('foo', 'R=one', 'foo\n\nR=one'),
1691 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1692 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1693 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1694 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1695 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1696 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1697 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1698 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1699 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1700 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1701 ]:
1702 desc = git_cl.ChangeDescription(init_desc)
1703 desc.append_footer(footer_line)
1704 self.assertEqual(desc.description, expected_desc)
1705
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001706 def test_update_reviewers(self):
1707 data = [
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001708 ('foo', [], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001709 'foo'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001710 ('foo\nR=xx', [], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001711 'foo\nR=xx'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001712 ('foo\nTBR=xx', [], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001713 'foo\nTBR=xx'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001714 ('foo', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001715 'foo\n\nR=a@c'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001716 ('foo\nR=xx', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001717 'foo\n\nR=a@c, xx'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001718 ('foo\nTBR=xx', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001719 'foo\n\nR=a@c\nTBR=xx'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001720 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001721 'foo\n\nR=a@c, yy\nTBR=xx'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001722 ('foo\nBUG=', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001723 'foo\nBUG=\nR=a@c'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001724 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001725 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001726 ('foo', ['a@c', 'b@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001727 'foo\n\nR=a@c, b@c'),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001728 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001729 'foo\nBar\n\nR=c@c\nBUG='),
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001730 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001731 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001732 # Same as the line before, but full of whitespaces.
1733 (
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001734 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001735 'foo\nBar\n\nR=c@c\n BUG =',
1736 ),
1737 # Whitespaces aren't interpreted as new lines.
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001738 ('foo BUG=allo R=joe ', ['c@c'], [],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001739 'foo BUG=allo R=joe\n\nR=c@c'),
1740 # Redundant TBRs get promoted to Rs
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001741 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001742 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001743 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001744 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001745 actual = []
Stephen Martinis1c3c9392021-01-07 02:42:33 +00001746 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001747 obj = git_cl.ChangeDescription(orig)
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00001748 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001749 actual.append(obj.description)
1750 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001751
Nodir Turakulov23b82142017-11-16 11:04:25 -08001752 def test_get_hash_tags(self):
Josip Sokcevicc39ab992020-09-24 20:09:15 +00001753 self.calls = [
1754 ((['git', 'show-branch', 'refs/remotes/origin/main'], ),
1755 callError(1)),
1756 ] * 9
Nodir Turakulov23b82142017-11-16 11:04:25 -08001757 cases = [
1758 ('', []),
1759 ('a', []),
1760 ('[a]', ['a']),
1761 ('[aa]', ['aa']),
1762 ('[a ]', ['a']),
1763 ('[a- ]', ['a']),
1764 ('[a- b]', ['a-b']),
1765 ('[a--b]', ['a-b']),
1766 ('[a', []),
1767 ('[a]x', ['a']),
1768 ('[aa]x', ['aa']),
1769 ('[a b]', ['a-b']),
1770 ('[a b]', ['a-b']),
1771 ('[a__b]', ['a-b']),
1772 ('[a] x', ['a']),
1773 ('[a][b]', ['a', 'b']),
1774 ('[a] [b]', ['a', 'b']),
1775 ('[a][b]x', ['a', 'b']),
1776 ('[a][b] x', ['a', 'b']),
1777 ('[a]\n[b]', ['a']),
1778 ('[a\nb]', []),
1779 ('[a][', ['a']),
1780 ('Revert "[a] feature"', ['a']),
1781 ('Reland "[a] feature"', ['a']),
1782 ('Revert: [a] feature', ['a']),
1783 ('Reland: [a] feature', ['a']),
1784 ('Revert "Reland: [a] feature"', ['a']),
1785 ('Foo: feature', ['foo']),
1786 ('Foo Bar: feature', ['foo-bar']),
Anthony Polito02b5af32019-12-02 19:49:47 +00001787 ('Change Foo::Bar', []),
1788 ('Foo: Change Foo::Bar', ['foo']),
Nodir Turakulov23b82142017-11-16 11:04:25 -08001789 ('Revert "Foo bar: feature"', ['foo-bar']),
1790 ('Reland "Foo bar: feature"', ['foo-bar']),
1791 ]
1792 for desc, expected in cases:
1793 change_desc = git_cl.ChangeDescription(desc)
1794 actual = change_desc.get_hash_tags()
1795 self.assertEqual(
1796 actual,
1797 expected,
1798 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1799
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001800 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001801 self.assertEqual(None, git_cl.GetTargetRef(None,
1802 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001803 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001804
wittman@chromium.org455dc922015-01-26 20:15:50 +00001805 # Check default target refs for branches.
1806 self.assertEqual('refs/heads/master',
1807 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001808 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001809 self.assertEqual('refs/heads/master',
1810 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001811 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001812 self.assertEqual('refs/heads/master',
1813 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001814 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001815 self.assertEqual('refs/branch-heads/123',
1816 git_cl.GetTargetRef('origin',
1817 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001818 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001819 self.assertEqual('refs/diff/test',
1820 git_cl.GetTargetRef('origin',
1821 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001822 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001823 self.assertEqual('refs/heads/chrome/m42',
1824 git_cl.GetTargetRef('origin',
1825 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001826 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001827
1828 # Check target refs for user-specified target branch.
1829 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1830 'refs/remotes/branch-heads/123'):
1831 self.assertEqual('refs/branch-heads/123',
1832 git_cl.GetTargetRef('origin',
1833 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001834 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001835 for branch in ('origin/master', 'remotes/origin/master',
1836 'refs/remotes/origin/master'):
1837 self.assertEqual('refs/heads/master',
1838 git_cl.GetTargetRef('origin',
1839 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001840 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001841 for branch in ('master', 'heads/master', 'refs/heads/master'):
1842 self.assertEqual('refs/heads/master',
1843 git_cl.GetTargetRef('origin',
1844 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001845 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001846
Edward Lemurda4b6c62020-02-13 00:28:40 +00001847 @mock.patch('git_common.is_dirty_git_tree', return_value=True)
1848 def test_patch_when_dirty(self, *_mocks):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001849 # Patch when local tree is dirty.
wychen@chromium.orga872e752015-04-28 23:42:18 +00001850 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1851
Edward Lemur85153282020-02-14 22:06:29 +00001852 def assertIssueAndPatchset(
1853 self, branch='master', issue='123456', patchset='7',
1854 git_short_host='chromium'):
1855 self.assertEqual(
Edward Lemur26964072020-02-19 19:18:51 +00001856 issue, scm.GIT.GetBranchConfig('', branch, 'gerritissue'))
Edward Lemur85153282020-02-14 22:06:29 +00001857 self.assertEqual(
Edward Lemur26964072020-02-19 19:18:51 +00001858 patchset, scm.GIT.GetBranchConfig('', branch, 'gerritpatchset'))
Edward Lemur85153282020-02-14 22:06:29 +00001859 self.assertEqual(
1860 'https://%s-review.googlesource.com' % git_short_host,
Edward Lemur26964072020-02-19 19:18:51 +00001861 scm.GIT.GetBranchConfig('', branch, 'gerritserver'))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001862
Edward Lemur85153282020-02-14 22:06:29 +00001863 def _patch_common(self, git_short_host='chromium'):
Edward Lesmes50da7702020-03-30 19:23:43 +00001864 mock.patch('scm.GIT.ResolveCommit', return_value='deadbeef').start()
Edward Lemur26964072020-02-19 19:18:51 +00001865 self.mockGit.config['remote.origin.url'] = (
1866 'https://%s.googlesource.com/my/repo' % git_short_host)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001867 gerrit_util.GetChangeDetail.return_value = {
1868 'current_revision': '7777777777',
1869 'revisions': {
1870 '1111111111': {
1871 '_number': 1,
1872 'fetch': {'http': {
1873 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1874 'ref': 'refs/changes/56/123456/1',
1875 }},
1876 },
1877 '7777777777': {
1878 '_number': 7,
1879 'fetch': {'http': {
1880 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1881 'ref': 'refs/changes/56/123456/7',
1882 }},
1883 },
1884 },
1885 }
wychen@chromium.orga872e752015-04-28 23:42:18 +00001886
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001887 def test_patch_gerrit_default(self):
Edward Lemur85153282020-02-14 22:06:29 +00001888 self._patch_common()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001889 self.calls += [
1890 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1891 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001892 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001893 ]
1894 self.assertEqual(git_cl.main(['patch', '123456']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001895 self.assertIssueAndPatchset()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001896
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001897 def test_patch_gerrit_new_branch(self):
Edward Lemur85153282020-02-14 22:06:29 +00001898 self._patch_common()
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001899 self.calls += [
1900 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1901 'refs/changes/56/123456/7'],), ''),
1902 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001903 ]
Edward Lemur85153282020-02-14 22:06:29 +00001904 self.assertEqual(git_cl.main(['patch', '-b', 'feature', '123456']), 0)
1905 self.assertIssueAndPatchset(branch='feature')
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001906
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001907 def test_patch_gerrit_force(self):
Edward Lemur85153282020-02-14 22:06:29 +00001908 self._patch_common('host')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001909 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001910 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001911 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001912 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001913 ]
Edward Lemur52969c92020-02-06 18:15:28 +00001914 self.assertEqual(git_cl.main(['patch', '123456', '--force']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001915 self.assertIssueAndPatchset(git_short_host='host')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001916
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001917 def test_patch_gerrit_guess_by_url(self):
Edward Lemur85153282020-02-14 22:06:29 +00001918 self._patch_common('else')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001919 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001920 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001921 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001922 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001923 ]
1924 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001925 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001926 self.assertIssueAndPatchset(patchset='1', git_short_host='else')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001927
Aaron Gable697a91b2018-01-19 15:20:15 -08001928 def test_patch_gerrit_guess_by_url_with_repo(self):
Edward Lemur85153282020-02-14 22:06:29 +00001929 self._patch_common('else')
Aaron Gable697a91b2018-01-19 15:20:15 -08001930 self.calls += [
1931 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1932 'refs/changes/56/123456/1'],), ''),
1933 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Aaron Gable697a91b2018-01-19 15:20:15 -08001934 ]
1935 self.assertEqual(git_cl.main(
1936 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1937 0)
Edward Lemur85153282020-02-14 22:06:29 +00001938 self.assertIssueAndPatchset(patchset='1', git_short_host='else')
Aaron Gable697a91b2018-01-19 15:20:15 -08001939
Edward Lemurd55c5072020-02-20 01:09:07 +00001940 @mock.patch('sys.stderr', StringIO())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001941 def test_patch_gerrit_conflict(self):
Edward Lemur85153282020-02-14 22:06:29 +00001942 self._patch_common()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001943 self.calls += [
1944 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001945 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001946 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001947 ]
1948 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001949 git_cl.main(['patch', '123456'])
Edward Lemurd55c5072020-02-20 01:09:07 +00001950 self.assertEqual(
1951 'Command "git cherry-pick FETCH_HEAD" failed.\n\n',
1952 sys.stderr.getvalue())
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001953
Edward Lemurda4b6c62020-02-13 00:28:40 +00001954 @mock.patch(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001955 'gerrit_util.GetChangeDetail',
Edward Lemurda4b6c62020-02-13 00:28:40 +00001956 side_effect=gerrit_util.GerritError(404, ''))
Edward Lemurd55c5072020-02-20 01:09:07 +00001957 @mock.patch('sys.stderr', StringIO())
Edward Lemurda4b6c62020-02-13 00:28:40 +00001958 def test_patch_gerrit_not_exists(self, *_mocks):
Edward Lemur26964072020-02-19 19:18:51 +00001959 self.mockGit.config['remote.origin.url'] = (
1960 'https://chromium.googlesource.com/my/repo')
tandriic2405f52016-10-10 08:13:15 -07001961 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001962 self.assertEqual(1, git_cl.main(['patch', '123456']))
Edward Lemurd55c5072020-02-20 01:09:07 +00001963 self.assertEqual(
1964 'change 123456 at https://chromium-review.googlesource.com does not '
1965 'exist or you have no access to it\n',
1966 sys.stderr.getvalue())
tandriic2405f52016-10-10 08:13:15 -07001967
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001968 def _checkout_calls(self):
1969 return [
1970 ((['git', 'config', '--local', '--get-regexp',
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001971 'branch\\..*\\.gerritissue'], ),
1972 ('branch.ger-branch.gerritissue 123456\n'
1973 'branch.gbranch654.gerritissue 654321\n')),
1974 ]
1975
1976 def test_checkout_gerrit(self):
1977 """Tests git cl checkout <issue>."""
1978 self.calls = self._checkout_calls()
1979 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1980 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1981
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001982 def test_checkout_not_found(self):
1983 """Tests git cl checkout <issue>."""
1984 self.calls = self._checkout_calls()
1985 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1986
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001987 def test_checkout_no_branch_issues(self):
1988 """Tests git cl checkout <issue>."""
1989 self.calls = [
1990 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001991 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001992 ]
1993 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1994
Edward Lemur26964072020-02-19 19:18:51 +00001995 def _test_gerrit_ensure_authenticated_common(self, auth):
Edward Lemur1a83da12020-03-04 21:18:36 +00001996 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00001997 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00001998 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00001999 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2000 CookiesAuthenticatorMockFactory(hosts_with_creds=auth)).start()
Edward Lemur26964072020-02-19 19:18:51 +00002001 self.mockGit.config['remote.origin.url'] = (
2002 'https://chromium.googlesource.com/my/repo')
Edward Lemurf38bc172019-09-03 21:02:13 +00002003 cl = git_cl.Changelist()
tandrii@chromium.org28253532016-04-14 13:46:56 +00002004 cl.branch = 'master'
2005 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002006 return cl
2007
Edward Lemurd55c5072020-02-20 01:09:07 +00002008 @mock.patch('sys.stderr', StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002009 def test_gerrit_ensure_authenticated_missing(self):
2010 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002011 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002012 })
Edward Lemurd55c5072020-02-20 01:09:07 +00002013 with self.assertRaises(SystemExitMock):
2014 cl.EnsureAuthenticated(force=False)
2015 self.assertEqual(
2016 'Credentials for the following hosts are required:\n'
2017 ' chromium-review.googlesource.com\n'
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002018 'These are read from ~%(sep)s.gitcookies '
2019 '(or legacy ~%(sep)s%(netrc)s)\n'
Edward Lemurd55c5072020-02-20 01:09:07 +00002020 'You can (re)generate your credentials by visiting '
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002021 'https://chromium-review.googlesource.com/new-password\n' % {
2022 'sep': os.sep,
2023 'netrc': NETRC_FILENAME,
2024 }, sys.stderr.getvalue())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002025
2026 def test_gerrit_ensure_authenticated_conflict(self):
2027 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002028 'chromium.googlesource.com':
2029 ('git-one.example.com', None, 'secret1'),
2030 'chromium-review.googlesource.com':
2031 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002032 })
2033 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002034 (('ask_for_data', 'If you know what you are doing '
2035 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002036 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2037
2038 def test_gerrit_ensure_authenticated_ok(self):
2039 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002040 'chromium.googlesource.com':
2041 ('git-same.example.com', None, 'secret'),
2042 'chromium-review.googlesource.com':
2043 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002044 })
2045 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2046
tandrii@chromium.org28253532016-04-14 13:46:56 +00002047 def test_gerrit_ensure_authenticated_skipped(self):
Edward Lemur26964072020-02-19 19:18:51 +00002048 self.mockGit.config['gerrit.skip-ensure-authenticated'] = 'true'
2049 cl = self._test_gerrit_ensure_authenticated_common(auth={})
tandrii@chromium.org28253532016-04-14 13:46:56 +00002050 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2051
Eric Boren2fb63102018-10-05 13:05:03 +00002052 def test_gerrit_ensure_authenticated_bearer_token(self):
2053 cl = self._test_gerrit_ensure_authenticated_common(auth={
2054 'chromium.googlesource.com':
2055 ('', None, 'secret'),
2056 'chromium-review.googlesource.com':
2057 ('', None, 'secret'),
2058 })
2059 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2060 header = gerrit_util.CookiesAuthenticator().get_auth_header(
2061 'chromium.googlesource.com')
2062 self.assertTrue('Bearer' in header)
2063
Daniel Chengcf6269b2019-05-18 01:02:12 +00002064 def test_gerrit_ensure_authenticated_non_https(self):
Edward Lemur26964072020-02-19 19:18:51 +00002065 self.mockGit.config['remote.origin.url'] = 'custom-scheme://repo'
Daniel Chengcf6269b2019-05-18 01:02:12 +00002066 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00002067 (('logging.warning',
2068 'Ignoring branch %(branch)s with non-https remote '
2069 '%(remote)s', {
2070 'branch': 'master',
2071 'remote': 'custom-scheme://repo'}
2072 ), None),
Daniel Chengcf6269b2019-05-18 01:02:12 +00002073 ]
Edward Lemurda4b6c62020-02-13 00:28:40 +00002074 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2075 CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
2076 mock.patch('logging.warning',
2077 lambda *a: self._mocked_call('logging.warning', *a)).start()
Edward Lemurf38bc172019-09-03 21:02:13 +00002078 cl = git_cl.Changelist()
Daniel Chengcf6269b2019-05-18 01:02:12 +00002079 cl.branch = 'master'
2080 cl.branchref = 'refs/heads/master'
2081 cl.lookedup_issue = True
2082 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2083
Florian Mayerae510e82020-01-30 21:04:48 +00002084 def test_gerrit_ensure_authenticated_non_url(self):
Edward Lemur26964072020-02-19 19:18:51 +00002085 self.mockGit.config['remote.origin.url'] = (
2086 'git@somehost.example:foo/bar.git')
Florian Mayerae510e82020-01-30 21:04:48 +00002087 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00002088 (('logging.error',
2089 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2090 'but it doesn\'t exist.', {
2091 'remote': 'origin',
2092 'branch': 'master',
2093 'url': 'git@somehost.example:foo/bar.git'}
2094 ), None),
Florian Mayerae510e82020-01-30 21:04:48 +00002095 ]
Edward Lemurda4b6c62020-02-13 00:28:40 +00002096 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2097 CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
2098 mock.patch('logging.error',
2099 lambda *a: self._mocked_call('logging.error', *a)).start()
Florian Mayerae510e82020-01-30 21:04:48 +00002100 cl = git_cl.Changelist()
2101 cl.branch = 'master'
2102 cl.branchref = 'refs/heads/master'
2103 cl.lookedup_issue = True
2104 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2105
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002106 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
Edward Lemur85153282020-02-14 22:06:29 +00002107 self.mockGit.config['branch.master.gerritissue'] = '123'
2108 self.mockGit.config['branch.master.gerritserver'] = (
2109 'https://chromium-review.googlesource.com')
Edward Lemur26964072020-02-19 19:18:51 +00002110 self.mockGit.config['remote.origin.url'] = (
2111 'https://chromium.googlesource.com/infra/infra')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002112 self.calls = [
Edward Lemurda4b6c62020-02-13 00:28:40 +00002113 (('SetReview', 'chromium-review.googlesource.com',
2114 'infra%2Finfra~123', None,
2115 {'Commit-Queue': vote}, notify, None), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002116 ]
tandriid9e5ce52016-07-13 02:32:59 -07002117
2118 def test_cmd_set_commit_gerrit_clear(self):
2119 self._cmd_set_commit_gerrit_common(0)
2120 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2121
2122 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07002123 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002124 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2125
tandriid9e5ce52016-07-13 02:32:59 -07002126 def test_cmd_set_commit_gerrit(self):
2127 self._cmd_set_commit_gerrit_common(2)
2128 self.assertEqual(0, git_cl.main(['set-commit']))
2129
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002130 def test_description_display(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002131 mock.patch('git_cl.Changelist', ChangelistMock).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002132 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002133
2134 self.assertEqual(0, git_cl.main(['description', '-d']))
Edward Lemurda4b6c62020-02-13 00:28:40 +00002135 self.assertEqual('foo\n', sys.stdout.getvalue())
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002136
Edward Lemurda4b6c62020-02-13 00:28:40 +00002137 @mock.patch('sys.stderr', StringIO())
iannucci3c972b92016-08-17 13:24:10 -07002138 def test_StatusFieldOverrideIssueMissingArgs(self):
iannucci3c972b92016-08-17 13:24:10 -07002139 try:
2140 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
Edward Lemurd55c5072020-02-20 01:09:07 +00002141 except SystemExitMock:
Edward Lemur6c6827c2020-02-06 21:15:18 +00002142 self.assertIn(
Edward Lemurda4b6c62020-02-13 00:28:40 +00002143 '--field must be given when --issue is set.', sys.stderr.getvalue())
iannucci3c972b92016-08-17 13:24:10 -07002144
2145 def test_StatusFieldOverrideIssue(self):
iannucci3c972b92016-08-17 13:24:10 -07002146 def assertIssue(cl_self, *_args):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002147 self.assertEqual(cl_self.issue, 1)
iannucci3c972b92016-08-17 13:24:10 -07002148 return 'foobar'
2149
Edward Lemurda4b6c62020-02-13 00:28:40 +00002150 mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
iannuccie53c9352016-08-17 14:40:40 -07002151 self.assertEqual(
Edward Lemur52969c92020-02-06 18:15:28 +00002152 git_cl.main(['status', '--issue', '1', '--field', 'desc']),
iannuccie53c9352016-08-17 14:40:40 -07002153 0)
Edward Lemurda4b6c62020-02-13 00:28:40 +00002154 self.assertEqual(sys.stdout.getvalue(), 'foobar\n')
iannucci3c972b92016-08-17 13:24:10 -07002155
iannuccie53c9352016-08-17 14:40:40 -07002156 def test_SetCloseOverrideIssue(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002157
iannuccie53c9352016-08-17 14:40:40 -07002158 def assertIssue(cl_self, *_args):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002159 self.assertEqual(cl_self.issue, 1)
iannuccie53c9352016-08-17 14:40:40 -07002160 return 'foobar'
2161
Edward Lemurda4b6c62020-02-13 00:28:40 +00002162 mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
2163 mock.patch('git_cl.Changelist.CloseIssue', lambda *_: None).start()
iannuccie53c9352016-08-17 14:40:40 -07002164 self.assertEqual(
Edward Lemur52969c92020-02-06 18:15:28 +00002165 git_cl.main(['set-close', '--issue', '1']), 0)
iannuccie53c9352016-08-17 14:40:40 -07002166
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00002167 def test_description(self):
Edward Lemur26964072020-02-19 19:18:51 +00002168 self.mockGit.config['remote.origin.url'] = (
2169 'https://chromium.googlesource.com/my/repo')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002170 gerrit_util.GetChangeDetail.return_value = {
2171 'current_revision': 'sha1',
2172 'revisions': {'sha1': {
2173 'commit': {'message': 'foobar'},
2174 }},
2175 }
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002176 self.assertEqual(0, git_cl.main([
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00002177 'description',
2178 'https://chromium-review.googlesource.com/c/my/repo/+/123123',
2179 '-d']))
Edward Lemurda4b6c62020-02-13 00:28:40 +00002180 self.assertEqual('foobar\n', sys.stdout.getvalue())
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002181
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002182 def test_description_set_raw(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002183 mock.patch('git_cl.Changelist', ChangelistMock).start()
2184 mock.patch('git_cl.sys.stdin', StringIO('hihi')).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002185
2186 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2187 self.assertEqual('hihi', ChangelistMock.desc)
2188
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002189 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002190 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002191
2192 def RunEditor(desc, _, **kwargs):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002193 self.assertEqual(
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002194 '# Enter a description of the change.\n'
2195 '# This will be displayed on the codereview site.\n'
2196 '# The first line will also be used as the subject of the review.\n'
2197 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002198 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002199 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002200 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002201 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002202 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002203
Edward Lemur6c6827c2020-02-06 21:15:18 +00002204 def UpdateDescription(_, desc, force=False):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002205 self.assertEqual(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002206
Edward Lemurda4b6c62020-02-13 00:28:40 +00002207 mock.patch('git_cl.Changelist.FetchDescription',
2208 lambda *args: current_desc).start()
2209 mock.patch('git_cl.Changelist.UpdateDescription',
2210 UpdateDescription).start()
2211 mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002212
Edward Lemur85153282020-02-14 22:06:29 +00002213 self.mockGit.config['branch.master.gerritissue'] = '123'
Edward Lemur52969c92020-02-06 18:15:28 +00002214 self.assertEqual(0, git_cl.main(['description']))
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002215
Dan Beamd8b04ca2019-10-10 21:23:26 +00002216 def test_description_does_not_append_bug_line_if_fixed_is_present(self):
2217 current_desc = 'Some.\n\nFixed: 123\nChange-Id: xxx'
2218
2219 def RunEditor(desc, _, **kwargs):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002220 self.assertEqual(
Dan Beamd8b04ca2019-10-10 21:23:26 +00002221 '# Enter a description of the change.\n'
2222 '# This will be displayed on the codereview site.\n'
2223 '# The first line will also be used as the subject of the review.\n'
2224 '#--------------------This line is 72 characters long'
2225 '--------------------\n'
2226 'Some.\n\nFixed: 123\nChange-Id: xxx',
2227 desc)
2228 return desc
2229
Edward Lemurda4b6c62020-02-13 00:28:40 +00002230 mock.patch('git_cl.Changelist.FetchDescription',
2231 lambda *args: current_desc).start()
2232 mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002233
Edward Lemur85153282020-02-14 22:06:29 +00002234 self.mockGit.config['branch.master.gerritissue'] = '123'
Edward Lemur52969c92020-02-06 18:15:28 +00002235 self.assertEqual(0, git_cl.main(['description']))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002236
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002237 def test_description_set_stdin(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002238 mock.patch('git_cl.Changelist', ChangelistMock).start()
2239 mock.patch('git_cl.sys.stdin', StringIO('hi \r\n\t there\n\nman')).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002240
2241 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2242 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2243
kmarshall3bff56b2016-06-06 18:31:47 -07002244 def test_archive(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002245 self.calls = [
2246 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
Edward Lemurf38bc172019-09-03 21:02:13 +00002247 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002248 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002249 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
Edward Lemurf38bc172019-09-03 21:02:13 +00002250 ((['git', 'branch', '-D', 'foo'],), '')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002251 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002252
Edward Lemurda4b6c62020-02-13 00:28:40 +00002253 mock.patch('git_cl.get_cl_statuses',
kmarshall3bff56b2016-06-06 18:31:47 -07002254 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002255 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2256 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002257 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall3bff56b2016-06-06 18:31:47 -07002258
2259 self.assertEqual(0, git_cl.main(['archive', '-f']))
2260
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002261 def test_archive_tag_collision(self):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002262 self.calls = [
2263 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2264 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2265 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],),
2266 'refs/tags/git-cl-archived-456-foo'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002267 ((['git', 'tag', 'git-cl-archived-456-foo-2', 'foo'],), ''),
2268 ((['git', 'branch', '-D', 'foo'],), '')
2269 ]
2270
Edward Lemurda4b6c62020-02-13 00:28:40 +00002271 mock.patch('git_cl.get_cl_statuses',
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002272 lambda branches, fine_grained, max_processes:
2273 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2274 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002275 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002276
2277 self.assertEqual(0, git_cl.main(['archive', '-f']))
2278
kmarshall3bff56b2016-06-06 18:31:47 -07002279 def test_archive_current_branch_fails(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002280 self.calls = [
2281 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2282 'refs/heads/master'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002283 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002284 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002285
Edward Lemurda4b6c62020-02-13 00:28:40 +00002286 mock.patch('git_cl.get_cl_statuses',
kmarshall9249e012016-08-23 12:02:16 -07002287 lambda branches, fine_grained, max_processes:
Edward Lemurda4b6c62020-02-13 00:28:40 +00002288 [(MockChangelistWithBranchAndIssue('master', 1),
2289 'closed')]).start()
kmarshall9249e012016-08-23 12:02:16 -07002290
2291 self.assertEqual(1, git_cl.main(['archive', '-f']))
2292
2293 def test_archive_dry_run(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002294 self.calls = [
2295 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2296 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002297 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002298 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002299
Edward Lemurda4b6c62020-02-13 00:28:40 +00002300 mock.patch('git_cl.get_cl_statuses',
kmarshall3bff56b2016-06-06 18:31:47 -07002301 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002302 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2303 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002304 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall3bff56b2016-06-06 18:31:47 -07002305
kmarshall9249e012016-08-23 12:02:16 -07002306 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2307
2308 def test_archive_no_tags(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002309 self.calls = [
2310 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2311 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002312 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002313 ((['git', 'branch', '-D', 'foo'],), '')
2314 ]
kmarshall9249e012016-08-23 12:02:16 -07002315
Edward Lemurda4b6c62020-02-13 00:28:40 +00002316 mock.patch('git_cl.get_cl_statuses',
kmarshall9249e012016-08-23 12:02:16 -07002317 lambda branches, fine_grained, max_processes:
2318 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2319 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002320 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall9249e012016-08-23 12:02:16 -07002321
2322 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002323
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002324 def test_archive_tag_cleanup_on_branch_deletion_error(self):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002325 self.calls = [
2326 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2327 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2328 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002329 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],),
2330 'refs/tags/git-cl-archived-456-foo'),
2331 ((['git', 'branch', '-D', 'foo'],), CERR1),
2332 ((['git', 'tag', '-d', 'git-cl-archived-456-foo'],),
2333 'refs/tags/git-cl-archived-456-foo'),
2334 ]
2335
Edward Lemurda4b6c62020-02-13 00:28:40 +00002336 mock.patch('git_cl.get_cl_statuses',
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002337 lambda branches, fine_grained, max_processes:
2338 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2339 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002340 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002341
2342 self.assertEqual(0, git_cl.main(['archive', '-f']))
2343
Tibor Goldschwendt7c5efb22020-03-25 01:23:54 +00002344 def test_archive_with_format(self):
2345 self.calls = [
2346 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'], ),
2347 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2348 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'], ), ''),
2349 ((['git', 'tag', 'archived/12-foo', 'foo'], ), ''),
2350 ((['git', 'branch', '-D', 'foo'], ), ''),
2351 ]
2352
2353 mock.patch('git_cl.get_cl_statuses',
2354 lambda branches, fine_grained, max_processes:
2355 [(MockChangelistWithBranchAndIssue('foo', 12), 'closed')]).start()
2356
2357 self.assertEqual(
2358 0, git_cl.main(['archive', '-f', '-p', 'archived/{issue}-{branch}']))
2359
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002360 def test_cmd_issue_erase_existing(self):
Edward Lemur85153282020-02-14 22:06:29 +00002361 self.mockGit.config['branch.master.gerritissue'] = '123'
2362 self.mockGit.config['branch.master.gerritserver'] = (
2363 'https://chromium-review.googlesource.com')
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002364 self.calls = [
Aaron Gableca01e2c2017-07-19 11:16:02 -07002365 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002366 ]
2367 self.assertEqual(0, git_cl.main(['issue', '0']))
Edward Lemur85153282020-02-14 22:06:29 +00002368 self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
2369 self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002370
Aaron Gable400e9892017-07-12 15:31:21 -07002371 def test_cmd_issue_erase_existing_with_change_id(self):
Edward Lemur85153282020-02-14 22:06:29 +00002372 self.mockGit.config['branch.master.gerritissue'] = '123'
2373 self.mockGit.config['branch.master.gerritserver'] = (
2374 'https://chromium-review.googlesource.com')
Edward Lemurda4b6c62020-02-13 00:28:40 +00002375 mock.patch('git_cl.Changelist.FetchDescription',
2376 lambda _: 'This is a description\n\nChange-Id: Ideadbeef').start()
Aaron Gable400e9892017-07-12 15:31:21 -07002377 self.calls = [
Aaron Gableca01e2c2017-07-19 11:16:02 -07002378 ((['git', 'log', '-1', '--format=%B'],),
2379 'This is a description\n\nChange-Id: Ideadbeef'),
2380 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002381 ]
2382 self.assertEqual(0, git_cl.main(['issue', '0']))
Edward Lemur85153282020-02-14 22:06:29 +00002383 self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
2384 self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
Aaron Gable400e9892017-07-12 15:31:21 -07002385
phajdan.jre328cf92016-08-22 04:12:17 -07002386 def test_cmd_issue_json(self):
Edward Lemur85153282020-02-14 22:06:29 +00002387 self.mockGit.config['branch.master.gerritissue'] = '123'
2388 self.mockGit.config['branch.master.gerritserver'] = (
2389 'https://chromium-review.googlesource.com')
Nodir Turakulov27379632021-03-17 18:53:29 +00002390 self.mockGit.config['remote.origin.url'] = (
2391 'https://chromium.googlesource.com/chromium/src'
2392 )
2393 self.calls = [(
2394 (
2395 'write_json',
2396 'output.json',
2397 {
2398 'issue': 123,
2399 'issue_url': 'https://chromium-review.googlesource.com/123',
2400 'gerrit_host': 'chromium-review.googlesource.com',
2401 'gerrit_project': 'chromium/src',
2402 },
2403 ),
2404 '',
2405 )]
phajdan.jre328cf92016-08-22 04:12:17 -07002406 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2407
tandrii16e0b4e2016-06-07 10:34:28 -07002408 def _common_GerritCommitMsgHookCheck(self):
Edward Lemur15a9b8c2020-02-13 00:52:30 +00002409 mock.patch(
2410 'git_cl.os.path.abspath',
2411 lambda path: self._mocked_call(['abspath', path])).start()
2412 mock.patch(
2413 'git_cl.os.path.exists',
2414 lambda path: self._mocked_call(['exists', path])).start()
2415 mock.patch(
2416 'git_cl.gclient_utils.FileRead',
2417 lambda path: self._mocked_call(['FileRead', path])).start()
2418 mock.patch(
2419 'git_cl.gclient_utils.rm_file_or_tree',
2420 lambda path: self._mocked_call(['rm_file_or_tree', path])).start()
Edward Lemur1a83da12020-03-04 21:18:36 +00002421 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00002422 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00002423 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurf38bc172019-09-03 21:02:13 +00002424 return git_cl.Changelist(issue=123)
tandrii16e0b4e2016-06-07 10:34:28 -07002425
2426 def test_GerritCommitMsgHookCheck_custom_hook(self):
2427 cl = self._common_GerritCommitMsgHookCheck()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002428 self.calls += [((['exists',
2429 os.path.join('.git', 'hooks', 'commit-msg')], ), True),
2430 ((['FileRead',
2431 os.path.join('.git', 'hooks', 'commit-msg')], ),
2432 '#!/bin/sh\necho "custom hook"')]
Edward Lemur125d60a2019-09-13 18:25:41 +00002433 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002434
2435 def test_GerritCommitMsgHookCheck_not_exists(self):
2436 cl = self._common_GerritCommitMsgHookCheck()
2437 self.calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002438 ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), False),
tandrii16e0b4e2016-06-07 10:34:28 -07002439 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002440 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002441
2442 def test_GerritCommitMsgHookCheck(self):
2443 cl = self._common_GerritCommitMsgHookCheck()
2444 self.calls += [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002445 ((['exists', os.path.join('.git', 'hooks', 'commit-msg')], ), True),
2446 ((['FileRead', os.path.join('.git', 'hooks', 'commit-msg')], ),
tandrii16e0b4e2016-06-07 10:34:28 -07002447 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002448 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002449 ((['rm_file_or_tree',
2450 os.path.join('.git', 'hooks', 'commit-msg')], ), ''),
tandrii16e0b4e2016-06-07 10:34:28 -07002451 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002452 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002453
tandriic4344b52016-08-29 06:04:54 -07002454 def test_GerritCmdLand(self):
Edward Lemur85153282020-02-14 22:06:29 +00002455 self.mockGit.config['branch.master.gerritsquashhash'] = 'deadbeaf'
2456 self.mockGit.config['branch.master.gerritserver'] = (
2457 'chromium-review.googlesource.com')
tandriic4344b52016-08-29 06:04:54 -07002458 self.calls += [
tandriic4344b52016-08-29 06:04:54 -07002459 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
tandriic4344b52016-08-29 06:04:54 -07002460 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002461 cl = git_cl.Changelist(issue=123)
Edward Lemur125d60a2019-09-13 18:25:41 +00002462 cl._GetChangeDetail = lambda *args, **kwargs: {
tandriic4344b52016-08-29 06:04:54 -07002463 'labels': {},
2464 'current_revision': 'deadbeaf',
2465 }
Edward Lemur125d60a2019-09-13 18:25:41 +00002466 cl._GetChangeCommit = lambda: {
agable32978d92016-11-01 12:55:02 -07002467 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002468 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002469 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2470 }
Edward Lemur125d60a2019-09-13 18:25:41 +00002471 cl.SubmitIssue = lambda wait_for_merge: None
Olivier Robin75ee7252018-04-13 10:02:56 +02002472 self.assertEqual(0, cl.CMDLand(force=True,
2473 bypass_hooks=True,
2474 verbose=True,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00002475 parallel=False,
2476 resultdb=False,
2477 realm=None))
Edward Lemur73c76702020-02-06 23:57:18 +00002478 self.assertIn(
2479 'Issue chromium-review.googlesource.com/123 has been submitted',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002480 sys.stdout.getvalue())
Edward Lemur73c76702020-02-06 23:57:18 +00002481 self.assertIn(
2482 'Landed as: https://git.googlesource.com/test/+/deadbeef',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002483 sys.stdout.getvalue())
tandriic4344b52016-08-29 06:04:54 -07002484
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002485 def _mock_gerrit_changes_for_detail_cache(self):
Edward Lesmeseeca9c62020-11-20 00:00:17 +00002486 mock.patch('git_cl.Changelist.GetGerritHost', lambda _: 'host').start()
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002487
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002488 def test_gerrit_change_detail_cache_simple(self):
2489 self._mock_gerrit_changes_for_detail_cache()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002490 gerrit_util.GetChangeDetail.side_effect = ['a', 'b']
Edward Lemurf38bc172019-09-03 21:02:13 +00002491 cl1 = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002492 cl1._cached_remote_url = (
2493 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemurf38bc172019-09-03 21:02:13 +00002494 cl2 = git_cl.Changelist(issue=2)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002495 cl2._cached_remote_url = (
2496 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002497 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
2498 self.assertEqual(cl1._GetChangeDetail(), 'a')
2499 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002500
2501 def test_gerrit_change_detail_cache_options(self):
2502 self._mock_gerrit_changes_for_detail_cache()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002503 gerrit_util.GetChangeDetail.side_effect = ['cab', 'ad']
Edward Lemurf38bc172019-09-03 21:02:13 +00002504 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002505 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002506 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2507 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2508 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2509 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2510 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2511 self.assertEqual(cl._GetChangeDetail(), 'cab')
2512
2513 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2514 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2515 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2516 self.assertEqual(cl._GetChangeDetail(), 'cab')
2517
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002518 def test_gerrit_description_caching(self):
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002519 gerrit_util.GetChangeDetail.return_value = {
2520 'current_revision': 'rev1',
2521 'revisions': {
2522 'rev1': {'commit': {'message': 'desc1'}},
2523 },
2524 }
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002525
2526 self._mock_gerrit_changes_for_detail_cache()
Edward Lemurf38bc172019-09-03 21:02:13 +00002527 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002528 cl._cached_remote_url = (
2529 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemur6c6827c2020-02-06 21:15:18 +00002530 self.assertEqual(cl.FetchDescription(), 'desc1')
2531 self.assertEqual(cl.FetchDescription(), 'desc1') # cache hit.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002532
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002533 def test_print_current_creds(self):
2534 class CookiesAuthenticatorMock(object):
2535 def __init__(self):
2536 self.gitcookies = {
2537 'host.googlesource.com': ('user', 'pass'),
2538 'host-review.googlesource.com': ('user', 'pass'),
2539 }
2540 self.netrc = self
2541 self.netrc.hosts = {
2542 'github.com': ('user2', None, 'pass2'),
2543 'host2.googlesource.com': ('user3', None, 'pass'),
2544 }
Edward Lemurda4b6c62020-02-13 00:28:40 +00002545 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2546 CookiesAuthenticatorMock).start()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002547 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
2548 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2549 ' Host\t User\t Which file',
2550 '============================\t=====\t===========',
2551 'host-review.googlesource.com\t user\t.gitcookies',
2552 ' host.googlesource.com\t user\t.gitcookies',
2553 ' host2.googlesource.com\tuser3\t .netrc',
2554 ])
Edward Lemur79d4f992019-11-11 23:49:02 +00002555 sys.stdout.seek(0)
2556 sys.stdout.truncate(0)
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002557 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
2558 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2559 ' Host\tUser\t Which file',
2560 '============================\t====\t===========',
2561 'host-review.googlesource.com\tuser\t.gitcookies',
2562 ' host.googlesource.com\tuser\t.gitcookies',
2563 ])
2564
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002565 def _common_creds_check_mocks(self):
2566 def exists_mock(path):
2567 dirname = os.path.dirname(path)
2568 if dirname == os.path.expanduser('~'):
2569 dirname = '~'
2570 base = os.path.basename(path)
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002571 if base in (NETRC_FILENAME, '.gitcookies'):
2572 return self._mocked_call('os.path.exists', os.path.join(dirname, base))
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002573 # git cl also checks for existence other files not relevant to this test.
2574 return None
Edward Lemur1a83da12020-03-04 21:18:36 +00002575 mock.patch(
Edward Lesmesae3586b2020-03-23 21:21:14 +00002576 'gclient_utils.AskForData',
Edward Lemur1a83da12020-03-04 21:18:36 +00002577 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002578 mock.patch('os.path.exists', exists_mock).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002579
2580 def test_creds_check_gitcookies_not_configured(self):
2581 self._common_creds_check_mocks()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002582 mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
2583 lambda _, include_netrc=False: []).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002584 self.calls = [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002585 ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
2586 ((['git', 'config', '--global', 'http.cookiefile'], ), CERR1),
2587 (('os.path.exists', os.path.join('~', NETRC_FILENAME)), True),
2588 (('ask_for_data', 'Press Enter to setup .gitcookies, '
2589 'or Ctrl+C to abort'), ''),
2590 (([
2591 'git', 'config', '--global', 'http.cookiefile',
2592 os.path.expanduser(os.path.join('~', '.gitcookies'))
2593 ], ), ''),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002594 ]
2595 self.assertEqual(0, git_cl.main(['creds-check']))
Edward Lemur73c76702020-02-06 23:57:18 +00002596 self.assertTrue(
2597 sys.stdout.getvalue().startswith(
2598 'You seem to be using outdated .netrc for git credentials:'))
2599 self.assertIn(
2600 '\nConfigured git to use .gitcookies from',
2601 sys.stdout.getvalue())
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002602
2603 def test_creds_check_gitcookies_configured_custom_broken(self):
2604 self._common_creds_check_mocks()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002605 mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
2606 lambda _, include_netrc=False: []).start()
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002607 custom_cookie_path = ('C:\\.gitcookies'
2608 if sys.platform == 'win32' else '/custom/.gitcookies')
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002609 self.calls = [
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00002610 ((['git', 'config', '--path', 'http.cookiefile'], ), CERR1),
2611 ((['git', 'config', '--global', 'http.cookiefile'], ),
2612 custom_cookie_path),
2613 (('os.path.exists', custom_cookie_path), False),
2614 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
2615 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
2616 (([
2617 'git', 'config', '--global', 'http.cookiefile',
2618 os.path.expanduser(os.path.join('~', '.gitcookies'))
2619 ], ), ''),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002620 ]
2621 self.assertEqual(0, git_cl.main(['creds-check']))
Edward Lemur73c76702020-02-06 23:57:18 +00002622 self.assertIn(
2623 'WARNING: You have configured custom path to .gitcookies: ',
2624 sys.stdout.getvalue())
2625 self.assertIn(
2626 'However, your configured .gitcookies file is missing.',
2627 sys.stdout.getvalue())
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002628
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002629 def test_git_cl_comment_add_gerrit(self):
Edward Lemur85153282020-02-14 22:06:29 +00002630 self.mockGit.branchref = None
Edward Lemur26964072020-02-19 19:18:51 +00002631 self.mockGit.config['remote.origin.url'] = (
2632 'https://chromium.googlesource.com/infra/infra')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002633 self.calls = [
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002634 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002635 'msg', None, None, None),
Aaron Gable636b13f2017-07-14 10:42:48 -07002636 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002637 ]
Edward Lemur52969c92020-02-06 18:15:28 +00002638 self.assertEqual(0, git_cl.main(['comment', '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002639
Edward Lemurda4b6c62020-02-13 00:28:40 +00002640 @mock.patch('git_cl.Changelist.GetBranch', return_value='foo')
2641 def test_git_cl_comments_fetch_gerrit(self, *_mocks):
Edward Lemur26964072020-02-19 19:18:51 +00002642 self.mockGit.config['remote.origin.url'] = (
2643 'https://chromium.googlesource.com/infra/infra')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002644 gerrit_util.GetChangeDetail.return_value = {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002645 'owner': {'email': 'owner@example.com'},
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002646 'current_revision': 'ba5eba11',
2647 'revisions': {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002648 'deadbeaf': {
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002649 '_number': 1,
2650 },
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002651 'ba5eba11': {
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002652 '_number': 2,
2653 },
2654 },
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002655 'messages': [
2656 {
2657 u'_revision_number': 1,
2658 u'author': {
2659 u'_account_id': 1111084,
Andrii Shyshkalov8aa9d622020-03-10 19:15:35 +00002660 u'email': u'could-be-anything@example.com',
2661 u'name': u'LUCI CQ'
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002662 },
2663 u'date': u'2017-03-15 20:08:45.000000000',
2664 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07002665 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002666 u'tag': u'autogenerated:cq:dry-run'
2667 },
2668 {
2669 u'_revision_number': 2,
2670 u'author': {
2671 u'_account_id': 11151243,
2672 u'email': u'owner@example.com',
2673 u'name': u'owner'
2674 },
2675 u'date': u'2017-03-16 20:00:41.000000000',
2676 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2677 u'message': u'PTAL',
2678 },
2679 {
2680 u'_revision_number': 2,
2681 u'author': {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002682 u'_account_id': 148512,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002683 u'email': u'reviewer@example.com',
2684 u'name': u'reviewer'
2685 },
2686 u'date': u'2017-03-17 05:19:37.500000000',
2687 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2688 u'message': u'Patch Set 2: Code-Review+1',
2689 },
2690 ]
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002691 }
2692 self.calls = [
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002693 (('GetChangeComments', 'chromium-review.googlesource.com',
2694 'infra%2Finfra~1'), {
2695 '/COMMIT_MSG': [
2696 {
2697 'author': {
2698 'email': u'reviewer@example.com'
2699 },
2700 'updated': u'2017-03-17 05:19:37.500000000',
2701 'patch_set': 2,
2702 'side': 'REVISION',
2703 'message': 'Please include a bug link',
2704 },
2705 ],
2706 'codereview.settings': [
2707 {
2708 'author': {
2709 'email': u'owner@example.com'
2710 },
2711 'updated': u'2017-03-16 20:00:41.000000000',
2712 'patch_set': 2,
2713 'side': 'PARENT',
2714 'line': 42,
2715 'message': 'I removed this because it is bad',
2716 },
2717 ]
2718 }),
2719 (('GetChangeRobotComments', 'chromium-review.googlesource.com',
2720 'infra%2Finfra~1'), {}),
2721 ] * 2 + [(('write_json', 'output.json', [{
2722 u'date':
2723 u'2017-03-16 20:00:41.000000',
2724 u'message': (u'PTAL\n' + u'\n' + u'codereview.settings\n' +
2725 u' Base, Line 42: https://crrev.com/c/1/2/'
2726 u'codereview.settings#b42\n' +
2727 u' I removed this because it is bad\n'),
2728 u'autogenerated':
2729 False,
2730 u'approval':
2731 False,
2732 u'disapproval':
2733 False,
2734 u'sender':
2735 u'owner@example.com'
2736 }, {
2737 u'date':
2738 u'2017-03-17 05:19:37.500000',
2739 u'message':
2740 (u'Patch Set 2: Code-Review+1\n' + u'\n' + u'/COMMIT_MSG\n' +
2741 u' PS2, File comment: https://crrev.com/c/1/2//COMMIT_MSG#\n' +
2742 u' Please include a bug link\n'),
2743 u'autogenerated':
2744 False,
2745 u'approval':
2746 False,
2747 u'disapproval':
2748 False,
2749 u'sender':
2750 u'reviewer@example.com'
2751 }]), '')]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002752 expected_comments_summary = [
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002753 git_cl._CommentSummary(
2754 message=(u'PTAL\n' + u'\n' + u'codereview.settings\n' +
2755 u' Base, Line 42: https://crrev.com/c/1/2/' +
2756 u'codereview.settings#b42\n' +
2757 u' I removed this because it is bad\n'),
2758 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
2759 autogenerated=False,
2760 disapproval=False,
2761 approval=False,
2762 sender=u'owner@example.com'),
2763 git_cl._CommentSummary(message=(
2764 u'Patch Set 2: Code-Review+1\n' + u'\n' + u'/COMMIT_MSG\n' +
2765 u' PS2, File comment: https://crrev.com/c/1/2//COMMIT_MSG#\n' +
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002766 u' Please include a bug link\n'),
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002767 date=datetime.datetime(2017, 3, 17, 5, 19, 37,
2768 500000),
2769 autogenerated=False,
2770 disapproval=False,
2771 approval=False,
2772 sender=u'reviewer@example.com'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002773 ]
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002774 cl = git_cl.Changelist(
Edward Lemurf38bc172019-09-03 21:02:13 +00002775 issue=1, branchref='refs/heads/foo')
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002776 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002777 self.assertEqual(
2778 0, git_cl.main(['comments', '-i', '1', '-j', 'output.json']))
2779
2780 def test_git_cl_comments_robot_comments(self):
2781 # git cl comments also fetches robot comments (which are considered a type
2782 # of autogenerated comment), and unlike other types of comments, only robot
2783 # comments from the latest patchset are shown.
Edward Lemur26964072020-02-19 19:18:51 +00002784 self.mockGit.config['remote.origin.url'] = (
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002785 'https://x.googlesource.com/infra/infra')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002786 gerrit_util.GetChangeDetail.return_value = {
2787 'owner': {'email': 'owner@example.com'},
2788 'current_revision': 'ba5eba11',
2789 'revisions': {
2790 'deadbeaf': {
2791 '_number': 1,
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002792 },
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002793 'ba5eba11': {
2794 '_number': 2,
2795 },
2796 },
2797 'messages': [
2798 {
2799 u'_revision_number': 1,
2800 u'author': {
2801 u'_account_id': 1111084,
2802 u'email': u'commit-bot@chromium.org',
2803 u'name': u'Commit Bot'
2804 },
2805 u'date': u'2017-03-15 20:08:45.000000000',
2806 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
2807 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
2808 u'tag': u'autogenerated:cq:dry-run'
2809 },
2810 {
2811 u'_revision_number': 1,
2812 u'author': {
2813 u'_account_id': 123,
2814 u'email': u'tricium@serviceaccount.com',
2815 u'name': u'Tricium'
2816 },
2817 u'date': u'2017-03-16 20:00:41.000000000',
2818 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2819 u'message': u'(1 comment)',
2820 u'tag': u'autogenerated:tricium',
2821 },
2822 {
2823 u'_revision_number': 1,
2824 u'author': {
2825 u'_account_id': 123,
2826 u'email': u'tricium@serviceaccount.com',
2827 u'name': u'Tricium'
2828 },
2829 u'date': u'2017-03-16 20:00:41.000000000',
2830 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2831 u'message': u'(1 comment)',
2832 u'tag': u'autogenerated:tricium',
2833 },
2834 {
2835 u'_revision_number': 2,
2836 u'author': {
2837 u'_account_id': 123,
2838 u'email': u'tricium@serviceaccount.com',
2839 u'name': u'reviewer'
2840 },
2841 u'date': u'2017-03-17 05:30:37.000000000',
2842 u'tag': u'autogenerated:tricium',
2843 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2844 u'message': u'(1 comment)',
2845 },
2846 ]
2847 }
2848 self.calls = [
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002849 (('GetChangeComments', 'x-review.googlesource.com', 'infra%2Finfra~1'),
2850 {}),
2851 (('GetChangeRobotComments', 'x-review.googlesource.com',
2852 'infra%2Finfra~1'), {
2853 'codereview.settings': [
2854 {
2855 u'author': {
2856 u'email': u'tricium@serviceaccount.com'
2857 },
2858 u'updated': u'2017-03-17 05:30:37.000000000',
2859 u'robot_run_id': u'5565031076855808',
2860 u'robot_id': u'Linter/Category',
2861 u'tag': u'autogenerated:tricium',
2862 u'patch_set': 2,
2863 u'side': u'REVISION',
2864 u'message': u'Linter warning message text',
2865 u'line': 32,
2866 },
2867 ],
2868 }),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002869 ]
2870 expected_comments_summary = [
Andrii Shyshkalova3762a92020-11-25 10:20:42 +00002871 git_cl._CommentSummary(
2872 date=datetime.datetime(2017, 3, 17, 5, 30, 37),
2873 message=(u'(1 comment)\n\ncodereview.settings\n'
2874 u' PS2, Line 32: https://x-review.googlesource.com/c/1/2/'
2875 u'codereview.settings#32\n'
2876 u' Linter warning message text\n'),
2877 sender=u'tricium@serviceaccount.com',
2878 autogenerated=True,
2879 approval=False,
2880 disapproval=False)
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002881 ]
2882 cl = git_cl.Changelist(
Edward Lemurf38bc172019-09-03 21:02:13 +00002883 issue=1, branchref='refs/heads/foo')
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002884 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002885
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002886 def test_get_remote_url_with_mirror(self):
2887 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002888
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002889 def selective_os_path_isdir_mock(path):
2890 if path == '/cache/this-dir-exists':
2891 return self._mocked_call('os.path.isdir', path)
2892 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002893
Edward Lemurda4b6c62020-02-13 00:28:40 +00002894 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002895
2896 url = 'https://chromium.googlesource.com/my/repo'
Edward Lemur26964072020-02-19 19:18:51 +00002897 self.mockGit.config['remote.origin.url'] = (
2898 '/cache/this-dir-exists')
2899 self.mockGit.config['/cache/this-dir-exists:remote.origin.url'] = (
2900 url)
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002901 self.calls = [
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002902 (('os.path.isdir', '/cache/this-dir-exists'),
2903 True),
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002904 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002905 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002906 self.assertEqual(cl.GetRemoteUrl(), url)
2907 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
2908
Edward Lemur298f2cf2019-02-22 21:40:39 +00002909 def test_get_remote_url_non_existing_mirror(self):
2910 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002911
Edward Lemur298f2cf2019-02-22 21:40:39 +00002912 def selective_os_path_isdir_mock(path):
2913 if path == '/cache/this-dir-doesnt-exist':
2914 return self._mocked_call('os.path.isdir', path)
2915 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002916
Edward Lemurda4b6c62020-02-13 00:28:40 +00002917 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
2918 mock.patch('logging.error',
2919 lambda *a: self._mocked_call('logging.error', *a)).start()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002920
Edward Lemur26964072020-02-19 19:18:51 +00002921 self.mockGit.config['remote.origin.url'] = (
2922 '/cache/this-dir-doesnt-exist')
Edward Lemur298f2cf2019-02-22 21:40:39 +00002923 self.calls = [
Edward Lemur298f2cf2019-02-22 21:40:39 +00002924 (('os.path.isdir', '/cache/this-dir-doesnt-exist'),
2925 False),
2926 (('logging.error',
Josip906bfde2020-01-31 22:38:49 +00002927 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2928 'but it doesn\'t exist.', {
2929 'remote': 'origin',
2930 'branch': 'master',
2931 'url': '/cache/this-dir-doesnt-exist'}
2932 ), None),
Edward Lemur298f2cf2019-02-22 21:40:39 +00002933 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002934 cl = git_cl.Changelist(issue=1)
Edward Lemur298f2cf2019-02-22 21:40:39 +00002935 self.assertIsNone(cl.GetRemoteUrl())
2936
2937 def test_get_remote_url_misconfigured_mirror(self):
2938 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002939
Edward Lemur298f2cf2019-02-22 21:40:39 +00002940 def selective_os_path_isdir_mock(path):
2941 if path == '/cache/this-dir-exists':
2942 return self._mocked_call('os.path.isdir', path)
2943 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002944
Edward Lemurda4b6c62020-02-13 00:28:40 +00002945 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
2946 mock.patch('logging.error',
2947 lambda *a: self._mocked_call('logging.error', *a)).start()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002948
Edward Lemur26964072020-02-19 19:18:51 +00002949 self.mockGit.config['remote.origin.url'] = (
2950 '/cache/this-dir-exists')
Edward Lemur298f2cf2019-02-22 21:40:39 +00002951 self.calls = [
Edward Lemur298f2cf2019-02-22 21:40:39 +00002952 (('os.path.isdir', '/cache/this-dir-exists'), True),
Edward Lemur298f2cf2019-02-22 21:40:39 +00002953 (('logging.error',
2954 'Remote "%(remote)s" for branch "%(branch)s" points to '
2955 '"%(cache_path)s", but it is misconfigured.\n'
2956 '"%(cache_path)s" must be a git repo and must have a remote named '
2957 '"%(remote)s" pointing to the git host.', {
2958 'remote': 'origin',
2959 'cache_path': '/cache/this-dir-exists',
2960 'branch': 'master'}
2961 ), None),
2962 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002963 cl = git_cl.Changelist(issue=1)
Edward Lemur298f2cf2019-02-22 21:40:39 +00002964 self.assertIsNone(cl.GetRemoteUrl())
2965
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002966 def test_gerrit_change_identifier_with_project(self):
Edward Lemur26964072020-02-19 19:18:51 +00002967 self.mockGit.config['remote.origin.url'] = (
2968 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemurf38bc172019-09-03 21:02:13 +00002969 cl = git_cl.Changelist(issue=123456)
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002970 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
2971
2972 def test_gerrit_change_identifier_without_project(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002973 mock.patch('logging.error',
2974 lambda *a: self._mocked_call('logging.error', *a)).start()
Josip906bfde2020-01-31 22:38:49 +00002975
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002976 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00002977 (('logging.error',
2978 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2979 'but it doesn\'t exist.', {
2980 'remote': 'origin',
2981 'branch': 'master',
2982 'url': ''}
2983 ), None),
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002984 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002985 cl = git_cl.Changelist(issue=123456)
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002986 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002987
Josip Sokcevicc39ab992020-09-24 20:09:15 +00002988 def test_gerrit_new_default(self):
2989 self._run_gerrit_upload_test(
2990 [],
2991 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
2992 [],
2993 squash=False,
2994 squash_mode='override_nosquash',
2995 change_id='I123456789',
Edward Lesmes8c43c3f2021-01-20 00:20:26 +00002996 default_branch='main')
Josip Sokcevicc39ab992020-09-24 20:09:15 +00002997
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002998
Edward Lemur9aa1a962020-02-25 00:58:38 +00002999class ChangelistTest(unittest.TestCase):
Edward Lemur227d5102020-02-25 23:45:35 +00003000 def setUp(self):
3001 super(ChangelistTest, self).setUp()
3002 mock.patch('gclient_utils.FileRead').start()
3003 mock.patch('gclient_utils.FileWrite').start()
3004 mock.patch('gclient_utils.temporary_file', TemporaryFileMock()).start()
3005 mock.patch(
3006 'git_cl.Changelist.GetCodereviewServer',
3007 return_value='https://chromium-review.googlesource.com').start()
3008 mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start()
3009 mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
3010 mock.patch('git_cl.Changelist.GetPatchset', return_value=7).start()
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003011 mock.patch(
3012 'git_cl.Changelist.GetRemoteBranch',
3013 return_value=('origin', 'refs/remotes/origin/main')).start()
Edward Lemur227d5102020-02-25 23:45:35 +00003014 mock.patch('git_cl.PRESUBMIT_SUPPORT', 'PRESUBMIT_SUPPORT').start()
3015 mock.patch('git_cl.Settings.GetRoot', return_value='root').start()
3016 mock.patch('git_cl.time_time').start()
3017 mock.patch('metrics.collector').start()
3018 mock.patch('subprocess2.Popen').start()
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003019 mock.patch(
3020 'git_cl.Changelist.GetGerritProject', return_value='project').start()
Edward Lemur227d5102020-02-25 23:45:35 +00003021 self.addCleanup(mock.patch.stopall)
3022 self.temp_count = 0
3023
Edward Lemur227d5102020-02-25 23:45:35 +00003024 def testRunHook(self):
3025 expected_results = {
3026 'more_cc': ['more@example.com', 'cc@example.com'],
3027 'should_continue': True,
3028 }
3029 gclient_utils.FileRead.return_value = json.dumps(expected_results)
3030 git_cl.time_time.side_effect = [100, 200]
3031 mockProcess = mock.Mock()
3032 mockProcess.wait.return_value = 0
3033 subprocess2.Popen.return_value = mockProcess
3034
3035 cl = git_cl.Changelist()
3036 results = cl.RunHook(
3037 committing=True,
3038 may_prompt=True,
3039 verbose=2,
3040 parallel=True,
3041 upstream='upstream',
3042 description='description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003043 all_files=True,
3044 resultdb=False)
Edward Lemur227d5102020-02-25 23:45:35 +00003045
3046 self.assertEqual(expected_results, results)
3047 subprocess2.Popen.assert_called_once_with([
3048 'vpython', 'PRESUBMIT_SUPPORT',
Edward Lemur227d5102020-02-25 23:45:35 +00003049 '--root', 'root',
3050 '--upstream', 'upstream',
3051 '--verbose', '--verbose',
Edward Lemur99df04e2020-03-05 19:39:43 +00003052 '--gerrit_url', 'https://chromium-review.googlesource.com',
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003053 '--gerrit_project', 'project',
3054 '--gerrit_branch', 'refs/heads/main',
3055 '--author', 'author',
Edward Lemur227d5102020-02-25 23:45:35 +00003056 '--issue', '123456',
3057 '--patchset', '7',
Edward Lemur75526302020-02-27 22:31:05 +00003058 '--commit',
Edward Lemur227d5102020-02-25 23:45:35 +00003059 '--may_prompt',
3060 '--parallel',
3061 '--all_files',
3062 '--json_output', '/tmp/fake-temp2',
3063 '--description_file', '/tmp/fake-temp1',
3064 ])
3065 gclient_utils.FileWrite.assert_called_once_with(
Edward Lemur1a83da12020-03-04 21:18:36 +00003066 '/tmp/fake-temp1', 'description')
Edward Lemur227d5102020-02-25 23:45:35 +00003067 metrics.collector.add_repeated('sub_commands', {
3068 'command': 'presubmit',
3069 'execution_time': 100,
3070 'exit_code': 0,
3071 })
3072
Edward Lemur99df04e2020-03-05 19:39:43 +00003073 def testRunHook_FewerOptions(self):
3074 expected_results = {
3075 'more_cc': ['more@example.com', 'cc@example.com'],
3076 'should_continue': True,
3077 }
3078 gclient_utils.FileRead.return_value = json.dumps(expected_results)
3079 git_cl.time_time.side_effect = [100, 200]
3080 mockProcess = mock.Mock()
3081 mockProcess.wait.return_value = 0
3082 subprocess2.Popen.return_value = mockProcess
3083
3084 git_cl.Changelist.GetAuthor.return_value = None
3085 git_cl.Changelist.GetIssue.return_value = None
3086 git_cl.Changelist.GetPatchset.return_value = None
Edward Lemur99df04e2020-03-05 19:39:43 +00003087
3088 cl = git_cl.Changelist()
3089 results = cl.RunHook(
3090 committing=False,
3091 may_prompt=False,
3092 verbose=0,
3093 parallel=False,
3094 upstream='upstream',
3095 description='description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003096 all_files=False,
3097 resultdb=False)
Edward Lemur99df04e2020-03-05 19:39:43 +00003098
3099 self.assertEqual(expected_results, results)
3100 subprocess2.Popen.assert_called_once_with([
3101 'vpython', 'PRESUBMIT_SUPPORT',
3102 '--root', 'root',
3103 '--upstream', 'upstream',
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003104 '--gerrit_url', 'https://chromium-review.googlesource.com',
3105 '--gerrit_project', 'project',
3106 '--gerrit_branch', 'refs/heads/main',
Edward Lemur99df04e2020-03-05 19:39:43 +00003107 '--upload',
3108 '--json_output', '/tmp/fake-temp2',
3109 '--description_file', '/tmp/fake-temp1',
3110 ])
3111 gclient_utils.FileWrite.assert_called_once_with(
3112 '/tmp/fake-temp1', 'description')
3113 metrics.collector.add_repeated('sub_commands', {
3114 'command': 'presubmit',
3115 'execution_time': 100,
3116 'exit_code': 0,
3117 })
3118
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003119 def testRunHook_FewerOptionsResultDB(self):
3120 expected_results = {
3121 'more_cc': ['more@example.com', 'cc@example.com'],
3122 'should_continue': True,
3123 }
3124 gclient_utils.FileRead.return_value = json.dumps(expected_results)
3125 git_cl.time_time.side_effect = [100, 200]
3126 mockProcess = mock.Mock()
3127 mockProcess.wait.return_value = 0
3128 subprocess2.Popen.return_value = mockProcess
3129
3130 git_cl.Changelist.GetAuthor.return_value = None
3131 git_cl.Changelist.GetIssue.return_value = None
3132 git_cl.Changelist.GetPatchset.return_value = None
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003133
3134 cl = git_cl.Changelist()
3135 results = cl.RunHook(
3136 committing=False,
3137 may_prompt=False,
3138 verbose=0,
3139 parallel=False,
3140 upstream='upstream',
3141 description='description',
3142 all_files=False,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003143 resultdb=True,
3144 realm='chromium:public')
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003145
3146 self.assertEqual(expected_results, results)
3147 subprocess2.Popen.assert_called_once_with([
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003148 'rdb', 'stream', '-new', '-realm', 'chromium:public', '--',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003149 'vpython', 'PRESUBMIT_SUPPORT',
3150 '--root', 'root',
3151 '--upstream', 'upstream',
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003152 '--gerrit_url', 'https://chromium-review.googlesource.com',
3153 '--gerrit_project', 'project',
3154 '--gerrit_branch', 'refs/heads/main',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003155 '--upload',
3156 '--json_output', '/tmp/fake-temp2',
3157 '--description_file', '/tmp/fake-temp1',
3158 ])
3159
Edward Lemur227d5102020-02-25 23:45:35 +00003160 @mock.patch('sys.exit', side_effect=SystemExitMock)
3161 def testRunHook_Failure(self, _mock):
3162 git_cl.time_time.side_effect = [100, 200]
3163 mockProcess = mock.Mock()
3164 mockProcess.wait.return_value = 2
3165 subprocess2.Popen.return_value = mockProcess
3166
3167 cl = git_cl.Changelist()
3168 with self.assertRaises(SystemExitMock):
3169 cl.RunHook(
3170 committing=True,
3171 may_prompt=True,
3172 verbose=2,
3173 parallel=True,
3174 upstream='upstream',
3175 description='description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003176 all_files=True,
3177 resultdb=False)
Edward Lemur227d5102020-02-25 23:45:35 +00003178
3179 sys.exit.assert_called_once_with(2)
3180
Edward Lemur75526302020-02-27 22:31:05 +00003181 def testRunPostUploadHook(self):
3182 cl = git_cl.Changelist()
3183 cl.RunPostUploadHook(2, 'upstream', 'description')
3184
3185 subprocess2.Popen.assert_called_once_with([
3186 'vpython', 'PRESUBMIT_SUPPORT',
Edward Lemur75526302020-02-27 22:31:05 +00003187 '--root', 'root',
3188 '--upstream', 'upstream',
3189 '--verbose', '--verbose',
Edward Lemur99df04e2020-03-05 19:39:43 +00003190 '--gerrit_url', 'https://chromium-review.googlesource.com',
Edward Lesmeseb1bd622021-03-01 19:54:07 +00003191 '--gerrit_project', 'project',
3192 '--gerrit_branch', 'refs/heads/main',
3193 '--author', 'author',
Edward Lemur75526302020-02-27 22:31:05 +00003194 '--issue', '123456',
3195 '--patchset', '7',
Edward Lemur75526302020-02-27 22:31:05 +00003196 '--post_upload',
3197 '--description_file', '/tmp/fake-temp1',
3198 ])
3199 gclient_utils.FileWrite.assert_called_once_with(
Edward Lemur1a83da12020-03-04 21:18:36 +00003200 '/tmp/fake-temp1', 'description')
Edward Lemur75526302020-02-27 22:31:05 +00003201
Edward Lemur9aa1a962020-02-25 00:58:38 +00003202
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003203class CMDTestCaseBase(unittest.TestCase):
3204 _STATUSES = [
3205 'STATUS_UNSPECIFIED', 'SCHEDULED', 'STARTED', 'SUCCESS', 'FAILURE',
3206 'INFRA_FAILURE', 'CANCELED',
3207 ]
3208 _CHANGE_DETAIL = {
3209 'project': 'depot_tools',
3210 'status': 'OPEN',
3211 'owner': {'email': 'owner@e.mail'},
3212 'current_revision': 'beeeeeef',
3213 'revisions': {
Gavin Make61ccc52020-11-13 00:12:57 +00003214 'deadbeaf': {
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00003215 '_number': 6,
Gavin Make61ccc52020-11-13 00:12:57 +00003216 'kind': 'REWORK',
3217 },
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003218 'beeeeeef': {
3219 '_number': 7,
Gavin Make61ccc52020-11-13 00:12:57 +00003220 'kind': 'NO_CODE_CHANGE',
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003221 'fetch': {'http': {
3222 'url': 'https://chromium.googlesource.com/depot_tools',
3223 'ref': 'refs/changes/56/123456/7'
3224 }},
3225 },
3226 },
3227 }
3228 _DEFAULT_RESPONSE = {
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003229 'builds': [{
3230 'id': str(100 + idx),
3231 'builder': {
3232 'project': 'chromium',
3233 'bucket': 'try',
3234 'builder': 'bot_' + status.lower(),
3235 },
3236 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
3237 'tags': [],
3238 'status': status,
3239 } for idx, status in enumerate(_STATUSES)]
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003240 }
3241
Edward Lemur4c707a22019-09-24 21:13:43 +00003242 def setUp(self):
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003243 super(CMDTestCaseBase, self).setUp()
Edward Lemur79d4f992019-11-11 23:49:02 +00003244 mock.patch('git_cl.sys.stdout', StringIO()).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003245 mock.patch('git_cl.uuid.uuid4', return_value='uuid4').start()
3246 mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003247 mock.patch(
3248 'git_cl.Changelist.GetCodereviewServer',
3249 return_value='https://chromium-review.googlesource.com').start()
3250 mock.patch(
Edward Lesmeseeca9c62020-11-20 00:00:17 +00003251 'git_cl.Changelist.GetGerritHost',
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003252 return_value='chromium-review.googlesource.com').start()
3253 mock.patch(
3254 'git_cl.Changelist.GetMostRecentPatchset',
3255 return_value=7).start()
3256 mock.patch(
Gavin Make61ccc52020-11-13 00:12:57 +00003257 'git_cl.Changelist.GetMostRecentDryRunPatchset',
3258 return_value=6).start()
3259 mock.patch(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003260 'git_cl.Changelist.GetRemoteUrl',
3261 return_value='https://chromium.googlesource.com/depot_tools').start()
3262 mock.patch(
3263 'auth.Authenticator',
3264 return_value=AuthenticatorMock()).start()
3265 mock.patch(
3266 'gerrit_util.GetChangeDetail',
3267 return_value=self._CHANGE_DETAIL).start()
3268 mock.patch(
3269 'git_cl._call_buildbucket',
3270 return_value = self._DEFAULT_RESPONSE).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003271 mock.patch('git_common.is_dirty_git_tree', return_value=False).start()
Edward Lemur4c707a22019-09-24 21:13:43 +00003272 self.addCleanup(mock.patch.stopall)
3273
Edward Lemur4c707a22019-09-24 21:13:43 +00003274
Edward Lemur9468eba2020-02-27 19:07:22 +00003275class CMDPresubmitTestCase(CMDTestCaseBase):
3276 def setUp(self):
3277 super(CMDPresubmitTestCase, self).setUp()
3278 mock.patch(
3279 'git_cl.Changelist.GetCommonAncestorWithUpstream',
3280 return_value='upstream').start()
3281 mock.patch(
3282 'git_cl.Changelist.FetchDescription',
3283 return_value='fetch description').start()
3284 mock.patch(
Edward Lemura12175c2020-03-09 16:58:26 +00003285 'git_cl._create_description_from_log',
Edward Lemur9468eba2020-02-27 19:07:22 +00003286 return_value='get description').start()
3287 mock.patch('git_cl.Changelist.RunHook').start()
3288
3289 def testDefaultCase(self):
3290 self.assertEqual(0, git_cl.main(['presubmit']))
3291 git_cl.Changelist.RunHook.assert_called_once_with(
3292 committing=True,
3293 may_prompt=False,
3294 verbose=0,
3295 parallel=None,
3296 upstream='upstream',
3297 description='fetch description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003298 all_files=None,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003299 resultdb=None,
3300 realm=None)
Edward Lemur9468eba2020-02-27 19:07:22 +00003301
3302 def testNoIssue(self):
3303 git_cl.Changelist.GetIssue.return_value = None
3304 self.assertEqual(0, git_cl.main(['presubmit']))
3305 git_cl.Changelist.RunHook.assert_called_once_with(
3306 committing=True,
3307 may_prompt=False,
3308 verbose=0,
3309 parallel=None,
3310 upstream='upstream',
3311 description='get description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003312 all_files=None,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003313 resultdb=None,
3314 realm=None)
Edward Lemur9468eba2020-02-27 19:07:22 +00003315
3316 def testCustomBranch(self):
3317 self.assertEqual(0, git_cl.main(['presubmit', 'custom_branch']))
3318 git_cl.Changelist.RunHook.assert_called_once_with(
3319 committing=True,
3320 may_prompt=False,
3321 verbose=0,
3322 parallel=None,
3323 upstream='custom_branch',
3324 description='fetch description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003325 all_files=None,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003326 resultdb=None,
3327 realm=None)
Edward Lemur9468eba2020-02-27 19:07:22 +00003328
3329 def testOptions(self):
3330 self.assertEqual(
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003331 0, git_cl.main(['presubmit', '-v', '-v', '--all', '--parallel', '-u',
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003332 '--resultdb', '--realm', 'chromium:public']))
Edward Lemur9468eba2020-02-27 19:07:22 +00003333 git_cl.Changelist.RunHook.assert_called_once_with(
3334 committing=False,
3335 may_prompt=False,
3336 verbose=2,
3337 parallel=True,
3338 upstream='upstream',
3339 description='fetch description',
Saagar Sanghavi9949ab72020-07-20 20:56:40 +00003340 all_files=True,
Saagar Sanghavi03b15132020-08-10 16:43:41 +00003341 resultdb=True,
3342 realm='chromium:public')
Edward Lemur9468eba2020-02-27 19:07:22 +00003343
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003344class CMDTryResultsTestCase(CMDTestCaseBase):
3345 _DEFAULT_REQUEST = {
3346 'predicate': {
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003347 "gerritChanges": [{
3348 "project": "depot_tools",
3349 "host": "chromium-review.googlesource.com",
Gavin Make61ccc52020-11-13 00:12:57 +00003350 "patchset": 6,
3351 "change": 123456,
3352 }],
3353 },
3354 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
3355 ',builds.*.createTime,builds.*.tags'),
3356 }
3357
3358 _TRIVIAL_REQUEST = {
3359 'predicate': {
3360 "gerritChanges": [{
3361 "project": "depot_tools",
3362 "host": "chromium-review.googlesource.com",
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003363 "patchset": 7,
3364 "change": 123456,
3365 }],
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003366 },
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003367 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
3368 ',builds.*.createTime,builds.*.tags'),
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003369 }
3370
3371 def testNoJobs(self):
3372 git_cl._call_buildbucket.return_value = {}
3373
3374 self.assertEqual(0, git_cl.main(['try-results']))
3375 self.assertEqual('No tryjobs scheduled.\n', sys.stdout.getvalue())
3376 git_cl._call_buildbucket.assert_called_once_with(
3377 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3378 self._DEFAULT_REQUEST)
3379
Gavin Make61ccc52020-11-13 00:12:57 +00003380 def testTrivialCommits(self):
3381 self.assertEqual(0, git_cl.main(['try-results']))
3382 git_cl._call_buildbucket.assert_called_with(
3383 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3384 self._DEFAULT_REQUEST)
3385
3386 git_cl._call_buildbucket.return_value = {}
3387 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '7']))
3388 git_cl._call_buildbucket.assert_called_with(
3389 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3390 self._TRIVIAL_REQUEST)
3391 self.assertEqual([
3392 'Successes:',
3393 ' bot_success https://ci.chromium.org/b/103',
3394 'Infra Failures:',
3395 ' bot_infra_failure https://ci.chromium.org/b/105',
3396 'Failures:',
3397 ' bot_failure https://ci.chromium.org/b/104',
3398 'Canceled:',
3399 ' bot_canceled ',
3400 'Started:',
3401 ' bot_started https://ci.chromium.org/b/102',
3402 'Scheduled:',
3403 ' bot_scheduled id=101',
3404 'Other:',
3405 ' bot_status_unspecified id=100',
3406 'Total: 7 tryjobs',
3407 'No tryjobs scheduled.',
3408 ], sys.stdout.getvalue().splitlines())
3409
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003410 def testPrintToStdout(self):
3411 self.assertEqual(0, git_cl.main(['try-results']))
3412 self.assertEqual([
3413 'Successes:',
3414 ' bot_success https://ci.chromium.org/b/103',
3415 'Infra Failures:',
3416 ' bot_infra_failure https://ci.chromium.org/b/105',
3417 'Failures:',
3418 ' bot_failure https://ci.chromium.org/b/104',
3419 'Canceled:',
3420 ' bot_canceled ',
3421 'Started:',
3422 ' bot_started https://ci.chromium.org/b/102',
3423 'Scheduled:',
3424 ' bot_scheduled id=101',
3425 'Other:',
3426 ' bot_status_unspecified id=100',
3427 'Total: 7 tryjobs',
3428 ], sys.stdout.getvalue().splitlines())
3429 git_cl._call_buildbucket.assert_called_once_with(
3430 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3431 self._DEFAULT_REQUEST)
3432
3433 def testPrintToStdoutWithMasters(self):
3434 self.assertEqual(0, git_cl.main(['try-results', '--print-master']))
3435 self.assertEqual([
3436 'Successes:',
3437 ' try bot_success https://ci.chromium.org/b/103',
3438 'Infra Failures:',
3439 ' try bot_infra_failure https://ci.chromium.org/b/105',
3440 'Failures:',
3441 ' try bot_failure https://ci.chromium.org/b/104',
3442 'Canceled:',
3443 ' try bot_canceled ',
3444 'Started:',
3445 ' try bot_started https://ci.chromium.org/b/102',
3446 'Scheduled:',
3447 ' try bot_scheduled id=101',
3448 'Other:',
3449 ' try bot_status_unspecified id=100',
3450 'Total: 7 tryjobs',
3451 ], sys.stdout.getvalue().splitlines())
3452 git_cl._call_buildbucket.assert_called_once_with(
3453 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3454 self._DEFAULT_REQUEST)
3455
3456 @mock.patch('git_cl.write_json')
3457 def testWriteToJson(self, mockJsonDump):
3458 self.assertEqual(0, git_cl.main(['try-results', '--json', 'file.json']))
3459 git_cl._call_buildbucket.assert_called_once_with(
3460 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
3461 self._DEFAULT_REQUEST)
3462 mockJsonDump.assert_called_once_with(
3463 'file.json', self._DEFAULT_RESPONSE['builds'])
3464
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003465 def test_filter_failed_for_one_simple(self):
Edward Lemur45768512020-03-02 19:03:14 +00003466 self.assertEqual([], git_cl._filter_failed_for_retry([]))
3467 self.assertEqual(
3468 [
3469 ('chromium', 'try', 'bot_failure'),
3470 ('chromium', 'try', 'bot_infra_failure'),
3471 ],
3472 git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds']))
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003473
3474 def test_filter_failed_for_retry_many_builds(self):
3475
3476 def _build(name, created_sec, status, experimental=False):
3477 assert 0 <= created_sec < 100, created_sec
3478 b = {
3479 'id': 112112,
3480 'builder': {
3481 'project': 'chromium',
3482 'bucket': 'try',
3483 'builder': name,
3484 },
3485 'createTime': '2019-10-09T08:00:%02d.854286Z' % created_sec,
3486 'status': status,
3487 'tags': [],
3488 }
3489 if experimental:
3490 b['tags'].append({'key': 'cq_experimental', 'value': 'true'})
3491 return b
3492
3493 builds = [
3494 _build('flaky-last-green', 1, 'FAILURE'),
3495 _build('flaky-last-green', 2, 'SUCCESS'),
3496 _build('flaky', 1, 'SUCCESS'),
3497 _build('flaky', 2, 'FAILURE'),
3498 _build('running', 1, 'FAILED'),
3499 _build('running', 2, 'SCHEDULED'),
3500 _build('yep-still-running', 1, 'STARTED'),
3501 _build('yep-still-running', 2, 'FAILURE'),
3502 _build('cq-experimental', 1, 'SUCCESS', experimental=True),
3503 _build('cq-experimental', 2, 'FAILURE', experimental=True),
3504
3505 # Simulate experimental in CQ builder, which developer decided
3506 # to retry manually which resulted in 2nd build non-experimental.
3507 _build('sometimes-experimental', 1, 'FAILURE', experimental=True),
3508 _build('sometimes-experimental', 2, 'FAILURE', experimental=False),
3509 ]
3510 builds.sort(key=lambda b: b['status']) # ~deterministic shuffle.
Edward Lemur45768512020-03-02 19:03:14 +00003511 self.assertEqual(
3512 [
3513 ('chromium', 'try', 'flaky'),
3514 ('chromium', 'try', 'sometimes-experimental'),
3515 ],
3516 git_cl._filter_failed_for_retry(builds))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003517
3518
3519class CMDTryTestCase(CMDTestCaseBase):
3520
3521 @mock.patch('git_cl.Changelist.SetCQState')
Edward Lemur45768512020-03-02 19:03:14 +00003522 def testSetCQDryRunByDefault(self, mockSetCQState):
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003523 mockSetCQState.return_value = 0
Edward Lemur4c707a22019-09-24 21:13:43 +00003524 self.assertEqual(0, git_cl.main(['try']))
3525 git_cl.Changelist.SetCQState.assert_called_with(git_cl._CQState.DRY_RUN)
3526 self.assertEqual(
3527 sys.stdout.getvalue(),
3528 'Scheduling CQ dry run on: '
3529 'https://chromium-review.googlesource.com/123456\n')
3530
Edward Lemur4c707a22019-09-24 21:13:43 +00003531 @mock.patch('git_cl._call_buildbucket')
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003532 def testScheduleOnBuildbucket(self, mockCallBuildbucket):
Edward Lemur4c707a22019-09-24 21:13:43 +00003533 mockCallBuildbucket.return_value = {}
Edward Lemur4c707a22019-09-24 21:13:43 +00003534
3535 self.assertEqual(0, git_cl.main([
3536 'try', '-B', 'luci.chromium.try', '-b', 'win',
3537 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
3538 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003539 'Scheduling jobs on:\n'
3540 ' chromium/try: win',
Edward Lemur4c707a22019-09-24 21:13:43 +00003541 git_cl.sys.stdout.getvalue())
3542
3543 expected_request = {
3544 "requests": [{
3545 "scheduleBuild": {
3546 "requestId": "uuid4",
3547 "builder": {
3548 "project": "chromium",
3549 "builder": "win",
3550 "bucket": "try",
3551 },
3552 "gerritChanges": [{
3553 "project": "depot_tools",
3554 "host": "chromium-review.googlesource.com",
3555 "patchset": 7,
3556 "change": 123456,
3557 }],
3558 "properties": {
3559 "category": "git_cl_try",
3560 "json": [{"a": 1}, None],
3561 "key": "val",
3562 },
3563 "tags": [
3564 {"value": "win", "key": "builder"},
3565 {"value": "git_cl_try", "key": "user_agent"},
3566 ],
3567 },
3568 }],
3569 }
3570 mockCallBuildbucket.assert_called_with(
3571 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3572
Anthony Polito1a5fe232020-01-24 23:17:52 +00003573 @mock.patch('git_cl._call_buildbucket')
3574 def testScheduleOnBuildbucketWithRevision(self, mockCallBuildbucket):
3575 mockCallBuildbucket.return_value = {}
Josip Sokcevic9011a5b2021-02-12 18:59:44 +00003576 mock.patch('git_cl.Changelist.GetRemoteBranch',
3577 return_value=('origin', 'refs/remotes/origin/main')).start()
Anthony Polito1a5fe232020-01-24 23:17:52 +00003578
3579 self.assertEqual(0, git_cl.main([
3580 'try', '-B', 'luci.chromium.try', '-b', 'win', '-b', 'linux',
3581 '-p', 'key=val', '-p', 'json=[{"a":1}, null]',
3582 '-r', 'beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef']))
3583 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003584 'Scheduling jobs on:\n'
3585 ' chromium/try: linux\n'
3586 ' chromium/try: win',
Anthony Polito1a5fe232020-01-24 23:17:52 +00003587 git_cl.sys.stdout.getvalue())
3588
3589 expected_request = {
3590 "requests": [{
3591 "scheduleBuild": {
3592 "requestId": "uuid4",
3593 "builder": {
3594 "project": "chromium",
3595 "builder": "linux",
3596 "bucket": "try",
3597 },
3598 "gerritChanges": [{
3599 "project": "depot_tools",
3600 "host": "chromium-review.googlesource.com",
3601 "patchset": 7,
3602 "change": 123456,
3603 }],
3604 "properties": {
3605 "category": "git_cl_try",
3606 "json": [{"a": 1}, None],
3607 "key": "val",
3608 },
3609 "tags": [
3610 {"value": "linux", "key": "builder"},
3611 {"value": "git_cl_try", "key": "user_agent"},
3612 ],
3613 "gitilesCommit": {
3614 "host": "chromium-review.googlesource.com",
3615 "project": "depot_tools",
3616 "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
Josip Sokcevic9011a5b2021-02-12 18:59:44 +00003617 "ref": "refs/heads/main",
Anthony Polito1a5fe232020-01-24 23:17:52 +00003618 }
3619 },
3620 },
3621 {
3622 "scheduleBuild": {
3623 "requestId": "uuid4",
3624 "builder": {
3625 "project": "chromium",
3626 "builder": "win",
3627 "bucket": "try",
3628 },
3629 "gerritChanges": [{
3630 "project": "depot_tools",
3631 "host": "chromium-review.googlesource.com",
3632 "patchset": 7,
3633 "change": 123456,
3634 }],
3635 "properties": {
3636 "category": "git_cl_try",
3637 "json": [{"a": 1}, None],
3638 "key": "val",
3639 },
3640 "tags": [
3641 {"value": "win", "key": "builder"},
3642 {"value": "git_cl_try", "key": "user_agent"},
3643 ],
3644 "gitilesCommit": {
3645 "host": "chromium-review.googlesource.com",
3646 "project": "depot_tools",
3647 "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
Josip Sokcevic9011a5b2021-02-12 18:59:44 +00003648 "ref": "refs/heads/main",
Anthony Polito1a5fe232020-01-24 23:17:52 +00003649 }
3650 },
3651 }],
3652 }
3653 mockCallBuildbucket.assert_called_with(
3654 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3655
Edward Lemur45768512020-03-02 19:03:14 +00003656 @mock.patch('sys.stderr', StringIO())
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003657 def testScheduleOnBuildbucket_WrongBucket(self):
Edward Lemur45768512020-03-02 19:03:14 +00003658 with self.assertRaises(SystemExit):
3659 git_cl.main([
3660 'try', '-B', 'not-a-bucket', '-b', 'win',
3661 '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])
Edward Lemur4c707a22019-09-24 21:13:43 +00003662 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003663 'Invalid bucket: not-a-bucket.',
3664 sys.stderr.getvalue())
Edward Lemur4c707a22019-09-24 21:13:43 +00003665
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003666 @mock.patch('git_cl._call_buildbucket')
Quinten Yearsley777660f2020-03-04 23:37:06 +00003667 @mock.patch('git_cl._fetch_tryjobs')
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003668 def testScheduleOnBuildbucketRetryFailed(
3669 self, mockFetchTryJobs, mockCallBuildbucket):
Quinten Yearsley777660f2020-03-04 23:37:06 +00003670 git_cl._fetch_tryjobs.side_effect = lambda *_, **kw: {
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003671 7: [],
3672 6: [{
3673 'id': 112112,
3674 'builder': {
3675 'project': 'chromium',
3676 'bucket': 'try',
Quinten Yearsley777660f2020-03-04 23:37:06 +00003677 'builder': 'linux', },
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003678 'createTime': '2019-10-09T08:00:01.854286Z',
3679 'tags': [],
Quinten Yearsley777660f2020-03-04 23:37:06 +00003680 'status': 'FAILURE', }], }[kw['patchset']]
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003681 mockCallBuildbucket.return_value = {}
3682
3683 self.assertEqual(0, git_cl.main(['try', '--retry-failed']))
3684 self.assertIn(
Edward Lemur45768512020-03-02 19:03:14 +00003685 'Scheduling jobs on:\n'
3686 ' chromium/try: linux',
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003687 git_cl.sys.stdout.getvalue())
3688
3689 expected_request = {
3690 "requests": [{
3691 "scheduleBuild": {
3692 "requestId": "uuid4",
3693 "builder": {
3694 "project": "chromium",
3695 "bucket": "try",
3696 "builder": "linux",
3697 },
3698 "gerritChanges": [{
3699 "project": "depot_tools",
3700 "host": "chromium-review.googlesource.com",
3701 "patchset": 7,
3702 "change": 123456,
3703 }],
3704 "properties": {
3705 "category": "git_cl_try",
3706 },
3707 "tags": [
3708 {"value": "linux", "key": "builder"},
3709 {"value": "git_cl_try", "key": "user_agent"},
3710 {"value": "1", "key": "retry_failed"},
3711 ],
3712 },
3713 }],
3714 }
3715 mockCallBuildbucket.assert_called_with(
3716 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3717
Edward Lemur4c707a22019-09-24 21:13:43 +00003718 def test_parse_bucket(self):
3719 test_cases = [
3720 {
3721 'bucket': 'chromium/try',
3722 'result': ('chromium', 'try'),
3723 },
3724 {
3725 'bucket': 'luci.chromium.try',
3726 'result': ('chromium', 'try'),
3727 'has_warning': True,
3728 },
3729 {
3730 'bucket': 'skia.primary',
3731 'result': ('skia', 'skia.primary'),
3732 'has_warning': True,
3733 },
3734 {
3735 'bucket': 'not-a-bucket',
3736 'result': (None, None),
3737 },
3738 ]
3739
3740 for test_case in test_cases:
3741 git_cl.sys.stdout.truncate(0)
3742 self.assertEqual(
3743 test_case['result'], git_cl._parse_bucket(test_case['bucket']))
3744 if test_case.get('has_warning'):
Edward Lemur6215c792019-10-03 21:59:05 +00003745 expected_warning = 'WARNING Please use %s/%s to specify the bucket' % (
3746 test_case['result'])
3747 self.assertIn(expected_warning, git_cl.sys.stdout.getvalue())
Edward Lemur4c707a22019-09-24 21:13:43 +00003748
3749
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003750class CMDUploadTestCase(CMDTestCaseBase):
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003751
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003752 def setUp(self):
3753 super(CMDUploadTestCase, self).setUp()
Quinten Yearsley777660f2020-03-04 23:37:06 +00003754 mock.patch('git_cl._fetch_tryjobs').start()
3755 mock.patch('git_cl._trigger_tryjobs', return_value={}).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003756 mock.patch('git_cl.Changelist.CMDUpload', return_value=0).start()
Edward Lesmes0dd54822020-03-26 18:24:25 +00003757 mock.patch('git_cl.Settings.GetRoot', return_value='').start()
3758 mock.patch(
3759 'git_cl.Settings.GetSquashGerritUploads',
3760 return_value=True).start()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003761 self.addCleanup(mock.patch.stopall)
3762
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003763 def testWarmUpChangeDetailCache(self):
3764 self.assertEqual(0, git_cl.main(['upload']))
3765 gerrit_util.GetChangeDetail.assert_called_once_with(
3766 'chromium-review.googlesource.com', 'depot_tools~123456',
3767 frozenset([
3768 'LABELS', 'CURRENT_REVISION', 'DETAILED_ACCOUNTS',
3769 'CURRENT_COMMIT']))
3770
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003771 def testUploadRetryFailed(self):
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003772 # This test mocks out the actual upload part, and just asserts that after
3773 # upload, if --retry-failed is added, then the tool will fetch try jobs
3774 # from the previous patchset and trigger the right builders on the latest
3775 # patchset.
Quinten Yearsley777660f2020-03-04 23:37:06 +00003776 git_cl._fetch_tryjobs.side_effect = [
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003777 # Latest patchset: No builds.
3778 [],
3779 # Patchset before latest: Some builds.
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003780 [{
3781 'id': str(100 + idx),
3782 'builder': {
3783 'project': 'chromium',
3784 'bucket': 'try',
3785 'builder': 'bot_' + status.lower(),
3786 },
3787 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
3788 'tags': [],
3789 'status': status,
3790 } for idx, status in enumerate(self._STATUSES)],
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00003791 ]
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003792
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003793 self.assertEqual(0, git_cl.main(['upload', '--retry-failed']))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003794 self.assertEqual([
Edward Lemur5b929a42019-10-21 17:57:39 +00003795 mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
3796 mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
Quinten Yearsley777660f2020-03-04 23:37:06 +00003797 ], git_cl._fetch_tryjobs.mock_calls)
Edward Lemur45768512020-03-02 19:03:14 +00003798 expected_buckets = [
3799 ('chromium', 'try', 'bot_failure'),
3800 ('chromium', 'try', 'bot_infra_failure'),
3801 ]
Quinten Yearsley777660f2020-03-04 23:37:06 +00003802 git_cl._trigger_tryjobs.assert_called_once_with(mock.ANY, expected_buckets,
3803 mock.ANY, 8)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003804
Brian Sheedy59b06a82019-10-14 17:03:29 +00003805
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003806class MakeRequestsHelperTestCase(unittest.TestCase):
3807
3808 def exampleGerritChange(self):
3809 return {
3810 'host': 'chromium-review.googlesource.com',
3811 'project': 'depot_tools',
3812 'change': 1,
3813 'patchset': 2,
3814 }
3815
3816 def testMakeRequestsHelperNoOptions(self):
3817 # Basic test for the helper function _make_tryjob_schedule_requests;
3818 # it shouldn't throw AttributeError even when options doesn't have any
3819 # of the expected values; it will use default option values.
3820 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3821 jobs = [('chromium', 'try', 'my-builder')]
3822 options = optparse.Values()
3823 requests = git_cl._make_tryjob_schedule_requests(
3824 changelist, jobs, options, patchset=None)
3825
3826 # requestId is non-deterministic. Just assert that it's there and has
3827 # a particular length.
3828 self.assertEqual(len(requests[0]['scheduleBuild'].pop('requestId')), 36)
3829 self.assertEqual(requests, [{
3830 'scheduleBuild': {
3831 'builder': {
3832 'bucket': 'try',
3833 'builder': 'my-builder',
3834 'project': 'chromium'
3835 },
3836 'gerritChanges': [self.exampleGerritChange()],
3837 'properties': {
3838 'category': 'git_cl_try'
3839 },
3840 'tags': [{
3841 'key': 'builder',
3842 'value': 'my-builder'
3843 }, {
3844 'key': 'user_agent',
3845 'value': 'git_cl_try'
3846 }]
3847 }
3848 }])
3849
3850 def testMakeRequestsHelperPresubmitSetsDryRunProperty(self):
3851 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3852 jobs = [('chromium', 'try', 'presubmit')]
3853 options = optparse.Values()
3854 requests = git_cl._make_tryjob_schedule_requests(
3855 changelist, jobs, options, patchset=None)
3856 self.assertEqual(requests[0]['scheduleBuild']['properties'], {
3857 'category': 'git_cl_try',
3858 'dry_run': 'true'
3859 })
3860
3861 def testMakeRequestsHelperRevisionSet(self):
3862 # Gitiles commit is specified when revision is in options.
3863 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3864 jobs = [('chromium', 'try', 'my-builder')]
3865 options = optparse.Values({'revision': 'ba5eba11'})
3866 requests = git_cl._make_tryjob_schedule_requests(
3867 changelist, jobs, options, patchset=None)
3868 self.assertEqual(
3869 requests[0]['scheduleBuild']['gitilesCommit'], {
3870 'host': 'chromium-review.googlesource.com',
3871 'id': 'ba5eba11',
Josip Sokcevic9011a5b2021-02-12 18:59:44 +00003872 'project': 'depot_tools',
3873 'ref': 'refs/heads/main',
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003874 })
3875
3876 def testMakeRequestsHelperRetryFailedSet(self):
3877 # An extra tag is added when retry_failed is in options.
3878 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3879 jobs = [('chromium', 'try', 'my-builder')]
3880 options = optparse.Values({'retry_failed': 'true'})
3881 requests = git_cl._make_tryjob_schedule_requests(
3882 changelist, jobs, options, patchset=None)
3883 self.assertEqual(
3884 requests[0]['scheduleBuild']['tags'], [
3885 {
3886 'key': 'builder',
3887 'value': 'my-builder'
3888 },
3889 {
3890 'key': 'user_agent',
3891 'value': 'git_cl_try'
3892 },
3893 {
3894 'key': 'retry_failed',
3895 'value': '1'
3896 }
3897 ])
3898
3899 def testMakeRequestsHelperCategorySet(self):
Quinten Yearsley925cedb2020-04-13 17:49:39 +00003900 # The category property can be overridden with options.
Quinten Yearsleyee8be8a2020-03-05 21:48:32 +00003901 changelist = ChangelistMock(gerrit_change=self.exampleGerritChange())
3902 jobs = [('chromium', 'try', 'my-builder')]
3903 options = optparse.Values({'category': 'my-special-category'})
3904 requests = git_cl._make_tryjob_schedule_requests(
3905 changelist, jobs, options, patchset=None)
3906 self.assertEqual(requests[0]['scheduleBuild']['properties'],
3907 {'category': 'my-special-category'})
3908
3909
Edward Lemurda4b6c62020-02-13 00:28:40 +00003910class CMDFormatTestCase(unittest.TestCase):
Brian Sheedy59b06a82019-10-14 17:03:29 +00003911
3912 def setUp(self):
3913 super(CMDFormatTestCase, self).setUp()
Jamie Madill5e96ad12020-01-13 16:08:35 +00003914 mock.patch('git_cl.RunCommand').start()
3915 mock.patch('clang_format.FindClangFormatToolInChromiumTree').start()
3916 mock.patch('clang_format.FindClangFormatScriptInChromiumTree').start()
3917 mock.patch('git_cl.settings').start()
Brian Sheedy59b06a82019-10-14 17:03:29 +00003918 self._top_dir = tempfile.mkdtemp()
Jamie Madill5e96ad12020-01-13 16:08:35 +00003919 self.addCleanup(mock.patch.stopall)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003920
3921 def tearDown(self):
3922 shutil.rmtree(self._top_dir)
3923 super(CMDFormatTestCase, self).tearDown()
3924
Jamie Madill5e96ad12020-01-13 16:08:35 +00003925 def _make_temp_file(self, fname, contents):
3926 with open(os.path.join(self._top_dir, fname), 'w') as tf:
3927 tf.write('\n'.join(contents))
3928
Brian Sheedy59b06a82019-10-14 17:03:29 +00003929 def _make_yapfignore(self, contents):
Jamie Madill5e96ad12020-01-13 16:08:35 +00003930 self._make_temp_file('.yapfignore', contents)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003931
Brian Sheedyb4307d52019-12-02 19:18:17 +00003932 def _check_yapf_filtering(self, files, expected):
3933 self.assertEqual(expected, git_cl._FilterYapfIgnoredFiles(
3934 files, git_cl._GetYapfIgnorePatterns(self._top_dir)))
Brian Sheedy59b06a82019-10-14 17:03:29 +00003935
Edward Lemur1a83da12020-03-04 21:18:36 +00003936 def _run_command_mock(self, return_value):
3937 def f(*args, **kwargs):
3938 if 'stdin' in kwargs:
3939 self.assertIsInstance(kwargs['stdin'], bytes)
3940 return return_value
3941 return f
3942
Jamie Madill5e96ad12020-01-13 16:08:35 +00003943 def testClangFormatDiffFull(self):
3944 self._make_temp_file('test.cc', ['// test'])
3945 git_cl.settings.GetFormatFullByDefault.return_value = False
3946 diff_file = [os.path.join(self._top_dir, 'test.cc')]
3947 mock_opts = mock.Mock(full=True, dry_run=True, diff=False)
3948
3949 # Diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003950 git_cl.RunCommand.side_effect = self._run_command_mock(' // test')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003951 return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
3952 self._top_dir, 'HEAD')
3953 self.assertEqual(2, return_value)
3954
3955 # No diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003956 git_cl.RunCommand.side_effect = self._run_command_mock('// test')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003957 return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
3958 self._top_dir, 'HEAD')
3959 self.assertEqual(0, return_value)
3960
3961 def testClangFormatDiff(self):
3962 git_cl.settings.GetFormatFullByDefault.return_value = False
Josip Sokcevic464e9ff2020-03-18 23:48:55 +00003963 # A valid file is required, so use this test.
3964 clang_format.FindClangFormatToolInChromiumTree.return_value = __file__
Jamie Madill5e96ad12020-01-13 16:08:35 +00003965 mock_opts = mock.Mock(full=False, dry_run=True, diff=False)
3966
3967 # Diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003968 git_cl.RunCommand.side_effect = self._run_command_mock('error')
3969 return_value = git_cl._RunClangFormatDiff(
3970 mock_opts, ['.'], self._top_dir, 'HEAD')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003971 self.assertEqual(2, return_value)
3972
3973 # No diff
Edward Lemur1a83da12020-03-04 21:18:36 +00003974 git_cl.RunCommand.side_effect = self._run_command_mock('')
Jamie Madill5e96ad12020-01-13 16:08:35 +00003975 return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir,
3976 'HEAD')
3977 self.assertEqual(0, return_value)
3978
Brian Sheedyb4307d52019-12-02 19:18:17 +00003979 def testYapfignoreExplicit(self):
3980 self._make_yapfignore(['foo/bar.py', 'foo/bar/baz.py'])
3981 files = [
3982 'bar.py',
3983 'foo/bar.py',
3984 'foo/baz.py',
3985 'foo/bar/baz.py',
3986 'foo/bar/foobar.py',
3987 ]
3988 expected = [
3989 'bar.py',
3990 'foo/baz.py',
3991 'foo/bar/foobar.py',
3992 ]
3993 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003994
Brian Sheedyb4307d52019-12-02 19:18:17 +00003995 def testYapfignoreSingleWildcards(self):
3996 self._make_yapfignore(['*bar.py', 'foo*', 'baz*.py'])
3997 files = [
3998 'bar.py', # Matched by *bar.py.
3999 'bar.txt',
4000 'foobar.py', # Matched by *bar.py, foo*.
4001 'foobar.txt', # Matched by foo*.
4002 'bazbar.py', # Matched by *bar.py, baz*.py.
4003 'bazbar.txt',
4004 'foo/baz.txt', # Matched by foo*.
4005 'bar/bar.py', # Matched by *bar.py.
4006 'baz/foo.py', # Matched by baz*.py, foo*.
4007 'baz/foo.txt',
4008 ]
4009 expected = [
4010 'bar.txt',
4011 'bazbar.txt',
4012 'baz/foo.txt',
4013 ]
4014 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004015
Brian Sheedyb4307d52019-12-02 19:18:17 +00004016 def testYapfignoreMultiplewildcards(self):
4017 self._make_yapfignore(['*bar*', '*foo*baz.txt'])
4018 files = [
4019 'bar.py', # Matched by *bar*.
4020 'bar.txt', # Matched by *bar*.
4021 'abar.py', # Matched by *bar*.
4022 'foobaz.txt', # Matched by *foo*baz.txt.
4023 'foobaz.py',
4024 'afoobaz.txt', # Matched by *foo*baz.txt.
4025 ]
4026 expected = [
4027 'foobaz.py',
4028 ]
4029 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004030
4031 def testYapfignoreComments(self):
4032 self._make_yapfignore(['test.py', '#test2.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00004033 files = [
4034 'test.py',
4035 'test2.py',
4036 ]
4037 expected = [
4038 'test2.py',
4039 ]
4040 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004041
4042 def testYapfignoreBlankLines(self):
4043 self._make_yapfignore(['test.py', '', '', 'test2.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00004044 files = [
4045 'test.py',
4046 'test2.py',
4047 'test3.py',
4048 ]
4049 expected = [
4050 'test3.py',
4051 ]
4052 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004053
4054 def testYapfignoreWhitespace(self):
4055 self._make_yapfignore([' test.py '])
Brian Sheedyb4307d52019-12-02 19:18:17 +00004056 files = [
4057 'test.py',
4058 'test2.py',
4059 ]
4060 expected = [
4061 'test2.py',
4062 ]
4063 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004064
Brian Sheedyb4307d52019-12-02 19:18:17 +00004065 def testYapfignoreNoFiles(self):
Brian Sheedy59b06a82019-10-14 17:03:29 +00004066 self._make_yapfignore(['test.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00004067 self._check_yapf_filtering([], [])
4068
4069 def testYapfignoreMissingYapfignore(self):
4070 files = [
4071 'test.py',
4072 ]
4073 expected = [
4074 'test.py',
4075 ]
4076 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00004077
4078
Sigurd Schneider9abde8c2020-11-17 08:44:52 +00004079class CMDStatusTestCase(CMDTestCaseBase):
4080 # Return branch names a,..,f with comitterdates in increasing order, i.e.
4081 # 'f' is the most-recently changed branch.
4082 def _mock_run_git(commands):
4083 if commands == [
4084 'for-each-ref', '--format=%(refname) %(committerdate:unix)',
4085 'refs/heads'
4086 ]:
4087 branches_and_committerdates = [
4088 'refs/heads/a 1',
4089 'refs/heads/b 2',
4090 'refs/heads/c 3',
4091 'refs/heads/d 4',
4092 'refs/heads/e 5',
4093 'refs/heads/f 6',
4094 ]
4095 return '\n'.join(branches_and_committerdates)
4096
4097 # Mock the status in such a way that the issue number gives us an
4098 # indication of the commit date (simplifies manual debugging).
4099 def _mock_get_cl_statuses(branches, fine_grained, max_processes):
4100 for c in branches:
4101 c.issue = (100 + int(c.GetCommitDate()))
4102 yield (c, 'open')
4103
4104 @mock.patch('git_cl.Changelist.EnsureAuthenticated')
4105 @mock.patch('git_cl.Changelist.FetchDescription', lambda cl, pretty: 'x')
4106 @mock.patch('git_cl.Changelist.GetIssue', lambda cl: cl.issue)
4107 @mock.patch('git_cl.RunGit', _mock_run_git)
4108 @mock.patch('git_cl.get_cl_statuses', _mock_get_cl_statuses)
4109 @mock.patch('git_cl.Settings.GetRoot', return_value='')
4110 @mock.patch('scm.GIT.GetBranch', return_value='a')
4111 def testStatus(self, *_mocks):
4112 self.assertEqual(0, git_cl.main(['status', '--no-branch-color']))
4113 self.maxDiff = None
4114 self.assertEqual(
4115 sys.stdout.getvalue(), 'Branches associated with reviews:\n'
4116 ' * a : https://crrev.com/c/101 (open)\n'
4117 ' b : https://crrev.com/c/102 (open)\n'
4118 ' c : https://crrev.com/c/103 (open)\n'
4119 ' d : https://crrev.com/c/104 (open)\n'
4120 ' e : https://crrev.com/c/105 (open)\n'
4121 ' f : https://crrev.com/c/106 (open)\n\n'
4122 'Current branch: a\n'
4123 'Issue number: 101 (https://chromium-review.googlesource.com/101)\n'
4124 'Issue description:\n'
4125 'x\n')
4126
4127 @mock.patch('git_cl.Changelist.EnsureAuthenticated')
4128 @mock.patch('git_cl.Changelist.FetchDescription', lambda cl, pretty: 'x')
4129 @mock.patch('git_cl.Changelist.GetIssue', lambda cl: cl.issue)
4130 @mock.patch('git_cl.RunGit', _mock_run_git)
4131 @mock.patch('git_cl.get_cl_statuses', _mock_get_cl_statuses)
4132 @mock.patch('git_cl.Settings.GetRoot', return_value='')
4133 @mock.patch('scm.GIT.GetBranch', return_value='a')
4134 def testStatusByDate(self, *_mocks):
4135 self.assertEqual(
4136 0, git_cl.main(['status', '--no-branch-color', '--date-order']))
4137 self.maxDiff = None
4138 self.assertEqual(
4139 sys.stdout.getvalue(), 'Branches associated with reviews:\n'
4140 ' f : https://crrev.com/c/106 (open)\n'
4141 ' e : https://crrev.com/c/105 (open)\n'
4142 ' d : https://crrev.com/c/104 (open)\n'
4143 ' c : https://crrev.com/c/103 (open)\n'
4144 ' b : https://crrev.com/c/102 (open)\n'
4145 ' * a : https://crrev.com/c/101 (open)\n\n'
4146 'Current branch: a\n'
4147 'Issue number: 101 (https://chromium-review.googlesource.com/101)\n'
4148 'Issue description:\n'
4149 'x\n')
4150
4151
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004152class CMDOwnersTestCase(CMDTestCaseBase):
4153 def setUp(self):
4154 super(CMDOwnersTestCase, self).setUp()
Edward Lesmes82b992a2021-01-11 23:24:55 +00004155 self.owners_by_path = {
4156 'foo': ['a@example.com'],
4157 'bar': ['b@example.com', 'c@example.com'],
4158 }
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004159 mock.patch('git_cl.Settings.GetRoot', return_value='root').start()
4160 mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start()
4161 mock.patch(
Edward Lesmes82b992a2021-01-11 23:24:55 +00004162 'git_cl.Changelist.GetAffectedFiles',
4163 return_value=list(self.owners_by_path)).start()
4164 mock.patch(
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004165 'git_cl.Changelist.GetCommonAncestorWithUpstream',
4166 return_value='upstream').start()
Edward Lesmes82b992a2021-01-11 23:24:55 +00004167 mock.patch(
Edward Lesmese1576912021-02-16 21:53:34 +00004168 'git_cl.Changelist.GetGerritHost',
4169 return_value='host').start()
4170 mock.patch(
4171 'git_cl.Changelist.GetGerritProject',
4172 return_value='project').start()
4173 mock.patch(
4174 'git_cl.Changelist.GetRemoteBranch',
4175 return_value=('origin', 'refs/remotes/origin/main')).start()
4176 mock.patch(
4177 'owners_client.OwnersClient.BatchListOwners',
Edward Lesmes82b992a2021-01-11 23:24:55 +00004178 return_value=self.owners_by_path).start()
Edward Lesmes8170c292021-03-19 20:04:43 +00004179 mock.patch(
4180 'gerrit_util.IsCodeOwnersEnabledOnHost', return_value=True).start()
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004181 self.addCleanup(mock.patch.stopall)
4182
4183 def testShowAllNoArgs(self):
4184 self.assertEqual(0, git_cl.main(['owners', '--show-all']))
4185 self.assertEqual(
4186 'No files specified for --show-all. Nothing to do.\n',
4187 git_cl.sys.stdout.getvalue())
4188
4189 def testShowAll(self):
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004190 self.assertEqual(
4191 0,
4192 git_cl.main(['owners', '--show-all', 'foo', 'bar', 'baz']))
Edward Lesmese1576912021-02-16 21:53:34 +00004193 owners_client.OwnersClient.BatchListOwners.assert_called_once_with(
Edward Lesmes82b992a2021-01-11 23:24:55 +00004194 ['foo', 'bar', 'baz'])
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004195 self.assertEqual(
4196 '\n'.join([
4197 'Owners for foo:',
4198 ' - a@example.com',
4199 'Owners for bar:',
4200 ' - b@example.com',
4201 ' - c@example.com',
4202 'Owners for baz:',
4203 ' - No owners found',
4204 '',
4205 ]),
4206 sys.stdout.getvalue())
4207
Edward Lesmes82b992a2021-01-11 23:24:55 +00004208 def testBatch(self):
4209 self.assertEqual(0, git_cl.main(['owners', '--batch']))
4210 self.assertIn('a@example.com', sys.stdout.getvalue())
4211 self.assertIn('b@example.com', sys.stdout.getvalue())
4212
Edward Lesmes0e4e5ae2021-01-08 18:28:46 +00004213
maruel@chromium.orgddd59412011-11-30 14:20:38 +00004214if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01004215 logging.basicConfig(
4216 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00004217 unittest.main()