Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1 | #!/usr/bin/env vpython3 |
| 2 | # coding=utf-8 |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 3 | # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 4 | # 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 Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 9 | from __future__ import print_function |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 10 | from __future__ import unicode_literals |
| 11 | |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 12 | import datetime |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 13 | import json |
Andrii Shyshkalov | 18df0cd | 2017-01-25 15:22:20 +0100 | [diff] [blame] | 14 | import logging |
Edward Lemur | 61bf417 | 2020-02-24 23:22:37 +0000 | [diff] [blame] | 15 | import multiprocessing |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 16 | import os |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 17 | import pprint |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 18 | import shutil |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 19 | import sys |
Aaron Gable | 9a03ae0 | 2017-11-03 11:31:07 -0700 | [diff] [blame] | 20 | import tempfile |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 21 | import unittest |
| 22 | |
Edward Lemur | a814502 | 2020-01-06 18:47:54 +0000 | [diff] [blame] | 23 | if sys.version_info.major == 2: |
| 24 | from StringIO import StringIO |
| 25 | import mock |
| 26 | else: |
| 27 | from io import StringIO |
| 28 | from unittest import mock |
| 29 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 30 | sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) |
| 31 | |
Edward Lemur | 5ba1e9c | 2018-07-23 18:19:02 +0000 | [diff] [blame] | 32 | import metrics |
| 33 | # We have to disable monitoring before importing git_cl. |
| 34 | metrics.DISABLE_METRICS_COLLECTION = True |
| 35 | |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 36 | import clang_format |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 37 | import contextlib |
Edward Lemur | 1773f37 | 2020-02-22 00:27:14 +0000 | [diff] [blame] | 38 | import gclient_utils |
Eric Boren | 2fb6310 | 2018-10-05 13:05:03 +0000 | [diff] [blame] | 39 | import gerrit_util |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 40 | import git_cl |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 41 | import git_common |
tandrii@chromium.org | 57d8654 | 2016-03-04 16:11:32 +0000 | [diff] [blame] | 42 | import git_footers |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 43 | import git_new_branch |
| 44 | import scm |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 45 | import subprocess2 |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 46 | |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 47 | |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 48 | def callError(code=1, cmd='', cwd='', stdout=b'', stderr=b''): |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 49 | return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr) |
| 50 | |
| 51 | |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 52 | def _constantFn(return_value): |
| 53 | def f(*args, **kwargs): |
| 54 | return return_value |
| 55 | return f |
| 56 | |
| 57 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 58 | CERR1 = callError(1) |
| 59 | |
| 60 | |
Edward Lemur | 1773f37 | 2020-02-22 00:27:14 +0000 | [diff] [blame] | 61 | class TemporaryFileMock(object): |
| 62 | def __init__(self): |
| 63 | self.suffix = 0 |
Aaron Gable | 9a03ae0 | 2017-11-03 11:31:07 -0700 | [diff] [blame] | 64 | |
Edward Lemur | 1773f37 | 2020-02-22 00:27:14 +0000 | [diff] [blame] | 65 | @contextlib.contextmanager |
| 66 | def __call__(self): |
| 67 | self.suffix += 1 |
| 68 | yield '/tmp/fake-temp' + str(self.suffix) |
Aaron Gable | 9a03ae0 | 2017-11-03 11:31:07 -0700 | [diff] [blame] | 69 | |
| 70 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 71 | class ChangelistMock(object): |
| 72 | # A class variable so we can access it when we don't have access to the |
| 73 | # instance that's being set. |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 74 | desc = '' |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 75 | def __init__(self, **kwargs): |
| 76 | pass |
| 77 | def GetIssue(self): |
| 78 | return 1 |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 79 | def FetchDescription(self): |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 80 | return ChangelistMock.desc |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 81 | def UpdateDescription(self, desc, force=False): |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 82 | ChangelistMock.desc = desc |
| 83 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 84 | |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 85 | class GitMocks(object): |
| 86 | def __init__(self, config=None, branchref=None): |
| 87 | self.branchref = branchref or 'refs/heads/master' |
| 88 | self.config = config or {} |
| 89 | |
| 90 | def GetBranchRef(self, _root): |
| 91 | return self.branchref |
| 92 | |
| 93 | def NewBranch(self, branchref): |
| 94 | self.branchref = branchref |
| 95 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 96 | def GetConfig(self, root, key, default=None): |
| 97 | if root != '': |
| 98 | key = '%s:%s' % (root, key) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 99 | return self.config.get(key, default) |
| 100 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 101 | def SetConfig(self, root, key, value=None): |
| 102 | if root != '': |
| 103 | key = '%s:%s' % (root, key) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 104 | if value: |
| 105 | self.config[key] = value |
| 106 | return |
| 107 | if key not in self.config: |
| 108 | raise CERR1 |
| 109 | del self.config[key] |
| 110 | |
| 111 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 112 | class WatchlistsMock(object): |
| 113 | def __init__(self, _): |
| 114 | pass |
| 115 | @staticmethod |
| 116 | def GetWatchersForPaths(_): |
| 117 | return ['joe@example.com'] |
| 118 | |
| 119 | |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 120 | class CodereviewSettingsFileMock(object): |
| 121 | def __init__(self): |
| 122 | pass |
| 123 | # pylint: disable=no-self-use |
| 124 | def read(self): |
| 125 | return ('CODE_REVIEW_SERVER: gerrit.chromium.org\n' + |
| 126 | 'GERRIT_HOST: True\n') |
| 127 | |
| 128 | |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 129 | class AuthenticatorMock(object): |
| 130 | def __init__(self, *_args): |
| 131 | pass |
| 132 | def has_cached_credentials(self): |
| 133 | return True |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 134 | def authorize(self, http): |
| 135 | return http |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 136 | |
| 137 | |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 138 | def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False): |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 139 | """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies. |
| 140 | |
| 141 | Usage: |
| 142 | >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator", |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 143 | CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')}) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 144 | |
| 145 | OR |
| 146 | >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator", |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 147 | CookiesAuthenticatorMockFactory( |
| 148 | same_auth=('user', '', 'pass')) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 149 | """ |
| 150 | class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator): |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 151 | def __init__(self): # pylint: disable=super-init-not-called |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 152 | # Intentionally not calling super() because it reads actual cookie files. |
| 153 | pass |
| 154 | @classmethod |
| 155 | def get_gitcookies_path(cls): |
| 156 | return '~/.gitcookies' |
| 157 | @classmethod |
| 158 | def get_netrc_path(cls): |
| 159 | return '~/.netrc' |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 160 | def _get_auth_for_host(self, host): |
| 161 | if same_auth: |
| 162 | return same_auth |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 163 | return (hosts_with_creds or {}).get(host) |
| 164 | return CookiesAuthenticatorMock |
| 165 | |
Aaron Gable | 9a03ae0 | 2017-11-03 11:31:07 -0700 | [diff] [blame] | 166 | |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 167 | class MockChangelistWithBranchAndIssue(): |
| 168 | def __init__(self, branch, issue): |
| 169 | self.branch = branch |
| 170 | self.issue = issue |
| 171 | def GetBranch(self): |
| 172 | return self.branch |
| 173 | def GetIssue(self): |
| 174 | return self.issue |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 175 | |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 176 | |
| 177 | class SystemExitMock(Exception): |
| 178 | pass |
| 179 | |
| 180 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 181 | class TestGitClBasic(unittest.TestCase): |
Josip Sokcevic | 953278a | 2020-02-28 19:46:36 +0000 | [diff] [blame] | 182 | def setUp(self): |
| 183 | mock.patch('sys.exit', side_effect=SystemExitMock).start() |
| 184 | mock.patch('sys.stdout', StringIO()).start() |
| 185 | mock.patch('sys.stderr', StringIO()).start() |
| 186 | self.addCleanup(mock.patch.stopall) |
| 187 | |
| 188 | def test_die_with_error(self): |
| 189 | with self.assertRaises(SystemExitMock): |
| 190 | git_cl.DieWithError('foo', git_cl.ChangeDescription('lorem ipsum')) |
| 191 | self.assertEqual(sys.stderr.getvalue(), 'foo\n') |
| 192 | self.assertTrue('saving CL description' in sys.stdout.getvalue()) |
| 193 | self.assertTrue('Content of CL description' in sys.stdout.getvalue()) |
| 194 | self.assertTrue('lorem ipsum' in sys.stdout.getvalue()) |
| 195 | sys.exit.assert_called_once_with(1) |
| 196 | |
| 197 | def test_die_with_error_no_desc(self): |
| 198 | with self.assertRaises(SystemExitMock): |
| 199 | git_cl.DieWithError('foo') |
| 200 | self.assertEqual(sys.stderr.getvalue(), 'foo\n') |
| 201 | self.assertEqual(sys.stdout.getvalue(), '') |
| 202 | sys.exit.assert_called_once_with(1) |
| 203 | |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 204 | def test_fetch_description(self): |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 205 | cl = git_cl.Changelist(issue=1, codereview_host='host') |
Andrii Shyshkalov | 3186301 | 2017-02-08 11:35:12 +0100 | [diff] [blame] | 206 | cl.description = 'x' |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 207 | self.assertEqual(cl.FetchDescription(), 'x') |
Robert Iannucci | 09f1f3d | 2017-03-28 16:54:32 -0700 | [diff] [blame] | 208 | |
Edward Lemur | 61bf417 | 2020-02-24 23:22:37 +0000 | [diff] [blame] | 209 | @mock.patch('git_cl.Changelist.EnsureAuthenticated') |
| 210 | @mock.patch('git_cl.Changelist.GetStatus', lambda cl: cl.status) |
| 211 | def test_get_cl_statuses(self, *_mocks): |
| 212 | statuses = [ |
| 213 | 'closed', 'commit', 'dry-run', 'lgtm', 'reply', 'unsent', 'waiting'] |
| 214 | changes = [] |
| 215 | for status in statuses: |
| 216 | cl = git_cl.Changelist() |
| 217 | cl.status = status |
| 218 | changes.append(cl) |
| 219 | |
| 220 | actual = set(git_cl.get_cl_statuses(changes, True)) |
| 221 | self.assertEqual(set(zip(changes, statuses)), actual) |
| 222 | |
| 223 | def test_get_cl_statuses_no_changes(self): |
| 224 | self.assertEqual([], list(git_cl.get_cl_statuses([], True))) |
| 225 | |
| 226 | @mock.patch('git_cl.Changelist.EnsureAuthenticated') |
| 227 | @mock.patch('multiprocessing.pool.ThreadPool') |
| 228 | def test_get_cl_statuses_timeout(self, *_mocks): |
| 229 | changes = [git_cl.Changelist() for _ in range(2)] |
| 230 | pool = multiprocessing.pool.ThreadPool() |
| 231 | it = pool.imap_unordered.return_value.__iter__ = mock.Mock() |
| 232 | it.return_value.next.side_effect = [ |
| 233 | (changes[0], 'lgtm'), |
| 234 | multiprocessing.TimeoutError, |
| 235 | ] |
| 236 | |
| 237 | actual = list(git_cl.get_cl_statuses(changes, True)) |
| 238 | self.assertEqual([(changes[0], 'lgtm'), (changes[1], 'error')], actual) |
| 239 | |
| 240 | @mock.patch('git_cl.Changelist.GetIssueURL') |
| 241 | def test_get_cl_statuses_not_finegrained(self, _mock): |
| 242 | changes = [git_cl.Changelist() for _ in range(2)] |
| 243 | urls = ['some-url', None] |
| 244 | git_cl.Changelist.GetIssueURL.side_effect = urls |
| 245 | |
| 246 | actual = set(git_cl.get_cl_statuses(changes, False)) |
| 247 | self.assertEqual( |
| 248 | set([(changes[0], 'waiting'), (changes[1], 'error')]), actual) |
| 249 | |
Andrii Shyshkalov | 71f0da3 | 2019-07-15 22:45:18 +0000 | [diff] [blame] | 250 | def test_set_preserve_tryjobs(self): |
| 251 | d = git_cl.ChangeDescription('Simple.') |
| 252 | d.set_preserve_tryjobs() |
| 253 | self.assertEqual(d.description.splitlines(), [ |
| 254 | 'Simple.', |
| 255 | '', |
| 256 | 'Cq-Do-Not-Cancel-Tryjobs: true', |
| 257 | ]) |
| 258 | before = d.description |
| 259 | d.set_preserve_tryjobs() |
| 260 | self.assertEqual(before, d.description) |
| 261 | |
| 262 | d = git_cl.ChangeDescription('\n'.join([ |
| 263 | 'One is enough', |
| 264 | '', |
| 265 | 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt', |
| 266 | 'Change-Id: Ideadbeef', |
| 267 | ])) |
| 268 | d.set_preserve_tryjobs() |
| 269 | self.assertEqual(d.description.splitlines(), [ |
| 270 | 'One is enough', |
| 271 | '', |
| 272 | 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt', |
| 273 | 'Change-Id: Ideadbeef', |
| 274 | 'Cq-Do-Not-Cancel-Tryjobs: true', |
| 275 | ]) |
| 276 | |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 277 | def test_get_bug_line_values(self): |
| 278 | f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs)) |
| 279 | self.assertEqual(f('', ''), []) |
| 280 | self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456']) |
| 281 | self.assertEqual(f('v8', '456'), ['v8:456']) |
| 282 | self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123']) |
| 283 | # Not nice, but not worth carying. |
| 284 | self.assertEqual(f('v8', 'chromium:123,456,v8:123'), |
| 285 | ['v8:456', 'chromium:123', 'v8:123']) |
| 286 | |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 287 | def _test_git_number(self, parent_msg, dest_ref, child_msg, |
| 288 | parent_hash='parenthash'): |
| 289 | desc = git_cl.ChangeDescription(child_msg) |
| 290 | desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref) |
| 291 | return desc.description |
| 292 | |
| 293 | def assertEqualByLine(self, actual, expected): |
| 294 | self.assertEqual(actual.splitlines(), expected.splitlines()) |
| 295 | |
| 296 | def test_git_number_bad_parent(self): |
| 297 | with self.assertRaises(ValueError): |
| 298 | self._test_git_number('Parent', 'refs/heads/master', 'Child') |
| 299 | |
| 300 | def test_git_number_bad_parent_footer(self): |
| 301 | with self.assertRaises(AssertionError): |
| 302 | self._test_git_number( |
| 303 | 'Parent\n' |
| 304 | '\n' |
| 305 | 'Cr-Commit-Position: wrong', |
| 306 | 'refs/heads/master', 'Child') |
| 307 | |
| 308 | def test_git_number_bad_lineage_ignored(self): |
| 309 | actual = self._test_git_number( |
| 310 | 'Parent\n' |
| 311 | '\n' |
| 312 | 'Cr-Commit-Position: refs/heads/master@{#1}\n' |
| 313 | 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}', |
| 314 | 'refs/heads/master', 'Child') |
| 315 | self.assertEqualByLine( |
| 316 | actual, |
| 317 | 'Child\n' |
| 318 | '\n' |
| 319 | 'Cr-Commit-Position: refs/heads/master@{#2}\n' |
| 320 | 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}') |
| 321 | |
| 322 | def test_git_number_same_branch(self): |
| 323 | actual = self._test_git_number( |
| 324 | 'Parent\n' |
| 325 | '\n' |
| 326 | 'Cr-Commit-Position: refs/heads/master@{#12}', |
| 327 | dest_ref='refs/heads/master', |
| 328 | child_msg='Child') |
| 329 | self.assertEqualByLine( |
| 330 | actual, |
| 331 | 'Child\n' |
| 332 | '\n' |
| 333 | 'Cr-Commit-Position: refs/heads/master@{#13}') |
| 334 | |
Andrii Shyshkalov | de37c01 | 2017-07-06 21:06:50 +0200 | [diff] [blame] | 335 | def test_git_number_same_branch_mixed_footers(self): |
| 336 | actual = self._test_git_number( |
| 337 | 'Parent\n' |
| 338 | '\n' |
| 339 | 'Cr-Commit-Position: refs/heads/master@{#12}', |
| 340 | dest_ref='refs/heads/master', |
| 341 | child_msg='Child\n' |
| 342 | '\n' |
| 343 | 'Broken-by: design\n' |
| 344 | 'BUG=123') |
| 345 | self.assertEqualByLine( |
| 346 | actual, |
| 347 | 'Child\n' |
| 348 | '\n' |
| 349 | 'Broken-by: design\n' |
| 350 | 'BUG=123\n' |
| 351 | 'Cr-Commit-Position: refs/heads/master@{#13}') |
| 352 | |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 353 | def test_git_number_same_branch_with_originals(self): |
| 354 | actual = self._test_git_number( |
| 355 | 'Parent\n' |
| 356 | '\n' |
| 357 | 'Cr-Commit-Position: refs/heads/master@{#12}', |
| 358 | dest_ref='refs/heads/master', |
| 359 | child_msg='Child\n' |
| 360 | '\n' |
| 361 | 'Some users are smart and insert their own footers\n' |
| 362 | '\n' |
| 363 | 'Cr-Whatever: value\n' |
| 364 | 'Cr-Commit-Position: refs/copy/paste@{#22}') |
| 365 | self.assertEqualByLine( |
| 366 | actual, |
| 367 | 'Child\n' |
| 368 | '\n' |
| 369 | 'Some users are smart and insert their own footers\n' |
| 370 | '\n' |
| 371 | 'Cr-Original-Whatever: value\n' |
| 372 | 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n' |
| 373 | 'Cr-Commit-Position: refs/heads/master@{#13}') |
| 374 | |
| 375 | def test_git_number_new_branch(self): |
| 376 | actual = self._test_git_number( |
| 377 | 'Parent\n' |
| 378 | '\n' |
| 379 | 'Cr-Commit-Position: refs/heads/master@{#12}', |
| 380 | dest_ref='refs/heads/branch', |
| 381 | child_msg='Child') |
| 382 | self.assertEqualByLine( |
| 383 | actual, |
| 384 | 'Child\n' |
| 385 | '\n' |
| 386 | 'Cr-Commit-Position: refs/heads/branch@{#1}\n' |
| 387 | 'Cr-Branched-From: parenthash-refs/heads/master@{#12}') |
| 388 | |
| 389 | def test_git_number_lineage(self): |
| 390 | actual = self._test_git_number( |
| 391 | 'Parent\n' |
| 392 | '\n' |
| 393 | 'Cr-Commit-Position: refs/heads/branch@{#1}\n' |
| 394 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}', |
| 395 | dest_ref='refs/heads/branch', |
| 396 | child_msg='Child') |
| 397 | self.assertEqualByLine( |
| 398 | actual, |
| 399 | 'Child\n' |
| 400 | '\n' |
| 401 | 'Cr-Commit-Position: refs/heads/branch@{#2}\n' |
| 402 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}') |
| 403 | |
| 404 | def test_git_number_moooooooore_lineage(self): |
| 405 | actual = self._test_git_number( |
| 406 | 'Parent\n' |
| 407 | '\n' |
| 408 | 'Cr-Commit-Position: refs/heads/branch@{#5}\n' |
| 409 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}', |
| 410 | dest_ref='refs/heads/mooore', |
| 411 | child_msg='Child') |
| 412 | self.assertEqualByLine( |
| 413 | actual, |
| 414 | 'Child\n' |
| 415 | '\n' |
| 416 | 'Cr-Commit-Position: refs/heads/mooore@{#1}\n' |
| 417 | 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n' |
| 418 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}') |
| 419 | |
Andrii Shyshkalov | b5effa1 | 2016-12-14 19:35:12 +0100 | [diff] [blame] | 420 | def test_git_number_ever_moooooooore_lineage(self): |
Robert Iannucci | 456b0d6 | 2018-03-13 19:15:50 -0700 | [diff] [blame] | 421 | self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init |
Andrii Shyshkalov | b5effa1 | 2016-12-14 19:35:12 +0100 | [diff] [blame] | 422 | actual = self._test_git_number( |
| 423 | 'CQ commit on fresh new branch + numbering.\n' |
| 424 | '\n' |
| 425 | 'NOTRY=True\n' |
| 426 | 'NOPRESUBMIT=True\n' |
| 427 | 'BUG=\n' |
| 428 | '\n' |
| 429 | 'Review-Url: https://codereview.chromium.org/2577703003\n' |
| 430 | 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n' |
| 431 | 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n' |
| 432 | 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}', |
| 433 | dest_ref='refs/heads/gnumb-test/cl', |
| 434 | child_msg='git cl on fresh new branch + numbering.\n' |
| 435 | '\n' |
| 436 | 'Review-Url: https://codereview.chromium.org/2575043003 .\n') |
| 437 | self.assertEqualByLine( |
| 438 | actual, |
| 439 | 'git cl on fresh new branch + numbering.\n' |
| 440 | '\n' |
| 441 | 'Review-Url: https://codereview.chromium.org/2575043003 .\n' |
| 442 | 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n' |
| 443 | 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n' |
| 444 | 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n' |
| 445 | 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}') |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 446 | |
| 447 | def test_git_number_cherry_pick(self): |
| 448 | actual = self._test_git_number( |
| 449 | 'Parent\n' |
| 450 | '\n' |
| 451 | 'Cr-Commit-Position: refs/heads/branch@{#1}\n' |
| 452 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}', |
| 453 | dest_ref='refs/heads/branch', |
| 454 | child_msg='Child, which is cherry-pick from master\n' |
| 455 | '\n' |
| 456 | 'Cr-Commit-Position: refs/heads/master@{#100}\n' |
| 457 | '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)') |
| 458 | self.assertEqualByLine( |
| 459 | actual, |
| 460 | 'Child, which is cherry-pick from master\n' |
| 461 | '\n' |
| 462 | '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n' |
| 463 | '\n' |
| 464 | 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n' |
| 465 | 'Cr-Commit-Position: refs/heads/branch@{#2}\n' |
| 466 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}') |
| 467 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 468 | @mock.patch('gerrit_util.GetAccountDetails') |
| 469 | def test_valid_accounts(self, mockGetAccountDetails): |
Andrii Shyshkalov | ba7b0a4 | 2018-10-15 03:20:35 +0000 | [diff] [blame] | 470 | mock_per_account = { |
| 471 | 'u1': None, # 404, doesn't exist. |
| 472 | 'u2': { |
| 473 | '_account_id': 123124, |
| 474 | 'avatars': [], |
| 475 | 'email': 'u2@example.com', |
| 476 | 'name': 'User Number 2', |
| 477 | 'status': 'OOO', |
| 478 | }, |
| 479 | 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('), |
| 480 | } |
| 481 | def GetAccountDetailsMock(_, account): |
| 482 | # Poor-man's mock library's side_effect. |
| 483 | v = mock_per_account.pop(account) |
| 484 | if isinstance(v, Exception): |
| 485 | raise v |
| 486 | return v |
| 487 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 488 | mockGetAccountDetails.side_effect = GetAccountDetailsMock |
| 489 | actual = git_cl.gerrit_util.ValidAccounts( |
| 490 | 'host', ['u1', 'u2', 'u3'], max_threads=1) |
Andrii Shyshkalov | ba7b0a4 | 2018-10-15 03:20:35 +0000 | [diff] [blame] | 491 | self.assertEqual(actual, { |
| 492 | 'u2': { |
| 493 | '_account_id': 123124, |
| 494 | 'avatars': [], |
| 495 | 'email': 'u2@example.com', |
| 496 | 'name': 'User Number 2', |
| 497 | 'status': 'OOO', |
| 498 | }, |
| 499 | }) |
| 500 | |
| 501 | |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 502 | class TestParseIssueURL(unittest.TestCase): |
| 503 | def _validate(self, parsed, issue=None, patchset=None, hostname=None, |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 504 | fail=False): |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 505 | self.assertIsNotNone(parsed) |
| 506 | if fail: |
| 507 | self.assertFalse(parsed.valid) |
| 508 | return |
| 509 | self.assertTrue(parsed.valid) |
| 510 | self.assertEqual(parsed.issue, issue) |
| 511 | self.assertEqual(parsed.patchset, patchset) |
| 512 | self.assertEqual(parsed.hostname, hostname) |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 513 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 514 | def test_ParseIssueNumberArgument(self): |
| 515 | def test(arg, *args, **kwargs): |
| 516 | self._validate(git_cl.ParseIssueNumberArgument(arg), *args, **kwargs) |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 517 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 518 | test('123', 123) |
| 519 | test('', fail=True) |
| 520 | test('abc', fail=True) |
| 521 | test('123/1', fail=True) |
| 522 | test('123a', fail=True) |
| 523 | test('ssh://chrome-review.source.com/#/c/123/4/', fail=True) |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 524 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 525 | test('https://codereview.source.com/123', |
| 526 | 123, None, 'codereview.source.com') |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 527 | test('http://chrome-review.source.com/c/123', |
| 528 | 123, None, 'chrome-review.source.com') |
| 529 | test('https://chrome-review.source.com/c/123/', |
| 530 | 123, None, 'chrome-review.source.com') |
| 531 | test('https://chrome-review.source.com/c/123/4', |
| 532 | 123, 4, 'chrome-review.source.com') |
| 533 | test('https://chrome-review.source.com/#/c/123/4', |
| 534 | 123, 4, 'chrome-review.source.com') |
| 535 | test('https://chrome-review.source.com/c/123/4', |
| 536 | 123, 4, 'chrome-review.source.com') |
| 537 | test('https://chrome-review.source.com/123', |
| 538 | 123, None, 'chrome-review.source.com') |
| 539 | test('https://chrome-review.source.com/123/4', |
| 540 | 123, 4, 'chrome-review.source.com') |
| 541 | |
Edward Lemur | 678a684 | 2019-10-03 22:25:05 +0000 | [diff] [blame] | 542 | test('https://chrome-review.source.com/bad/123/4', fail=True) |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 543 | test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True) |
| 544 | test('https://chrome-review.source.com/c/abc/', fail=True) |
| 545 | test('ssh://chrome-review.source.com/c/123/1/', fail=True) |
| 546 | |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 547 | |
| 548 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 549 | class GitCookiesCheckerTest(unittest.TestCase): |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 550 | def setUp(self): |
| 551 | super(GitCookiesCheckerTest, self).setUp() |
| 552 | self.c = git_cl._GitCookiesChecker() |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 553 | self.c._all_hosts = [] |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 554 | mock.patch('sys.stdout', StringIO()).start() |
| 555 | self.addCleanup(mock.patch.stopall) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 556 | |
| 557 | def mock_hosts_creds(self, subhost_identity_pairs): |
| 558 | def ensure_googlesource(h): |
| 559 | if not h.endswith(self.c._GOOGLESOURCE): |
| 560 | assert not h.endswith('.') |
| 561 | return h + '.' + self.c._GOOGLESOURCE |
| 562 | return h |
| 563 | self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies') |
| 564 | for h, i in subhost_identity_pairs] |
| 565 | |
Andrii Shyshkalov | 0d2dea0 | 2017-07-17 15:17:55 +0200 | [diff] [blame] | 566 | def test_identity_parsing(self): |
| 567 | self.assertEqual(self.c._parse_identity('ldap.google.com'), |
| 568 | ('ldap', 'google.com')) |
| 569 | self.assertEqual(self.c._parse_identity('git-ldap.example.com'), |
| 570 | ('ldap', 'example.com')) |
| 571 | # Specical case because we know there are no subdomains in chromium.org. |
| 572 | self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'), |
| 573 | ('note.period', 'chromium.org')) |
Lei Zhang | d3f769a | 2017-12-15 15:16:14 -0800 | [diff] [blame] | 574 | # Pathological: ".period." can be either username OR domain, more likely |
| 575 | # domain. |
Andrii Shyshkalov | 0d2dea0 | 2017-07-17 15:17:55 +0200 | [diff] [blame] | 576 | self.assertEqual(self.c._parse_identity('git-note.period.example.com'), |
| 577 | ('note', 'period.example.com')) |
| 578 | |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 579 | def test_analysis_nothing(self): |
| 580 | self.c._all_hosts = [] |
| 581 | self.assertFalse(self.c.has_generic_host()) |
| 582 | self.assertEqual(set(), self.c.get_conflicting_hosts()) |
| 583 | self.assertEqual(set(), self.c.get_duplicated_hosts()) |
| 584 | self.assertEqual(set(), self.c.get_partially_configured_hosts()) |
| 585 | self.assertEqual(set(), self.c.get_hosts_with_wrong_identities()) |
| 586 | |
| 587 | def test_analysis(self): |
| 588 | self.mock_hosts_creds([ |
| 589 | ('.googlesource.com', 'git-example.chromium.org'), |
| 590 | |
| 591 | ('chromium', 'git-example.google.com'), |
| 592 | ('chromium-review', 'git-example.google.com'), |
| 593 | ('chrome-internal', 'git-example.chromium.org'), |
| 594 | ('chrome-internal-review', 'git-example.chromium.org'), |
| 595 | ('conflict', 'git-example.google.com'), |
| 596 | ('conflict-review', 'git-example.chromium.org'), |
| 597 | ('dup', 'git-example.google.com'), |
| 598 | ('dup', 'git-example.google.com'), |
| 599 | ('dup-review', 'git-example.google.com'), |
| 600 | ('partial', 'git-example.google.com'), |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 601 | ('gpartial-review', 'git-example.google.com'), |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 602 | ]) |
| 603 | self.assertTrue(self.c.has_generic_host()) |
| 604 | self.assertEqual(set(['conflict.googlesource.com']), |
| 605 | self.c.get_conflicting_hosts()) |
| 606 | self.assertEqual(set(['dup.googlesource.com']), |
| 607 | self.c.get_duplicated_hosts()) |
Andrii Shyshkalov | c817382 | 2017-07-10 12:10:53 +0200 | [diff] [blame] | 608 | self.assertEqual(set(['partial.googlesource.com', |
| 609 | 'gpartial-review.googlesource.com']), |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 610 | self.c.get_partially_configured_hosts()) |
| 611 | self.assertEqual(set(['chromium.googlesource.com', |
| 612 | 'chrome-internal.googlesource.com']), |
| 613 | self.c.get_hosts_with_wrong_identities()) |
| 614 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 615 | def test_report_no_problems(self): |
| 616 | self.test_analysis_nothing() |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 617 | self.assertFalse(self.c.find_and_report_problems()) |
| 618 | self.assertEqual(sys.stdout.getvalue(), '') |
| 619 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 620 | @mock.patch( |
| 621 | 'git_cl.gerrit_util.CookiesAuthenticator.get_gitcookies_path', |
| 622 | return_value='~/.gitcookies') |
| 623 | def test_report(self, *_mocks): |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 624 | self.test_analysis() |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 625 | self.assertTrue(self.c.find_and_report_problems()) |
| 626 | with open(os.path.join(os.path.dirname(__file__), |
| 627 | 'git_cl_creds_check_report.txt')) as f: |
| 628 | expected = f.read() |
| 629 | def by_line(text): |
| 630 | return [l.rstrip() for l in text.rstrip().splitlines()] |
Robert Iannucci | 456b0d6 | 2018-03-13 19:15:50 -0700 | [diff] [blame] | 631 | self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init |
Andrii Shyshkalov | 4812e61 | 2017-03-27 17:22:57 +0200 | [diff] [blame] | 632 | self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected)) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 633 | |
Nodir Turakulov | d0e2cd2 | 2017-11-15 10:22:06 -0800 | [diff] [blame] | 634 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 635 | class TestGitCl(unittest.TestCase): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 636 | def setUp(self): |
| 637 | super(TestGitCl, self).setUp() |
| 638 | self.calls = [] |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 639 | self._calls_done = [] |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 640 | mock.patch('sys.stdout', StringIO()).start() |
| 641 | mock.patch( |
| 642 | 'git_cl.time_time', |
| 643 | lambda: self._mocked_call('time.time')).start() |
| 644 | mock.patch( |
| 645 | 'git_cl.metrics.collector.add_repeated', |
| 646 | lambda *a: self._mocked_call('add_repeated', *a)).start() |
| 647 | mock.patch('subprocess2.call', self._mocked_call).start() |
| 648 | mock.patch('subprocess2.check_call', self._mocked_call).start() |
| 649 | mock.patch('subprocess2.check_output', self._mocked_call).start() |
| 650 | mock.patch( |
| 651 | 'subprocess2.communicate', |
| 652 | lambda *a, **_k: ([self._mocked_call(*a), ''], 0)).start() |
| 653 | mock.patch( |
| 654 | 'git_cl.gclient_utils.CheckCallAndFilter', |
| 655 | self._mocked_call).start() |
| 656 | mock.patch('git_common.is_dirty_git_tree', lambda x: False).start() |
| 657 | mock.patch( |
| 658 | 'git_common.get_or_create_merge_base', |
| 659 | lambda *a: self._mocked_call('get_or_create_merge_base', *a)).start() |
| 660 | mock.patch('git_cl.BranchExists', return_value=True).start() |
| 661 | mock.patch('git_cl.FindCodereviewSettingsFile', return_value='').start() |
| 662 | mock.patch( |
| 663 | 'git_cl.SaveDescriptionBackup', |
| 664 | lambda _: self._mocked_call('SaveDescriptionBackup')).start() |
| 665 | mock.patch( |
| 666 | 'git_cl.ask_for_data', |
| 667 | lambda prompt: self._mocked_call('ask_for_data', prompt)).start() |
| 668 | mock.patch( |
| 669 | 'git_cl.write_json', |
| 670 | lambda *a: self._mocked_call('write_json', *a)).start() |
| 671 | mock.patch( |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 672 | 'git_cl.Changelist.RunHook', |
| 673 | return_value={'more_cc': ['test-more-cc@chromium.org']}).start() |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 674 | mock.patch('git_cl.watchlists.Watchlists', WatchlistsMock).start() |
| 675 | mock.patch('git_cl.auth.Authenticator', AuthenticatorMock).start() |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 676 | mock.patch('gerrit_util.GetChangeDetail').start() |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 677 | mock.patch( |
| 678 | 'git_cl.gerrit_util.GetChangeComments', |
| 679 | lambda *a: self._mocked_call('GetChangeComments', *a)).start() |
| 680 | mock.patch( |
| 681 | 'git_cl.gerrit_util.GetChangeRobotComments', |
| 682 | lambda *a: self._mocked_call('GetChangeRobotComments', *a)).start() |
| 683 | mock.patch( |
| 684 | 'git_cl.gerrit_util.AddReviewers', |
| 685 | lambda *a: self._mocked_call('AddReviewers', *a)).start() |
| 686 | mock.patch( |
| 687 | 'git_cl.gerrit_util.SetReview', |
| 688 | lambda h, i, msg=None, labels=None, notify=None, ready=None: ( |
| 689 | self._mocked_call( |
| 690 | 'SetReview', h, i, msg, labels, notify, ready))).start() |
| 691 | mock.patch( |
| 692 | 'git_cl.gerrit_util.LuciContextAuthenticator.is_luci', |
| 693 | return_value=False).start() |
| 694 | mock.patch( |
| 695 | 'git_cl.gerrit_util.GceAuthenticator.is_gce', |
| 696 | return_value=False).start() |
| 697 | mock.patch( |
| 698 | 'git_cl.gerrit_util.ValidAccounts', |
| 699 | lambda *a: self._mocked_call('ValidAccounts', *a)).start() |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 700 | mock.patch('sys.exit', side_effect=SystemExitMock).start() |
Edward Lemur | 15a9b8c | 2020-02-13 00:52:30 +0000 | [diff] [blame] | 701 | mock.patch('git_cl.Settings.GetRoot', return_value='').start() |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 702 | self.mockGit = GitMocks() |
| 703 | mock.patch('scm.GIT.GetBranchRef', self.mockGit.GetBranchRef).start() |
| 704 | mock.patch('scm.GIT.GetConfig', self.mockGit.GetConfig).start() |
| 705 | mock.patch('scm.GIT.SetConfig', self.mockGit.SetConfig).start() |
Edward Lemur | 8410164 | 2020-02-21 21:40:34 +0000 | [diff] [blame] | 706 | mock.patch( |
| 707 | 'git_new_branch.create_new_branch', self.mockGit.NewBranch).start() |
Edward Lemur | 15a9b8c | 2020-02-13 00:52:30 +0000 | [diff] [blame] | 708 | mock.patch( |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 709 | 'scm.GIT.FetchUpstreamTuple', |
Edward Lemur | 15a9b8c | 2020-02-13 00:52:30 +0000 | [diff] [blame] | 710 | return_value=('origin', 'refs/heads/master')).start() |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 711 | mock.patch( |
| 712 | 'scm.GIT.CaptureStatus', return_value=[('M', 'foo.txt')]).start() |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 713 | # It's important to reset settings to not have inter-tests interference. |
| 714 | git_cl.settings = None |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 715 | self.addCleanup(mock.patch.stopall) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 716 | |
| 717 | def tearDown(self): |
wychen@chromium.org | 445c896 | 2015-04-28 23:30:05 +0000 | [diff] [blame] | 718 | try: |
Raphael Kubo da Costa | e9342a7 | 2019-10-14 17:49:39 +0000 | [diff] [blame] | 719 | self.assertEqual([], self.calls) |
Andrii Shyshkalov | 18df0cd | 2017-01-25 15:22:20 +0100 | [diff] [blame] | 720 | except AssertionError: |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 721 | calls = ''.join(' %s\n' % str(call) for call in self.calls[:5]) |
| 722 | if len(self.calls) > 5: |
| 723 | calls += ' ...\n' |
| 724 | self.fail( |
| 725 | '\n' |
| 726 | 'There are un-consumed calls after this test has finished:\n' + |
| 727 | calls) |
wychen@chromium.org | 445c896 | 2015-04-28 23:30:05 +0000 | [diff] [blame] | 728 | finally: |
| 729 | super(TestGitCl, self).tearDown() |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 730 | |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 731 | def _mocked_call(self, *args, **_kwargs): |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 732 | self.assertTrue( |
| 733 | self.calls, |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 734 | '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args)) |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 735 | top = self.calls.pop(0) |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 736 | expected_args, result = top |
| 737 | |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 738 | # Also logs otherwise it could get caught in a try/finally and be hard to |
| 739 | # diagnose. |
| 740 | if expected_args != args: |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 741 | N = 5 |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 742 | prior_calls = '\n '.join( |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 743 | '@%d: %r' % (len(self._calls_done) - N + i, c[0]) |
| 744 | for i, c in enumerate(self._calls_done[-N:])) |
| 745 | following_calls = '\n '.join( |
| 746 | '@%d: %r' % (len(self._calls_done) + i + 1, c[0]) |
| 747 | for i, c in enumerate(self.calls[:N])) |
| 748 | extended_msg = ( |
| 749 | 'A few prior calls:\n %s\n\n' |
| 750 | 'This (expected):\n @%d: %r\n' |
| 751 | 'This (actual):\n @%d: %r\n\n' |
| 752 | 'A few following expected calls:\n %s' % |
| 753 | (prior_calls, len(self._calls_done), expected_args, |
| 754 | len(self._calls_done), args, following_calls)) |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 755 | |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 756 | self.fail('@%d\n' |
| 757 | ' Expected: %r\n' |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 758 | ' Actual: %r\n' |
| 759 | '\n' |
| 760 | '%s' % ( |
| 761 | len(self._calls_done), expected_args, args, extended_msg)) |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 762 | |
| 763 | self._calls_done.append(top) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 764 | if isinstance(result, Exception): |
| 765 | raise result |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 766 | # stdout from git commands is supposed to be a bytestream. Convert it here |
| 767 | # instead of converting all test output in this file to bytes. |
| 768 | if args[0][0] == 'git' and not isinstance(result, bytes): |
| 769 | result = result.encode('utf-8') |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 770 | return result |
| 771 | |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 772 | def test_ask_for_explicit_yes_true(self): |
| 773 | self.calls = [ |
| 774 | (('ask_for_data', 'prompt [Yes/No]: '), 'blah'), |
| 775 | (('ask_for_data', 'Please, type yes or no: '), 'ye'), |
| 776 | ] |
| 777 | self.assertTrue(git_cl.ask_for_explicit_yes('prompt')) |
| 778 | |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 779 | def test_LoadCodereviewSettingsFromFile_gerrit(self): |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 780 | codereview_file = StringIO('GERRIT_HOST: true') |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 781 | self.calls = [ |
| 782 | ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1), |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 783 | ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1), |
| 784 | ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1), |
| 785 | ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1), |
| 786 | ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1), |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 787 | ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],), |
| 788 | CERR1), |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 789 | ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],), |
| 790 | CERR1), |
Jamie Madill | dc4d19e | 2019-10-24 21:50:02 +0000 | [diff] [blame] | 791 | ((['git', 'config', '--unset-all', 'rietveld.format-full-by-default'],), |
| 792 | CERR1), |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 793 | ((['git', 'config', 'gerrit.host', 'true'],), ''), |
| 794 | ] |
| 795 | self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file)) |
| 796 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 797 | @classmethod |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 798 | def _gerrit_base_calls(cls, issue=None, fetched_description=None, |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 799 | fetched_status=None, other_cl_owner=None, |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 800 | custom_cl_base=None, short_hostname='chromium', |
| 801 | change_id=None): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 802 | calls = [] |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 803 | if custom_cl_base: |
| 804 | ancestor_revision = custom_cl_base |
| 805 | else: |
| 806 | # Determine ancestor_revision to be merge base. |
| 807 | ancestor_revision = 'fake_ancestor_sha' |
| 808 | calls += [ |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 809 | (('get_or_create_merge_base', 'master', 'refs/remotes/origin/master'), |
| 810 | ancestor_revision), |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 811 | ] |
| 812 | |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 813 | if issue: |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 814 | gerrit_util.GetChangeDetail.return_value = { |
| 815 | 'owner': {'email': (other_cl_owner or 'owner@example.com')}, |
| 816 | 'change_id': (change_id or '123456789'), |
| 817 | 'current_revision': 'sha1_of_current_revision', |
| 818 | 'revisions': {'sha1_of_current_revision': { |
| 819 | 'commit': {'message': fetched_description}, |
| 820 | }}, |
| 821 | 'status': fetched_status or 'NEW', |
| 822 | } |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 823 | if fetched_status == 'ABANDONED': |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 824 | return calls |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 825 | if other_cl_owner: |
| 826 | calls += [ |
| 827 | (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''), |
| 828 | ] |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 829 | |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 830 | calls += [ |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 831 | ((['git', 'rev-parse', 'HEAD'],), '12345'), |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 832 | ] |
| 833 | |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 834 | calls += [ |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 835 | ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] + |
| 836 | ([custom_cl_base] if custom_cl_base else |
| 837 | [ancestor_revision, 'HEAD']),), |
| 838 | '+dat'), |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 839 | ] |
| 840 | return calls |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 841 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 842 | def _gerrit_upload_calls(self, description, reviewers, squash, |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 843 | squash_mode='default', |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 844 | expected_upstream_ref='origin/refs/heads/master', |
Aaron Gable | fd23808 | 2017-06-07 13:42:34 -0700 | [diff] [blame] | 845 | title=None, notify=False, |
Andrii Shyshkalov | e9c78ff | 2017-02-06 15:53:13 +0100 | [diff] [blame] | 846 | post_amend_description=None, issue=None, cc=None, |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 847 | custom_cl_base=None, tbr=None, |
Andrii Shyshkalov | e7a7fc4 | 2018-10-30 17:35:09 +0000 | [diff] [blame] | 848 | short_hostname='chromium', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 849 | labels=None, change_id=None, original_title=None, |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 850 | final_description=None, gitcookies_exists=True, |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 851 | force=False, edit_description=None): |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 852 | if post_amend_description is None: |
| 853 | post_amend_description = description |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 854 | cc = cc or [] |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 855 | # Determined in `_gerrit_base_calls`. |
| 856 | determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha' |
| 857 | |
| 858 | calls = [] |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 859 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 860 | if squash_mode in ('override_squash', 'override_nosquash'): |
| 861 | self.mockGit.config['gerrit.override-squash-uploads'] = ( |
| 862 | 'true' if squash_mode == 'override_squash' else 'false') |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 863 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 864 | # If issue is given, then description is fetched from Gerrit instead. |
| 865 | if issue is None: |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 866 | calls += [ |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 867 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
| 868 | ((custom_cl_base + '..') if custom_cl_base else |
| 869 | 'fake_ancestor_sha..HEAD')],), |
| 870 | description), |
| 871 | ] |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 872 | if squash: |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 873 | title = 'Initial_upload' |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 874 | else: |
| 875 | if not title: |
| 876 | calls += [ |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 877 | ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''), |
| 878 | (('ask_for_data', 'Title for patchset []: '), 'User input'), |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 879 | ] |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 880 | title = 'User_input' |
tandrii@chromium.org | 57d8654 | 2016-03-04 16:11:32 +0000 | [diff] [blame] | 881 | if not git_footers.get_footer_change_id(description) and not squash: |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 882 | calls += [ |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 883 | (('DownloadGerritHook', False), ''), |
| 884 | # Amending of commit message to get the Change-Id. |
| 885 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
| 886 | determined_ancestor_revision + '..HEAD'],), |
| 887 | description), |
| 888 | ((['git', 'commit', '--amend', '-m', description],), ''), |
| 889 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
| 890 | determined_ancestor_revision + '..HEAD'],), |
| 891 | post_amend_description) |
| 892 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 893 | if squash: |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 894 | if force or not issue: |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 895 | if not force: |
| 896 | calls += [ |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 897 | ((['RunEditor'],), description), |
| 898 | ] |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 899 | # user wants to edit description |
| 900 | if edit_description: |
| 901 | calls += [ |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 902 | ((['RunEditor'],), edit_description), |
| 903 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 904 | ref_to_push = 'abcdef0123456789' |
| 905 | calls += [ |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 906 | ] |
| 907 | |
| 908 | if custom_cl_base is None: |
| 909 | calls += [ |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 910 | (('get_or_create_merge_base', 'master', 'refs/remotes/origin/master'), |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 911 | 'origin/master'), |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 912 | ] |
| 913 | parent = 'origin/master' |
| 914 | else: |
| 915 | calls += [ |
| 916 | ((['git', 'merge-base', '--is-ancestor', custom_cl_base, |
| 917 | 'refs/remotes/origin/master'],), |
| 918 | callError(1)), # Means not ancenstor. |
| 919 | (('ask_for_data', |
| 920 | 'Do you take responsibility for cleaning up potential mess ' |
| 921 | 'resulting from proceeding with upload? Press Enter to upload, ' |
| 922 | 'or Ctrl+C to abort'), ''), |
| 923 | ] |
| 924 | parent = custom_cl_base |
| 925 | |
| 926 | calls += [ |
| 927 | ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash. |
| 928 | '0123456789abcdef'), |
Edward Lemur | 1773f37 | 2020-02-22 00:27:14 +0000 | [diff] [blame] | 929 | ((['FileWrite', '/tmp/fake-temp1', description],), None), |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 930 | ((['git', 'commit-tree', '0123456789abcdef', '-p', parent, |
Edward Lemur | 1773f37 | 2020-02-22 00:27:14 +0000 | [diff] [blame] | 931 | '-F', '/tmp/fake-temp1'],), |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 932 | ref_to_push), |
| 933 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 934 | else: |
| 935 | ref_to_push = 'HEAD' |
| 936 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 937 | calls += [ |
Andrii Shyshkalov | d9fdc1f | 2018-09-27 02:13:09 +0000 | [diff] [blame] | 938 | (('SaveDescriptionBackup',), None), |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 939 | ((['git', 'rev-list', |
| 940 | (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' + |
| 941 | ref_to_push],), |
| 942 | '1hashPerLine\n'), |
| 943 | ] |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 944 | |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 945 | metrics_arguments = [] |
| 946 | |
Aaron Gable | afd5277 | 2017-06-27 16:40:10 -0700 | [diff] [blame] | 947 | if notify: |
Aaron Gable | 844cf29 | 2017-06-28 11:32:59 -0700 | [diff] [blame] | 948 | ref_suffix = '%ready,notify=ALL' |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 949 | metrics_arguments += ['ready', 'notify=ALL'] |
Aaron Gable | 844cf29 | 2017-06-28 11:32:59 -0700 | [diff] [blame] | 950 | else: |
Jamie Madill | 276da0b | 2018-04-27 14:41:20 -0400 | [diff] [blame] | 951 | if not issue and squash: |
Aaron Gable | 844cf29 | 2017-06-28 11:32:59 -0700 | [diff] [blame] | 952 | ref_suffix = '%wip' |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 953 | metrics_arguments.append('wip') |
Aaron Gable | 844cf29 | 2017-06-28 11:32:59 -0700 | [diff] [blame] | 954 | else: |
| 955 | ref_suffix = '%notify=NONE' |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 956 | metrics_arguments.append('notify=NONE') |
Aaron Gable | 9b713dd | 2016-12-14 16:04:21 -0800 | [diff] [blame] | 957 | |
Aaron Gable | 70f4e24 | 2017-06-26 10:45:59 -0700 | [diff] [blame] | 958 | if title: |
Aaron Gable | afd5277 | 2017-06-27 16:40:10 -0700 | [diff] [blame] | 959 | ref_suffix += ',m=' + title |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 960 | metrics_arguments.append('m') |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 961 | |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 962 | if short_hostname == 'chromium': |
| 963 | # All reviwers and ccs get into ref_suffix. |
| 964 | for r in sorted(reviewers): |
| 965 | ref_suffix += ',r=%s' % r |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 966 | metrics_arguments.append('r') |
Edward Lemur | 4508b42 | 2019-10-03 21:56:35 +0000 | [diff] [blame] | 967 | if issue is None: |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 968 | cc += ['test-more-cc@chromium.org', 'joe@example.com'] |
Edward Lemur | 4508b42 | 2019-10-03 21:56:35 +0000 | [diff] [blame] | 969 | for c in sorted(cc): |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 970 | ref_suffix += ',cc=%s' % c |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 971 | metrics_arguments.append('cc') |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 972 | reviewers, cc = [], [] |
| 973 | else: |
| 974 | # TODO(crbug/877717): remove this case. |
| 975 | calls += [ |
| 976 | (('ValidAccounts', '%s-review.googlesource.com' % short_hostname, |
| 977 | sorted(reviewers) + ['joe@example.com', |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 978 | 'test-more-cc@chromium.org'] + cc), |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 979 | { |
| 980 | e: {'email': e} |
| 981 | for e in (reviewers + ['joe@example.com'] + cc) |
| 982 | }) |
| 983 | ] |
| 984 | for r in sorted(reviewers): |
| 985 | if r != 'bad-account-or-email': |
| 986 | ref_suffix += ',r=%s' % r |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 987 | metrics_arguments.append('r') |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 988 | reviewers.remove(r) |
Edward Lemur | 4508b42 | 2019-10-03 21:56:35 +0000 | [diff] [blame] | 989 | if issue is None: |
| 990 | cc += ['joe@example.com'] |
| 991 | for c in sorted(cc): |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 992 | ref_suffix += ',cc=%s' % c |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 993 | metrics_arguments.append('cc') |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 994 | if c in cc: |
| 995 | cc.remove(c) |
Andrii Shyshkalov | 76988a8 | 2018-10-15 03:12:25 +0000 | [diff] [blame] | 996 | |
Edward Lemur | 687ca90 | 2018-12-05 02:30:30 +0000 | [diff] [blame] | 997 | for k, v in sorted((labels or {}).items()): |
| 998 | ref_suffix += ',l=%s+%d' % (k, v) |
| 999 | metrics_arguments.append('l=%s+%d' % (k, v)) |
| 1000 | |
| 1001 | if tbr: |
| 1002 | calls += [ |
| 1003 | (('GetCodeReviewTbrScore', |
| 1004 | '%s-review.googlesource.com' % short_hostname, |
| 1005 | 'my/repo'), |
| 1006 | 2,), |
| 1007 | ] |
Andrii Shyshkalov | e7a7fc4 | 2018-10-30 17:35:09 +0000 | [diff] [blame] | 1008 | |
Edward Lemur | 01f4a4f | 2018-11-03 00:40:38 +0000 | [diff] [blame] | 1009 | calls += [ |
| 1010 | (('time.time',), 1000,), |
| 1011 | ((['git', 'push', |
| 1012 | 'https://%s.googlesource.com/my/repo' % short_hostname, |
| 1013 | ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],), |
| 1014 | (('remote:\n' |
| 1015 | 'remote: Processing changes: (\)\n' |
| 1016 | 'remote: Processing changes: (|)\n' |
| 1017 | 'remote: Processing changes: (/)\n' |
| 1018 | 'remote: Processing changes: (-)\n' |
| 1019 | 'remote: Processing changes: new: 1 (/)\n' |
| 1020 | 'remote: Processing changes: new: 1, done\n' |
| 1021 | 'remote:\n' |
| 1022 | 'remote: New Changes:\n' |
| 1023 | 'remote: https://%s-review.googlesource.com/#/c/my/repo/+/123456' |
| 1024 | ' XXX\n' |
| 1025 | 'remote:\n' |
| 1026 | 'To https://%s.googlesource.com/my/repo\n' |
| 1027 | ' * [new branch] hhhh -> refs/for/refs/heads/master\n' |
| 1028 | ) % (short_hostname, short_hostname)),), |
| 1029 | (('time.time',), 2000,), |
| 1030 | (('add_repeated', |
| 1031 | 'sub_commands', |
| 1032 | { |
| 1033 | 'execution_time': 1000, |
| 1034 | 'command': 'git push', |
| 1035 | 'exit_code': 0, |
| 1036 | 'arguments': sorted(metrics_arguments), |
| 1037 | }), |
| 1038 | None,), |
| 1039 | ] |
| 1040 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1041 | final_description = final_description or post_amend_description.strip() |
| 1042 | original_title = original_title or title or '<untitled>' |
| 1043 | # Trace-related calls |
| 1044 | calls += [ |
| 1045 | # Write a description with context for the current trace. |
| 1046 | ((['FileWrite', 'TRACES_DIR/20170316T200041.000000-README', |
Edward Lemur | 75391d4 | 2019-05-14 23:35:56 +0000 | [diff] [blame] | 1047 | 'Thu Mar 16 20:00:41 2017\n' |
| 1048 | '%(short_hostname)s-review.googlesource.com\n' |
| 1049 | '%(change_id)s\n' |
| 1050 | '%(title)s\n' |
| 1051 | '%(description)s\n' |
| 1052 | '1000\n' |
| 1053 | '0\n' |
| 1054 | '%(trace_name)s' % { |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1055 | 'short_hostname': short_hostname, |
| 1056 | 'change_id': change_id, |
| 1057 | 'description': final_description, |
| 1058 | 'title': original_title, |
Edward Lemur | 75391d4 | 2019-05-14 23:35:56 +0000 | [diff] [blame] | 1059 | 'trace_name': 'TRACES_DIR/20170316T200041.000000', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1060 | }],), |
| 1061 | None, |
| 1062 | ), |
| 1063 | # Read traces and shorten git hashes. |
| 1064 | ((['os.path.isfile', 'TEMP_DIR/trace-packet'],), |
| 1065 | True, |
| 1066 | ), |
| 1067 | ((['FileRead', 'TEMP_DIR/trace-packet'],), |
| 1068 | ('git-hash: 0123456789012345678901234567890123456789\n' |
| 1069 | 'git-hash: abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde\n'), |
| 1070 | ), |
| 1071 | ((['FileWrite', 'TEMP_DIR/trace-packet', |
| 1072 | 'git-hash: 012345\n' |
| 1073 | 'git-hash: abcdea\n'],), |
| 1074 | None, |
| 1075 | ), |
| 1076 | # Make zip file for the git traces. |
| 1077 | ((['make_archive', 'TRACES_DIR/20170316T200041.000000-traces', 'zip', |
| 1078 | 'TEMP_DIR'],), |
| 1079 | None, |
| 1080 | ), |
| 1081 | # Collect git config and gitcookies. |
| 1082 | ((['git', 'config', '-l'],), |
| 1083 | 'git-config-output', |
| 1084 | ), |
| 1085 | ((['FileWrite', 'TEMP_DIR/git-config', 'git-config-output'],), |
| 1086 | None, |
| 1087 | ), |
| 1088 | ((['os.path.isfile', '~/.gitcookies'],), |
| 1089 | gitcookies_exists, |
| 1090 | ), |
| 1091 | ] |
| 1092 | if gitcookies_exists: |
| 1093 | calls += [ |
| 1094 | ((['FileRead', '~/.gitcookies'],), |
| 1095 | 'gitcookies 1/SECRET', |
| 1096 | ), |
| 1097 | ((['FileWrite', 'TEMP_DIR/gitcookies', 'gitcookies REDACTED'],), |
| 1098 | None, |
| 1099 | ), |
| 1100 | ] |
| 1101 | calls += [ |
| 1102 | # Make zip file for the git config and gitcookies. |
| 1103 | ((['make_archive', 'TRACES_DIR/20170316T200041.000000-git-info', 'zip', |
| 1104 | 'TEMP_DIR'],), |
| 1105 | None, |
| 1106 | ), |
| 1107 | ] |
| 1108 | |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 1109 | # TODO(crbug/877717): this should never be used. |
| 1110 | if squash and short_hostname != 'chromium': |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1111 | calls += [ |
| 1112 | (('AddReviewers', |
Andrii Shyshkalov | 1e82867 | 2018-08-23 22:34:37 +0000 | [diff] [blame] | 1113 | 'chromium-review.googlesource.com', 'my%2Frepo~123456', |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1114 | sorted(reviewers), |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 1115 | cc + ['test-more-cc@chromium.org'], |
Andrii Shyshkalov | 2f72791 | 2018-10-15 17:02:33 +0000 | [diff] [blame] | 1116 | notify), |
| 1117 | ''), |
Andrii Shyshkalov | 0ec9d15 | 2018-08-23 00:22:58 +0000 | [diff] [blame] | 1118 | ] |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1119 | calls += [ |
| 1120 | ((['git', 'rev-parse', 'HEAD'],), 'hash'), |
| 1121 | ] |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1122 | return calls |
| 1123 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1124 | def _run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1125 | self, |
| 1126 | upload_args, |
| 1127 | description, |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 1128 | reviewers=None, |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1129 | squash=True, |
| 1130 | squash_mode=None, |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 1131 | expected_upstream_ref='origin/refs/heads/master', |
Aaron Gable | 9b713dd | 2016-12-14 16:04:21 -0800 | [diff] [blame] | 1132 | title=None, |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1133 | notify=False, |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1134 | post_amend_description=None, |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 1135 | issue=None, |
Andrii Shyshkalov | e9c78ff | 2017-02-06 15:53:13 +0100 | [diff] [blame] | 1136 | cc=None, |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1137 | fetched_status=None, |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1138 | other_cl_owner=None, |
Aaron Gable | fd23808 | 2017-06-07 13:42:34 -0700 | [diff] [blame] | 1139 | custom_cl_base=None, |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 1140 | tbr=None, |
Andrii Shyshkalov | e7a7fc4 | 2018-10-30 17:35:09 +0000 | [diff] [blame] | 1141 | short_hostname='chromium', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1142 | labels=None, |
| 1143 | change_id=None, |
| 1144 | original_title=None, |
| 1145 | final_description=None, |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 1146 | gitcookies_exists=True, |
| 1147 | force=False, |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 1148 | edit_description=None, |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 1149 | fetched_description=None): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1150 | """Generic gerrit upload test framework.""" |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1151 | if squash_mode is None: |
| 1152 | if '--no-squash' in upload_args: |
| 1153 | squash_mode = 'nosquash' |
| 1154 | elif '--squash' in upload_args: |
| 1155 | squash_mode = 'squash' |
| 1156 | else: |
| 1157 | squash_mode = 'default' |
| 1158 | |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 1159 | reviewers = reviewers or [] |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 1160 | cc = cc or [] |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1161 | mock.patch('git_cl.gerrit_util.CookiesAuthenticator', |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1162 | CookiesAuthenticatorMockFactory( |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1163 | same_auth=('git-owner.example.com', '', 'pass'))).start() |
| 1164 | mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck', |
| 1165 | lambda _, offer_removal: None).start() |
| 1166 | mock.patch('git_cl.gclient_utils.RunEditor', |
| 1167 | lambda *_, **__: self._mocked_call(['RunEditor'])).start() |
| 1168 | mock.patch('git_cl.DownloadGerritHook', lambda force: self._mocked_call( |
| 1169 | 'DownloadGerritHook', force)).start() |
| 1170 | mock.patch('git_cl.gclient_utils.FileRead', |
| 1171 | lambda path: self._mocked_call(['FileRead', path])).start() |
| 1172 | mock.patch('git_cl.gclient_utils.FileWrite', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1173 | lambda path, contents: self._mocked_call( |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1174 | ['FileWrite', path, contents])).start() |
| 1175 | mock.patch('git_cl.datetime_now', |
| 1176 | lambda: datetime.datetime(2017, 3, 16, 20, 0, 41, 0)).start() |
| 1177 | mock.patch('git_cl.tempfile.mkdtemp', lambda: 'TEMP_DIR').start() |
| 1178 | mock.patch('git_cl.TRACES_DIR', 'TRACES_DIR').start() |
| 1179 | mock.patch('git_cl.TRACES_README_FORMAT', |
Edward Lemur | 75391d4 | 2019-05-14 23:35:56 +0000 | [diff] [blame] | 1180 | '%(now)s\n' |
| 1181 | '%(gerrit_host)s\n' |
| 1182 | '%(change_id)s\n' |
| 1183 | '%(title)s\n' |
| 1184 | '%(description)s\n' |
| 1185 | '%(execution_time)s\n' |
| 1186 | '%(exit_code)s\n' |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1187 | '%(trace_name)s').start() |
| 1188 | mock.patch('git_cl.shutil.make_archive', |
| 1189 | lambda *args: self._mocked_call(['make_archive'] + |
| 1190 | list(args))).start() |
| 1191 | mock.patch('os.path.isfile', |
| 1192 | lambda path: self._mocked_call(['os.path.isfile', path])).start() |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 1193 | mock.patch('git_cl.Changelist.GitSanityChecks', return_value=True).start() |
Edward Lemur | 9aa1a96 | 2020-02-25 00:58:38 +0000 | [diff] [blame] | 1194 | mock.patch( |
| 1195 | 'git_cl.Changelist.GetLocalDescription', return_value='foo').start() |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1196 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1197 | self.mockGit.config['gerrit.host'] = 'true' |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1198 | 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 Lemur | 9aa1a96 | 2020-02-25 00:58:38 +0000 | [diff] [blame] | 1202 | self.mockGit.config['user.email'] = 'me@example.com' |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1203 | |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1204 | self.calls = self._gerrit_base_calls( |
| 1205 | issue=issue, |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 1206 | fetched_description=fetched_description or description, |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1207 | fetched_status=fetched_status, |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1208 | other_cl_owner=other_cl_owner, |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 1209 | custom_cl_base=custom_cl_base, |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 1210 | short_hostname=short_hostname, |
| 1211 | change_id=change_id) |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1212 | if fetched_status != 'ABANDONED': |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1213 | mock.patch( |
Edward Lemur | 1773f37 | 2020-02-22 00:27:14 +0000 | [diff] [blame] | 1214 | 'gclient_utils.temporary_file', TemporaryFileMock()).start() |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1215 | mock.patch('os.remove', return_value=True).start() |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1216 | self.calls += self._gerrit_upload_calls( |
| 1217 | description, reviewers, squash, |
| 1218 | squash_mode=squash_mode, |
| 1219 | expected_upstream_ref=expected_upstream_ref, |
Aaron Gable | fd23808 | 2017-06-07 13:42:34 -0700 | [diff] [blame] | 1220 | title=title, notify=notify, |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1221 | post_amend_description=post_amend_description, |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 1222 | issue=issue, cc=cc, |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 1223 | custom_cl_base=custom_cl_base, tbr=tbr, |
Andrii Shyshkalov | e7a7fc4 | 2018-10-30 17:35:09 +0000 | [diff] [blame] | 1224 | short_hostname=short_hostname, |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1225 | labels=labels, |
| 1226 | change_id=change_id, |
| 1227 | original_title=original_title, |
| 1228 | final_description=final_description, |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 1229 | gitcookies_exists=gitcookies_exists, |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 1230 | force=force, |
| 1231 | edit_description=edit_description) |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 1232 | # Uncomment when debugging. |
Raul Tambre | 80ee78e | 2019-05-06 22:41:05 +0000 | [diff] [blame] | 1233 | # print('\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1234 | git_cl.main(['upload'] + upload_args) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1235 | if squash: |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1236 | self.assertIssueAndPatchset(patchset=None) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1237 | self.assertEqual( |
| 1238 | 'abcdef0123456789', |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1239 | scm.GIT.GetBranchConfig('', 'master', 'gerritsquashhash')) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1240 | |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1241 | def test_gerrit_upload_traces_no_gitcookies(self): |
| 1242 | self._run_gerrit_upload_test( |
| 1243 | ['--no-squash'], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1244 | 'desc ✔\n\nBUG=\n', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1245 | [], |
| 1246 | squash=False, |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1247 | post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1248 | change_id='Ixxx', |
| 1249 | gitcookies_exists=False) |
| 1250 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1251 | def test_gerrit_upload_without_change_id(self): |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1252 | self._run_gerrit_upload_test( |
| 1253 | ['--no-squash'], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1254 | 'desc ✔\n\nBUG=\n', |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1255 | [], |
| 1256 | squash=False, |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1257 | post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1258 | change_id='Ixxx') |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1259 | |
| 1260 | def test_gerrit_upload_without_change_id_override_nosquash(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1261 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1262 | [], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1263 | 'desc ✔\n\nBUG=\n', |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 1264 | [], |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1265 | squash=False, |
| 1266 | squash_mode='override_nosquash', |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1267 | post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1268 | change_id='Ixxx') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1269 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1270 | def test_gerrit_no_reviewer(self): |
| 1271 | self._run_gerrit_upload_test( |
| 1272 | [], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1273 | 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n', |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1274 | [], |
| 1275 | squash=False, |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1276 | squash_mode='override_nosquash', |
| 1277 | change_id='I123456789') |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1278 | |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 1279 | def test_gerrit_no_reviewer_non_chromium_host(self): |
| 1280 | # TODO(crbug/877717): remove this test case. |
| 1281 | self._run_gerrit_upload_test( |
| 1282 | [], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1283 | 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n', |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 1284 | [], |
| 1285 | squash=False, |
| 1286 | squash_mode='override_nosquash', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1287 | short_hostname='other', |
| 1288 | change_id='I123456789') |
Andrii Shyshkalov | 0da5e8f | 2018-10-30 17:29:18 +0000 | [diff] [blame] | 1289 | |
Nick Carter | 8692b18 | 2017-11-06 16:30:38 -0800 | [diff] [blame] | 1290 | def test_gerrit_patchset_title_special_chars(self): |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1291 | self._run_gerrit_upload_test( |
Nick Carter | 8692b18 | 2017-11-06 16:30:38 -0800 | [diff] [blame] | 1292 | ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1293 | 'desc ✔\n\nBUG=\n\nChange-Id: I123456789', |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1294 | squash=False, |
| 1295 | squash_mode='override_nosquash', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1296 | title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D', |
| 1297 | change_id='I123456789', |
| 1298 | original_title='We\'ll escape ^_ ^ special chars...@{u}') |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1299 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1300 | def test_gerrit_reviewers_cmd_line(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1301 | self._run_gerrit_upload_test( |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1302 | ['-r', 'foo@example.com', '--send-mail'], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1303 | 'desc ✔\n\nBUG=\n\nChange-Id: I123456789', |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1304 | ['foo@example.com'], |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1305 | squash=False, |
| 1306 | squash_mode='override_nosquash', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1307 | notify=True, |
| 1308 | change_id='I123456789', |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1309 | final_description=( |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1310 | 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789')) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1311 | |
Anthony Polito | 8b95534 | 2019-09-24 19:01:36 +0000 | [diff] [blame] | 1312 | def test_gerrit_upload_force_sets_bug(self): |
| 1313 | self._run_gerrit_upload_test( |
| 1314 | ['-b', '10000', '-f'], |
| 1315 | u'desc=\n\nBug: 10000\nChange-Id: Ixxx', |
| 1316 | [], |
| 1317 | force=True, |
| 1318 | expected_upstream_ref='origin/master', |
| 1319 | fetched_description='desc=\n\nChange-Id: Ixxx', |
| 1320 | original_title='Initial upload', |
| 1321 | change_id='Ixxx') |
| 1322 | |
| 1323 | def test_gerrit_upload_force_sets_bug_if_wrong_changeid(self): |
| 1324 | self._run_gerrit_upload_test( |
| 1325 | ['-b', '10000', '-f', '-m', 'Title'], |
| 1326 | u'desc=\n\nChange-Id: Ixxxx\n\nChange-Id: Izzzz\nBug: 10000', |
| 1327 | [], |
| 1328 | force=True, |
| 1329 | issue='123456', |
| 1330 | expected_upstream_ref='origin/master', |
| 1331 | fetched_description='desc=\n\nChange-Id: Ixxxx', |
| 1332 | original_title='Title', |
| 1333 | title='Title', |
| 1334 | change_id='Izzzz') |
| 1335 | |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 1336 | def test_gerrit_upload_force_sets_fixed(self): |
| 1337 | self._run_gerrit_upload_test( |
| 1338 | ['-x', '10000', '-f'], |
| 1339 | u'desc=\n\nFixed: 10000\nChange-Id: Ixxx', |
| 1340 | [], |
| 1341 | force=True, |
| 1342 | expected_upstream_ref='origin/master', |
| 1343 | fetched_description='desc=\n\nChange-Id: Ixxx', |
| 1344 | original_title='Initial upload', |
| 1345 | change_id='Ixxx') |
| 1346 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1347 | def test_gerrit_reviewer_multiple(self): |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1348 | mock.patch('git_cl.gerrit_util.GetCodeReviewTbrScore', |
| 1349 | lambda *a: self._mocked_call('GetCodeReviewTbrScore', *a)).start() |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1350 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1351 | [], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1352 | 'desc ✔\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n' |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 1353 | 'CC=more@example.com,people@example.com\n\n' |
Yoshisato Yanagisawa | 81e3ff5 | 2017-09-26 15:33:34 +0900 | [diff] [blame] | 1354 | 'Change-Id: 123456789', |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1355 | ['reviewer@example.com', 'another@example.com'], |
Yoshisato Yanagisawa | 81e3ff5 | 2017-09-26 15:33:34 +0900 | [diff] [blame] | 1356 | expected_upstream_ref='origin/master', |
Aaron Gable | fd23808 | 2017-06-07 13:42:34 -0700 | [diff] [blame] | 1357 | cc=['more@example.com', 'people@example.com'], |
Edward Lemur | 687ca90 | 2018-12-05 02:30:30 +0000 | [diff] [blame] | 1358 | tbr='reviewer@example.com', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1359 | labels={'Code-Review': 2}, |
| 1360 | change_id='123456789', |
| 1361 | original_title='Initial upload') |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1362 | |
| 1363 | def test_gerrit_upload_squash_first_is_default(self): |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1364 | self._run_gerrit_upload_test( |
| 1365 | [], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1366 | 'desc ✔\nBUG=\n\nChange-Id: 123456789', |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1367 | [], |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1368 | expected_upstream_ref='origin/master', |
| 1369 | change_id='123456789', |
| 1370 | original_title='Initial upload') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1371 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1372 | def test_gerrit_upload_squash_first(self): |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1373 | self._run_gerrit_upload_test( |
| 1374 | ['--squash'], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1375 | 'desc ✔\nBUG=\n\nChange-Id: 123456789', |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1376 | [], |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 1377 | squash=True, |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1378 | expected_upstream_ref='origin/master', |
| 1379 | change_id='123456789', |
| 1380 | original_title='Initial upload') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1381 | |
Andrii Shyshkalov | e7a7fc4 | 2018-10-30 17:35:09 +0000 | [diff] [blame] | 1382 | def test_gerrit_upload_squash_first_with_labels(self): |
| 1383 | self._run_gerrit_upload_test( |
| 1384 | ['--squash', '--cq-dry-run', '--enable-auto-submit'], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1385 | 'desc ✔\nBUG=\n\nChange-Id: 123456789', |
Andrii Shyshkalov | e7a7fc4 | 2018-10-30 17:35:09 +0000 | [diff] [blame] | 1386 | [], |
| 1387 | squash=True, |
| 1388 | expected_upstream_ref='origin/master', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1389 | labels={'Commit-Queue': 1, 'Auto-Submit': 1}, |
| 1390 | change_id='123456789', |
| 1391 | original_title='Initial upload') |
Andrii Shyshkalov | e7a7fc4 | 2018-10-30 17:35:09 +0000 | [diff] [blame] | 1392 | |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1393 | def test_gerrit_upload_squash_first_against_rev(self): |
| 1394 | custom_cl_base = 'custom_cl_base_rev_or_branch' |
| 1395 | self._run_gerrit_upload_test( |
| 1396 | ['--squash', custom_cl_base], |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1397 | 'desc ✔\nBUG=\n\nChange-Id: 123456789', |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1398 | [], |
| 1399 | squash=True, |
| 1400 | expected_upstream_ref='origin/master', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1401 | custom_cl_base=custom_cl_base, |
| 1402 | change_id='123456789', |
| 1403 | original_title='Initial upload') |
Andrii Shyshkalov | 550e924 | 2017-04-12 17:14:49 +0200 | [diff] [blame] | 1404 | self.assertIn( |
| 1405 | 'If you proceed with upload, more than 1 CL may be created by Gerrit', |
| 1406 | sys.stdout.getvalue()) |
| 1407 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1408 | def test_gerrit_upload_squash_reupload(self): |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1409 | description = 'desc ✔\nBUG=\n\nChange-Id: 123456789' |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1410 | self._run_gerrit_upload_test( |
| 1411 | ['--squash'], |
| 1412 | description, |
| 1413 | [], |
| 1414 | squash=True, |
| 1415 | expected_upstream_ref='origin/master', |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1416 | issue=123456, |
| 1417 | change_id='123456789', |
| 1418 | original_title='User input') |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1419 | |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 1420 | @mock.patch('sys.stderr', StringIO()) |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1421 | def test_gerrit_upload_squash_reupload_to_abandoned(self): |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1422 | description = 'desc ✔\nBUG=\n\nChange-Id: 123456789' |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1423 | with self.assertRaises(SystemExitMock): |
| 1424 | self._run_gerrit_upload_test( |
| 1425 | ['--squash'], |
| 1426 | description, |
| 1427 | [], |
| 1428 | squash=True, |
| 1429 | expected_upstream_ref='origin/master', |
| 1430 | issue=123456, |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1431 | fetched_status='ABANDONED', |
| 1432 | change_id='123456789') |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 1433 | self.assertEqual( |
| 1434 | 'Change https://chromium-review.googlesource.com/123456 has been ' |
| 1435 | 'abandoned, new uploads are not allowed\n', |
| 1436 | sys.stderr.getvalue()) |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1437 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1438 | @mock.patch( |
| 1439 | 'gerrit_util.GetAccountDetails', |
| 1440 | return_value={'email': 'yet-another@example.com'}) |
| 1441 | def test_gerrit_upload_squash_reupload_to_not_owned(self, _mock): |
Edward Lemur | 0db01f0 | 2019-11-12 22:01:51 +0000 | [diff] [blame] | 1442 | description = 'desc ✔\nBUG=\n\nChange-Id: 123456789' |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1443 | self._run_gerrit_upload_test( |
| 1444 | ['--squash'], |
| 1445 | description, |
| 1446 | [], |
| 1447 | squash=True, |
| 1448 | expected_upstream_ref='origin/master', |
| 1449 | issue=123456, |
Edward Lemur | 1b52d87 | 2019-05-09 21:12:12 +0000 | [diff] [blame] | 1450 | other_cl_owner='other@example.com', |
| 1451 | change_id='123456789', |
| 1452 | original_title='User input') |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1453 | self.assertIn( |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 1454 | 'WARNING: Change 123456 is owned by other@example.com, but you ' |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1455 | 'authenticate to Gerrit as yet-another@example.com.\n' |
| 1456 | 'Uploading may fail due to lack of permissions', |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1457 | sys.stdout.getvalue()) |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1458 | |
Josip | e827b0f | 2020-01-30 00:07:20 +0000 | [diff] [blame] | 1459 | def test_upload_change_description_editor(self): |
| 1460 | fetched_description = 'foo\n\nChange-Id: 123456789' |
| 1461 | description = 'bar\n\nChange-Id: 123456789' |
| 1462 | self._run_gerrit_upload_test( |
| 1463 | ['--squash', '--edit-description'], |
| 1464 | description, |
| 1465 | [], |
| 1466 | fetched_description=fetched_description, |
| 1467 | squash=True, |
| 1468 | expected_upstream_ref='origin/master', |
| 1469 | issue=123456, |
| 1470 | change_id='123456789', |
| 1471 | original_title='User input', |
| 1472 | edit_description=description) |
| 1473 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1474 | @mock.patch('git_cl.RunGit') |
| 1475 | @mock.patch('git_cl.CMDupload') |
| 1476 | @mock.patch('git_cl.ask_for_data') |
| 1477 | def test_upload_branch_deps(self, *_mocks): |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1478 | def mock_run_git(*args, **_kwargs): |
| 1479 | if args[0] == ['for-each-ref', |
| 1480 | '--format=%(refname:short) %(upstream:short)', |
| 1481 | 'refs/heads']: |
| 1482 | # Create a local branch dependency tree that looks like this: |
| 1483 | # test1 -> test2 -> test3 -> test4 -> test5 |
| 1484 | # -> test3.1 |
| 1485 | # test6 -> test0 |
| 1486 | branch_deps = [ |
| 1487 | 'test2 test1', # test1 -> test2 |
| 1488 | 'test3 test2', # test2 -> test3 |
| 1489 | 'test3.1 test2', # test2 -> test3.1 |
| 1490 | 'test4 test3', # test3 -> test4 |
| 1491 | 'test5 test4', # test4 -> test5 |
| 1492 | 'test6 test0', # test0 -> test6 |
| 1493 | 'test7', # test7 |
| 1494 | ] |
| 1495 | return '\n'.join(branch_deps) |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1496 | git_cl.RunGit.side_effect = mock_run_git |
| 1497 | git_cl.CMDupload.return_value = 0 |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1498 | |
| 1499 | class MockChangelist(): |
| 1500 | def __init__(self): |
| 1501 | pass |
| 1502 | def GetBranch(self): |
| 1503 | return 'test1' |
| 1504 | def GetIssue(self): |
| 1505 | return '123' |
| 1506 | def GetPatchset(self): |
| 1507 | return '1001' |
tandrii@chromium.org | 4c72b08 | 2016-03-31 22:26:35 +0000 | [diff] [blame] | 1508 | def IsGerrit(self): |
| 1509 | return False |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1510 | |
| 1511 | ret = git_cl.upload_branch_deps(MockChangelist(), []) |
| 1512 | # CMDupload should have been called 5 times because of 5 dependent branches. |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1513 | self.assertEqual(5, len(git_cl.CMDupload.mock_calls)) |
| 1514 | git_cl.ask_for_data.assert_called_once_with( |
| 1515 | 'This command will checkout all dependent branches ' |
| 1516 | 'and run "git cl upload". Press Enter to continue, ' |
| 1517 | 'or Ctrl+C to abort') |
Raphael Kubo da Costa | e9342a7 | 2019-10-14 17:49:39 +0000 | [diff] [blame] | 1518 | self.assertEqual(0, ret) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1519 | |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 1520 | def test_gerrit_change_id(self): |
| 1521 | self.calls = [ |
| 1522 | ((['git', 'write-tree'], ), |
| 1523 | 'hashtree'), |
| 1524 | ((['git', 'rev-parse', 'HEAD~0'], ), |
| 1525 | 'branch-parent'), |
| 1526 | ((['git', 'var', 'GIT_AUTHOR_IDENT'], ), |
| 1527 | 'A B <a@b.org> 1456848326 +0100'), |
| 1528 | ((['git', 'var', 'GIT_COMMITTER_IDENT'], ), |
| 1529 | 'C D <c@d.org> 1456858326 +0100'), |
| 1530 | ((['git', 'hash-object', '-t', 'commit', '--stdin'], ), |
| 1531 | 'hashchange'), |
| 1532 | ] |
| 1533 | change_id = git_cl.GenerateGerritChangeId('line1\nline2\n') |
| 1534 | self.assertEqual(change_id, 'Ihashchange') |
| 1535 | |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 1536 | def test_desecription_append_footer(self): |
| 1537 | for init_desc, footer_line, expected_desc in [ |
| 1538 | # Use unique desc first lines for easy test failure identification. |
| 1539 | ('foo', 'R=one', 'foo\n\nR=one'), |
| 1540 | ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='), |
| 1541 | ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'), |
| 1542 | ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'), |
| 1543 | ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two', |
| 1544 | 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'), |
| 1545 | ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz', |
| 1546 | 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'), |
| 1547 | ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz', |
| 1548 | 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'), |
| 1549 | ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'), |
| 1550 | ]: |
| 1551 | desc = git_cl.ChangeDescription(init_desc) |
| 1552 | desc.append_footer(footer_line) |
| 1553 | self.assertEqual(desc.description, expected_desc) |
| 1554 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1555 | def test_update_reviewers(self): |
| 1556 | data = [ |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 1557 | ('foo', [], [], |
| 1558 | 'foo'), |
| 1559 | ('foo\nR=xx', [], [], |
| 1560 | 'foo\nR=xx'), |
| 1561 | ('foo\nTBR=xx', [], [], |
| 1562 | 'foo\nTBR=xx'), |
| 1563 | ('foo', ['a@c'], [], |
| 1564 | 'foo\n\nR=a@c'), |
| 1565 | ('foo\nR=xx', ['a@c'], [], |
| 1566 | 'foo\n\nR=a@c, xx'), |
| 1567 | ('foo\nTBR=xx', ['a@c'], [], |
| 1568 | 'foo\n\nR=a@c\nTBR=xx'), |
| 1569 | ('foo\nTBR=xx\nR=yy', ['a@c'], [], |
| 1570 | 'foo\n\nR=a@c, yy\nTBR=xx'), |
| 1571 | ('foo\nBUG=', ['a@c'], [], |
| 1572 | 'foo\nBUG=\nR=a@c'), |
| 1573 | ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [], |
| 1574 | 'foo\n\nR=a@c, bar, xx\nTBR=yy'), |
| 1575 | ('foo', ['a@c', 'b@c'], [], |
| 1576 | 'foo\n\nR=a@c, b@c'), |
| 1577 | ('foo\nBar\n\nR=\nBUG=', ['c@c'], [], |
| 1578 | 'foo\nBar\n\nR=c@c\nBUG='), |
| 1579 | ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [], |
| 1580 | 'foo\nBar\n\nR=c@c\nBUG='), |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1581 | # Same as the line before, but full of whitespaces. |
| 1582 | ( |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 1583 | 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [], |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1584 | 'foo\nBar\n\nR=c@c\n BUG =', |
| 1585 | ), |
| 1586 | # Whitespaces aren't interpreted as new lines. |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 1587 | ('foo BUG=allo R=joe ', ['c@c'], [], |
| 1588 | 'foo BUG=allo R=joe\n\nR=c@c'), |
| 1589 | # Redundant TBRs get promoted to Rs |
| 1590 | ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'], |
| 1591 | 'foo\n\nR=a@c, b@c\nTBR=t@c'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1592 | ] |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 1593 | expected = [i[-1] for i in data] |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1594 | actual = [] |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 1595 | for orig, reviewers, tbrs, _expected in data: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1596 | obj = git_cl.ChangeDescription(orig) |
Robert Iannucci | 6c98dc6 | 2017-04-18 11:38:00 -0700 | [diff] [blame] | 1597 | obj.update_reviewers(reviewers, tbrs) |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1598 | actual.append(obj.description) |
| 1599 | self.assertEqual(expected, actual) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1600 | |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 1601 | def test_get_hash_tags(self): |
| 1602 | cases = [ |
| 1603 | ('', []), |
| 1604 | ('a', []), |
| 1605 | ('[a]', ['a']), |
| 1606 | ('[aa]', ['aa']), |
| 1607 | ('[a ]', ['a']), |
| 1608 | ('[a- ]', ['a']), |
| 1609 | ('[a- b]', ['a-b']), |
| 1610 | ('[a--b]', ['a-b']), |
| 1611 | ('[a', []), |
| 1612 | ('[a]x', ['a']), |
| 1613 | ('[aa]x', ['aa']), |
| 1614 | ('[a b]', ['a-b']), |
| 1615 | ('[a b]', ['a-b']), |
| 1616 | ('[a__b]', ['a-b']), |
| 1617 | ('[a] x', ['a']), |
| 1618 | ('[a][b]', ['a', 'b']), |
| 1619 | ('[a] [b]', ['a', 'b']), |
| 1620 | ('[a][b]x', ['a', 'b']), |
| 1621 | ('[a][b] x', ['a', 'b']), |
| 1622 | ('[a]\n[b]', ['a']), |
| 1623 | ('[a\nb]', []), |
| 1624 | ('[a][', ['a']), |
| 1625 | ('Revert "[a] feature"', ['a']), |
| 1626 | ('Reland "[a] feature"', ['a']), |
| 1627 | ('Revert: [a] feature', ['a']), |
| 1628 | ('Reland: [a] feature', ['a']), |
| 1629 | ('Revert "Reland: [a] feature"', ['a']), |
| 1630 | ('Foo: feature', ['foo']), |
| 1631 | ('Foo Bar: feature', ['foo-bar']), |
Anthony Polito | 02b5af3 | 2019-12-02 19:49:47 +0000 | [diff] [blame] | 1632 | ('Change Foo::Bar', []), |
| 1633 | ('Foo: Change Foo::Bar', ['foo']), |
Nodir Turakulov | 23b8214 | 2017-11-16 11:04:25 -0800 | [diff] [blame] | 1634 | ('Revert "Foo bar: feature"', ['foo-bar']), |
| 1635 | ('Reland "Foo bar: feature"', ['foo-bar']), |
| 1636 | ] |
| 1637 | for desc, expected in cases: |
| 1638 | change_desc = git_cl.ChangeDescription(desc) |
| 1639 | actual = change_desc.get_hash_tags() |
| 1640 | self.assertEqual( |
| 1641 | actual, |
| 1642 | expected, |
| 1643 | 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected)) |
| 1644 | |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1645 | self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master')) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1646 | self.assertEqual(None, git_cl.GetTargetRef(None, |
| 1647 | 'refs/remotes/origin/master', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1648 | 'master')) |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1649 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1650 | # Check default target refs for branches. |
| 1651 | self.assertEqual('refs/heads/master', |
| 1652 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/master', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1653 | None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1654 | self.assertEqual('refs/heads/master', |
| 1655 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1656 | None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1657 | self.assertEqual('refs/heads/master', |
| 1658 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1659 | None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1660 | self.assertEqual('refs/branch-heads/123', |
| 1661 | git_cl.GetTargetRef('origin', |
| 1662 | 'refs/remotes/branch-heads/123', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1663 | None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1664 | self.assertEqual('refs/diff/test', |
| 1665 | git_cl.GetTargetRef('origin', |
| 1666 | 'refs/remotes/origin/refs/diff/test', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1667 | None)) |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 1668 | self.assertEqual('refs/heads/chrome/m42', |
| 1669 | git_cl.GetTargetRef('origin', |
| 1670 | 'refs/remotes/origin/chrome/m42', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1671 | None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1672 | |
| 1673 | # Check target refs for user-specified target branch. |
| 1674 | for branch in ('branch-heads/123', 'remotes/branch-heads/123', |
| 1675 | 'refs/remotes/branch-heads/123'): |
| 1676 | self.assertEqual('refs/branch-heads/123', |
| 1677 | git_cl.GetTargetRef('origin', |
| 1678 | 'refs/remotes/origin/master', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1679 | branch)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1680 | for branch in ('origin/master', 'remotes/origin/master', |
| 1681 | 'refs/remotes/origin/master'): |
| 1682 | self.assertEqual('refs/heads/master', |
| 1683 | git_cl.GetTargetRef('origin', |
| 1684 | 'refs/remotes/branch-heads/123', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1685 | branch)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1686 | for branch in ('master', 'heads/master', 'refs/heads/master'): |
| 1687 | self.assertEqual('refs/heads/master', |
| 1688 | git_cl.GetTargetRef('origin', |
| 1689 | 'refs/remotes/branch-heads/123', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1690 | branch)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1691 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1692 | @mock.patch('git_common.is_dirty_git_tree', return_value=True) |
| 1693 | def test_patch_when_dirty(self, *_mocks): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 1694 | # Patch when local tree is dirty. |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1695 | self.assertNotEqual(git_cl.main(['patch', '123456']), 0) |
| 1696 | |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1697 | def assertIssueAndPatchset( |
| 1698 | self, branch='master', issue='123456', patchset='7', |
| 1699 | git_short_host='chromium'): |
| 1700 | self.assertEqual( |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1701 | issue, scm.GIT.GetBranchConfig('', branch, 'gerritissue')) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1702 | self.assertEqual( |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1703 | patchset, scm.GIT.GetBranchConfig('', branch, 'gerritpatchset')) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1704 | self.assertEqual( |
| 1705 | 'https://%s-review.googlesource.com' % git_short_host, |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1706 | scm.GIT.GetBranchConfig('', branch, 'gerritserver')) |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1707 | |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1708 | def _patch_common(self, git_short_host='chromium'): |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1709 | mock.patch('git_cl.IsGitVersionAtLeast', return_value=True).start() |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1710 | self.mockGit.config['remote.origin.url'] = ( |
| 1711 | 'https://%s.googlesource.com/my/repo' % git_short_host) |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 1712 | gerrit_util.GetChangeDetail.return_value = { |
| 1713 | 'current_revision': '7777777777', |
| 1714 | 'revisions': { |
| 1715 | '1111111111': { |
| 1716 | '_number': 1, |
| 1717 | 'fetch': {'http': { |
| 1718 | 'url': 'https://%s.googlesource.com/my/repo' % git_short_host, |
| 1719 | 'ref': 'refs/changes/56/123456/1', |
| 1720 | }}, |
| 1721 | }, |
| 1722 | '7777777777': { |
| 1723 | '_number': 7, |
| 1724 | 'fetch': {'http': { |
| 1725 | 'url': 'https://%s.googlesource.com/my/repo' % git_short_host, |
| 1726 | 'ref': 'refs/changes/56/123456/7', |
| 1727 | }}, |
| 1728 | }, |
| 1729 | }, |
| 1730 | } |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1731 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1732 | def test_patch_gerrit_default(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1733 | self._patch_common() |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1734 | self.calls += [ |
| 1735 | ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
| 1736 | 'refs/changes/56/123456/7'],), ''), |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 1737 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
Aaron Gable | 9387b4f | 2017-06-08 10:50:03 -0700 | [diff] [blame] | 1738 | ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1739 | ] |
| 1740 | self.assertEqual(git_cl.main(['patch', '123456']), 0) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1741 | self.assertIssueAndPatchset() |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1742 | |
Andrii Shyshkalov | f57841b | 2018-08-28 00:48:53 +0000 | [diff] [blame] | 1743 | def test_patch_gerrit_new_branch(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1744 | self._patch_common() |
Andrii Shyshkalov | f57841b | 2018-08-28 00:48:53 +0000 | [diff] [blame] | 1745 | self.calls += [ |
| 1746 | ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
| 1747 | 'refs/changes/56/123456/7'],), ''), |
| 1748 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
Andrii Shyshkalov | f57841b | 2018-08-28 00:48:53 +0000 | [diff] [blame] | 1749 | ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'), |
Andrii Shyshkalov | f57841b | 2018-08-28 00:48:53 +0000 | [diff] [blame] | 1750 | ] |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1751 | self.assertEqual(git_cl.main(['patch', '-b', 'feature', '123456']), 0) |
| 1752 | self.assertIssueAndPatchset(branch='feature') |
Andrii Shyshkalov | f57841b | 2018-08-28 00:48:53 +0000 | [diff] [blame] | 1753 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1754 | def test_patch_gerrit_force(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1755 | self._patch_common('host') |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1756 | self.calls += [ |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1757 | ((['git', 'fetch', 'https://host.googlesource.com/my/repo', |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1758 | 'refs/changes/56/123456/7'],), ''), |
Aaron Gable | 9387b4f | 2017-06-08 10:50:03 -0700 | [diff] [blame] | 1759 | ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''), |
Aaron Gable | 9387b4f | 2017-06-08 10:50:03 -0700 | [diff] [blame] | 1760 | ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'), |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1761 | ] |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 1762 | self.assertEqual(git_cl.main(['patch', '123456', '--force']), 0) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1763 | self.assertIssueAndPatchset(git_short_host='host') |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1764 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1765 | def test_patch_gerrit_guess_by_url(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1766 | self._patch_common('else') |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1767 | self.calls += [ |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1768 | ((['git', 'fetch', 'https://else.googlesource.com/my/repo', |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1769 | 'refs/changes/56/123456/1'],), ''), |
Aaron Gable | 62619a3 | 2017-06-16 08:22:09 -0700 | [diff] [blame] | 1770 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
Aaron Gable | 9387b4f | 2017-06-08 10:50:03 -0700 | [diff] [blame] | 1771 | ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1772 | ] |
| 1773 | self.assertEqual(git_cl.main( |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1774 | ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1775 | self.assertIssueAndPatchset(patchset='1', git_short_host='else') |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1776 | |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 1777 | def test_patch_gerrit_guess_by_url_with_repo(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1778 | self._patch_common('else') |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 1779 | self.calls += [ |
| 1780 | ((['git', 'fetch', 'https://else.googlesource.com/my/repo', |
| 1781 | 'refs/changes/56/123456/1'],), ''), |
| 1782 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 1783 | ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'), |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 1784 | ] |
| 1785 | self.assertEqual(git_cl.main( |
| 1786 | ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']), |
| 1787 | 0) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1788 | self.assertIssueAndPatchset(patchset='1', git_short_host='else') |
Aaron Gable | 697a91b | 2018-01-19 15:20:15 -0800 | [diff] [blame] | 1789 | |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 1790 | @mock.patch('sys.stderr', StringIO()) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1791 | def test_patch_gerrit_conflict(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1792 | self._patch_common() |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1793 | self.calls += [ |
| 1794 | ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1795 | 'refs/changes/56/123456/7'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1796 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1797 | ] |
| 1798 | with self.assertRaises(SystemExitMock): |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1799 | git_cl.main(['patch', '123456']) |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 1800 | self.assertEqual( |
| 1801 | 'Command "git cherry-pick FETCH_HEAD" failed.\n\n', |
| 1802 | sys.stderr.getvalue()) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 1803 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1804 | @mock.patch( |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 1805 | 'gerrit_util.GetChangeDetail', |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1806 | side_effect=gerrit_util.GerritError(404, '')) |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 1807 | @mock.patch('sys.stderr', StringIO()) |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1808 | def test_patch_gerrit_not_exists(self, *_mocks): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1809 | self.mockGit.config['remote.origin.url'] = ( |
| 1810 | 'https://chromium.googlesource.com/my/repo') |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 1811 | with self.assertRaises(SystemExitMock): |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1812 | self.assertEqual(1, git_cl.main(['patch', '123456'])) |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 1813 | self.assertEqual( |
| 1814 | 'change 123456 at https://chromium-review.googlesource.com does not ' |
| 1815 | 'exist or you have no access to it\n', |
| 1816 | sys.stderr.getvalue()) |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 1817 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 1818 | def _checkout_calls(self): |
| 1819 | return [ |
| 1820 | ((['git', 'config', '--local', '--get-regexp', |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 1821 | 'branch\\..*\\.gerritissue'], ), |
| 1822 | ('branch.ger-branch.gerritissue 123456\n' |
| 1823 | 'branch.gbranch654.gerritissue 654321\n')), |
| 1824 | ] |
| 1825 | |
| 1826 | def test_checkout_gerrit(self): |
| 1827 | """Tests git cl checkout <issue>.""" |
| 1828 | self.calls = self._checkout_calls() |
| 1829 | self.calls += [((['git', 'checkout', 'ger-branch'], ), '')] |
| 1830 | self.assertEqual(0, git_cl.main(['checkout', '123456'])) |
| 1831 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 1832 | def test_checkout_not_found(self): |
| 1833 | """Tests git cl checkout <issue>.""" |
| 1834 | self.calls = self._checkout_calls() |
| 1835 | self.assertEqual(1, git_cl.main(['checkout', '99999'])) |
| 1836 | |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 1837 | def test_checkout_no_branch_issues(self): |
| 1838 | """Tests git cl checkout <issue>.""" |
| 1839 | self.calls = [ |
| 1840 | ((['git', 'config', '--local', '--get-regexp', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1841 | 'branch\\..*\\.gerritissue'], ), CERR1), |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 1842 | ] |
| 1843 | self.assertEqual(1, git_cl.main(['checkout', '99999'])) |
| 1844 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1845 | def _test_gerrit_ensure_authenticated_common(self, auth): |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1846 | mock.patch('git_cl.gerrit_util.CookiesAuthenticator', |
| 1847 | CookiesAuthenticatorMockFactory(hosts_with_creds=auth)).start() |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1848 | self.mockGit.config['remote.origin.url'] = ( |
| 1849 | 'https://chromium.googlesource.com/my/repo') |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1850 | cl = git_cl.Changelist() |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1851 | cl.branch = 'master' |
| 1852 | cl.branchref = 'refs/heads/master' |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1853 | return cl |
| 1854 | |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 1855 | @mock.patch('sys.stderr', StringIO()) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1856 | def test_gerrit_ensure_authenticated_missing(self): |
| 1857 | cl = self._test_gerrit_ensure_authenticated_common(auth={ |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1858 | 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1859 | }) |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 1860 | with self.assertRaises(SystemExitMock): |
| 1861 | cl.EnsureAuthenticated(force=False) |
| 1862 | self.assertEqual( |
| 1863 | 'Credentials for the following hosts are required:\n' |
| 1864 | ' chromium-review.googlesource.com\n' |
| 1865 | 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n' |
| 1866 | 'You can (re)generate your credentials by visiting ' |
| 1867 | 'https://chromium-review.googlesource.com/new-password\n', |
| 1868 | sys.stderr.getvalue()) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1869 | |
| 1870 | def test_gerrit_ensure_authenticated_conflict(self): |
| 1871 | cl = self._test_gerrit_ensure_authenticated_common(auth={ |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1872 | 'chromium.googlesource.com': |
| 1873 | ('git-one.example.com', None, 'secret1'), |
| 1874 | 'chromium-review.googlesource.com': |
| 1875 | ('git-other.example.com', None, 'secret2'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1876 | }) |
| 1877 | self.calls.append( |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 1878 | (('ask_for_data', 'If you know what you are doing ' |
| 1879 | 'press Enter to continue, or Ctrl+C to abort'), '')) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1880 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 1881 | |
| 1882 | def test_gerrit_ensure_authenticated_ok(self): |
| 1883 | cl = self._test_gerrit_ensure_authenticated_common(auth={ |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1884 | 'chromium.googlesource.com': |
| 1885 | ('git-same.example.com', None, 'secret'), |
| 1886 | 'chromium-review.googlesource.com': |
| 1887 | ('git-same.example.com', None, 'secret'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1888 | }) |
| 1889 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 1890 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1891 | def test_gerrit_ensure_authenticated_skipped(self): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1892 | self.mockGit.config['gerrit.skip-ensure-authenticated'] = 'true' |
| 1893 | cl = self._test_gerrit_ensure_authenticated_common(auth={}) |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1894 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 1895 | |
Eric Boren | 2fb6310 | 2018-10-05 13:05:03 +0000 | [diff] [blame] | 1896 | def test_gerrit_ensure_authenticated_bearer_token(self): |
| 1897 | cl = self._test_gerrit_ensure_authenticated_common(auth={ |
| 1898 | 'chromium.googlesource.com': |
| 1899 | ('', None, 'secret'), |
| 1900 | 'chromium-review.googlesource.com': |
| 1901 | ('', None, 'secret'), |
| 1902 | }) |
| 1903 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 1904 | header = gerrit_util.CookiesAuthenticator().get_auth_header( |
| 1905 | 'chromium.googlesource.com') |
| 1906 | self.assertTrue('Bearer' in header) |
| 1907 | |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 1908 | def test_gerrit_ensure_authenticated_non_https(self): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1909 | self.mockGit.config['remote.origin.url'] = 'custom-scheme://repo' |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 1910 | self.calls = [ |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 1911 | (('logging.warning', |
| 1912 | 'Ignoring branch %(branch)s with non-https remote ' |
| 1913 | '%(remote)s', { |
| 1914 | 'branch': 'master', |
| 1915 | 'remote': 'custom-scheme://repo'} |
| 1916 | ), None), |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 1917 | ] |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1918 | mock.patch('git_cl.gerrit_util.CookiesAuthenticator', |
| 1919 | CookiesAuthenticatorMockFactory(hosts_with_creds={})).start() |
| 1920 | mock.patch('logging.warning', |
| 1921 | lambda *a: self._mocked_call('logging.warning', *a)).start() |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 1922 | cl = git_cl.Changelist() |
Daniel Cheng | cf6269b | 2019-05-18 01:02:12 +0000 | [diff] [blame] | 1923 | cl.branch = 'master' |
| 1924 | cl.branchref = 'refs/heads/master' |
| 1925 | cl.lookedup_issue = True |
| 1926 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 1927 | |
Florian Mayer | ae510e8 | 2020-01-30 21:04:48 +0000 | [diff] [blame] | 1928 | def test_gerrit_ensure_authenticated_non_url(self): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1929 | self.mockGit.config['remote.origin.url'] = ( |
| 1930 | 'git@somehost.example:foo/bar.git') |
Florian Mayer | ae510e8 | 2020-01-30 21:04:48 +0000 | [diff] [blame] | 1931 | self.calls = [ |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 1932 | (('logging.error', |
| 1933 | 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", ' |
| 1934 | 'but it doesn\'t exist.', { |
| 1935 | 'remote': 'origin', |
| 1936 | 'branch': 'master', |
| 1937 | 'url': 'git@somehost.example:foo/bar.git'} |
| 1938 | ), None), |
Florian Mayer | ae510e8 | 2020-01-30 21:04:48 +0000 | [diff] [blame] | 1939 | ] |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1940 | mock.patch('git_cl.gerrit_util.CookiesAuthenticator', |
| 1941 | CookiesAuthenticatorMockFactory(hosts_with_creds={})).start() |
| 1942 | mock.patch('logging.error', |
| 1943 | lambda *a: self._mocked_call('logging.error', *a)).start() |
Florian Mayer | ae510e8 | 2020-01-30 21:04:48 +0000 | [diff] [blame] | 1944 | cl = git_cl.Changelist() |
| 1945 | cl.branch = 'master' |
| 1946 | cl.branchref = 'refs/heads/master' |
| 1947 | cl.lookedup_issue = True |
| 1948 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 1949 | |
Andrii Shyshkalov | 828701b | 2016-12-09 10:46:47 +0100 | [diff] [blame] | 1950 | def _cmd_set_commit_gerrit_common(self, vote, notify=None): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 1951 | self.mockGit.config['branch.master.gerritissue'] = '123' |
| 1952 | self.mockGit.config['branch.master.gerritserver'] = ( |
| 1953 | 'https://chromium-review.googlesource.com') |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 1954 | self.mockGit.config['remote.origin.url'] = ( |
| 1955 | 'https://chromium.googlesource.com/infra/infra') |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1956 | self.calls = [ |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1957 | (('SetReview', 'chromium-review.googlesource.com', |
| 1958 | 'infra%2Finfra~123', None, |
| 1959 | {'Commit-Queue': vote}, notify, None), ''), |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1960 | ] |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 1961 | |
| 1962 | def test_cmd_set_commit_gerrit_clear(self): |
| 1963 | self._cmd_set_commit_gerrit_common(0) |
| 1964 | self.assertEqual(0, git_cl.main(['set-commit', '-c'])) |
| 1965 | |
| 1966 | def test_cmd_set_commit_gerrit_dry(self): |
Aaron Gable | 75e7872 | 2017-06-09 10:40:16 -0700 | [diff] [blame] | 1967 | self._cmd_set_commit_gerrit_common(1, notify=False) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 1968 | self.assertEqual(0, git_cl.main(['set-commit', '-d'])) |
| 1969 | |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 1970 | def test_cmd_set_commit_gerrit(self): |
| 1971 | self._cmd_set_commit_gerrit_common(2) |
| 1972 | self.assertEqual(0, git_cl.main(['set-commit'])) |
| 1973 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 1974 | def test_description_display(self): |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1975 | mock.patch('git_cl.Changelist', ChangelistMock).start() |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 1976 | ChangelistMock.desc = 'foo\n' |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 1977 | |
| 1978 | self.assertEqual(0, git_cl.main(['description', '-d'])) |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1979 | self.assertEqual('foo\n', sys.stdout.getvalue()) |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 1980 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1981 | @mock.patch('sys.stderr', StringIO()) |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 1982 | def test_StatusFieldOverrideIssueMissingArgs(self): |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 1983 | try: |
| 1984 | self.assertEqual(git_cl.main(['status', '--issue', '1']), 0) |
Edward Lemur | d55c507 | 2020-02-20 01:09:07 +0000 | [diff] [blame] | 1985 | except SystemExitMock: |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 1986 | self.assertIn( |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1987 | '--field must be given when --issue is set.', sys.stderr.getvalue()) |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 1988 | |
| 1989 | def test_StatusFieldOverrideIssue(self): |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 1990 | def assertIssue(cl_self, *_args): |
Raphael Kubo da Costa | e9342a7 | 2019-10-14 17:49:39 +0000 | [diff] [blame] | 1991 | self.assertEqual(cl_self.issue, 1) |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 1992 | return 'foobar' |
| 1993 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1994 | mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start() |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 1995 | self.assertEqual( |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 1996 | git_cl.main(['status', '--issue', '1', '--field', 'desc']), |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 1997 | 0) |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 1998 | self.assertEqual(sys.stdout.getvalue(), 'foobar\n') |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 1999 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2000 | def test_SetCloseOverrideIssue(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2001 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2002 | def assertIssue(cl_self, *_args): |
Raphael Kubo da Costa | e9342a7 | 2019-10-14 17:49:39 +0000 | [diff] [blame] | 2003 | self.assertEqual(cl_self.issue, 1) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2004 | return 'foobar' |
| 2005 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2006 | mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start() |
| 2007 | mock.patch('git_cl.Changelist.CloseIssue', lambda *_: None).start() |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2008 | self.assertEqual( |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 2009 | git_cl.main(['set-close', '--issue', '1']), 0) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2010 | |
Andrii Shyshkalov | dd672fb | 2018-10-16 06:09:51 +0000 | [diff] [blame] | 2011 | def test_description(self): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 2012 | self.mockGit.config['remote.origin.url'] = ( |
| 2013 | 'https://chromium.googlesource.com/my/repo') |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2014 | gerrit_util.GetChangeDetail.return_value = { |
| 2015 | 'current_revision': 'sha1', |
| 2016 | 'revisions': {'sha1': { |
| 2017 | 'commit': {'message': 'foobar'}, |
| 2018 | }}, |
| 2019 | } |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 2020 | self.assertEqual(0, git_cl.main([ |
Andrii Shyshkalov | dd672fb | 2018-10-16 06:09:51 +0000 | [diff] [blame] | 2021 | 'description', |
| 2022 | 'https://chromium-review.googlesource.com/c/my/repo/+/123123', |
| 2023 | '-d'])) |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2024 | self.assertEqual('foobar\n', sys.stdout.getvalue()) |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 2025 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 2026 | def test_description_set_raw(self): |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2027 | mock.patch('git_cl.Changelist', ChangelistMock).start() |
| 2028 | mock.patch('git_cl.sys.stdin', StringIO('hihi')).start() |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 2029 | |
| 2030 | self.assertEqual(0, git_cl.main(['description', '-n', 'hihi'])) |
| 2031 | self.assertEqual('hihi', ChangelistMock.desc) |
| 2032 | |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2033 | def test_description_appends_bug_line(self): |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 2034 | current_desc = 'Some.\n\nChange-Id: xxx' |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2035 | |
| 2036 | def RunEditor(desc, _, **kwargs): |
Raphael Kubo da Costa | e9342a7 | 2019-10-14 17:49:39 +0000 | [diff] [blame] | 2037 | self.assertEqual( |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2038 | '# Enter a description of the change.\n' |
| 2039 | '# This will be displayed on the codereview site.\n' |
| 2040 | '# The first line will also be used as the subject of the review.\n' |
| 2041 | '#--------------------This line is 72 characters long' |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 2042 | '--------------------\n' |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 2043 | 'Some.\n\nChange-Id: xxx\nBug: ', |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2044 | desc) |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 2045 | # Simulate user changing something. |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 2046 | return 'Some.\n\nChange-Id: xxx\nBug: 123' |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2047 | |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 2048 | def UpdateDescription(_, desc, force=False): |
Raphael Kubo da Costa | e9342a7 | 2019-10-14 17:49:39 +0000 | [diff] [blame] | 2049 | self.assertEqual(desc, 'Some.\n\nChange-Id: xxx\nBug: 123') |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2050 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2051 | mock.patch('git_cl.Changelist.FetchDescription', |
| 2052 | lambda *args: current_desc).start() |
| 2053 | mock.patch('git_cl.Changelist.UpdateDescription', |
| 2054 | UpdateDescription).start() |
| 2055 | mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start() |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2056 | |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 2057 | self.mockGit.config['branch.master.gerritissue'] = '123' |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 2058 | self.assertEqual(0, git_cl.main(['description'])) |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2059 | |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2060 | def test_description_does_not_append_bug_line_if_fixed_is_present(self): |
| 2061 | current_desc = 'Some.\n\nFixed: 123\nChange-Id: xxx' |
| 2062 | |
| 2063 | def RunEditor(desc, _, **kwargs): |
Raphael Kubo da Costa | e9342a7 | 2019-10-14 17:49:39 +0000 | [diff] [blame] | 2064 | self.assertEqual( |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2065 | '# Enter a description of the change.\n' |
| 2066 | '# This will be displayed on the codereview site.\n' |
| 2067 | '# The first line will also be used as the subject of the review.\n' |
| 2068 | '#--------------------This line is 72 characters long' |
| 2069 | '--------------------\n' |
| 2070 | 'Some.\n\nFixed: 123\nChange-Id: xxx', |
| 2071 | desc) |
| 2072 | return desc |
| 2073 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2074 | mock.patch('git_cl.Changelist.FetchDescription', |
| 2075 | lambda *args: current_desc).start() |
| 2076 | mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start() |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2077 | |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 2078 | self.mockGit.config['branch.master.gerritissue'] = '123' |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 2079 | self.assertEqual(0, git_cl.main(['description'])) |
Dan Beam | d8b04ca | 2019-10-10 21:23:26 +0000 | [diff] [blame] | 2080 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 2081 | def test_description_set_stdin(self): |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2082 | mock.patch('git_cl.Changelist', ChangelistMock).start() |
| 2083 | mock.patch('git_cl.sys.stdin', StringIO('hi \r\n\t there\n\nman')).start() |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 2084 | |
| 2085 | self.assertEqual(0, git_cl.main(['description', '-n', '-'])) |
| 2086 | self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc) |
| 2087 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2088 | def test_archive(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2089 | self.calls = [ |
| 2090 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2091 | 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2092 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''), |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2093 | ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''), |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2094 | ((['git', 'branch', '-D', 'foo'],), '') |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2095 | ] |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2096 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2097 | mock.patch('git_cl.get_cl_statuses', |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2098 | lambda branches, fine_grained, max_processes: |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2099 | [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| 2100 | (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2101 | (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start() |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2102 | |
| 2103 | self.assertEqual(0, git_cl.main(['archive', '-f'])) |
| 2104 | |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2105 | def test_archive_tag_collision(self): |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2106 | self.calls = [ |
| 2107 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 2108 | 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
| 2109 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), |
| 2110 | 'refs/tags/git-cl-archived-456-foo'), |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2111 | ((['git', 'tag', 'git-cl-archived-456-foo-2', 'foo'],), ''), |
| 2112 | ((['git', 'branch', '-D', 'foo'],), '') |
| 2113 | ] |
| 2114 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2115 | mock.patch('git_cl.get_cl_statuses', |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2116 | lambda branches, fine_grained, max_processes: |
| 2117 | [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| 2118 | (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2119 | (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start() |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2120 | |
| 2121 | self.assertEqual(0, git_cl.main(['archive', '-f'])) |
| 2122 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2123 | def test_archive_current_branch_fails(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2124 | self.calls = [ |
| 2125 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 2126 | 'refs/heads/master'), |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2127 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''), |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2128 | ] |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2129 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2130 | mock.patch('git_cl.get_cl_statuses', |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2131 | lambda branches, fine_grained, max_processes: |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2132 | [(MockChangelistWithBranchAndIssue('master', 1), |
| 2133 | 'closed')]).start() |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2134 | |
| 2135 | self.assertEqual(1, git_cl.main(['archive', '-f'])) |
| 2136 | |
| 2137 | def test_archive_dry_run(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2138 | self.calls = [ |
| 2139 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 2140 | 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2141 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''), |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2142 | ] |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2143 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2144 | mock.patch('git_cl.get_cl_statuses', |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2145 | lambda branches, fine_grained, max_processes: |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2146 | [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| 2147 | (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2148 | (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start() |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2149 | |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2150 | self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run'])) |
| 2151 | |
| 2152 | def test_archive_no_tags(self): |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2153 | self.calls = [ |
| 2154 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 2155 | 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2156 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''), |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2157 | ((['git', 'branch', '-D', 'foo'],), '') |
| 2158 | ] |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2159 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2160 | mock.patch('git_cl.get_cl_statuses', |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2161 | lambda branches, fine_grained, max_processes: |
| 2162 | [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| 2163 | (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2164 | (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start() |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2165 | |
| 2166 | self.assertEqual(0, git_cl.main(['archive', '-f', '--notags'])) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2167 | |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2168 | def test_archive_tag_cleanup_on_branch_deletion_error(self): |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2169 | self.calls = [ |
| 2170 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 2171 | 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
| 2172 | ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''), |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2173 | ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), |
| 2174 | 'refs/tags/git-cl-archived-456-foo'), |
| 2175 | ((['git', 'branch', '-D', 'foo'],), CERR1), |
| 2176 | ((['git', 'tag', '-d', 'git-cl-archived-456-foo'],), |
| 2177 | 'refs/tags/git-cl-archived-456-foo'), |
| 2178 | ] |
| 2179 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2180 | mock.patch('git_cl.get_cl_statuses', |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2181 | lambda branches, fine_grained, max_processes: |
| 2182 | [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| 2183 | (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2184 | (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start() |
Kevin Marshall | 0e60ecd | 2019-12-04 17:44:13 +0000 | [diff] [blame] | 2185 | |
| 2186 | self.assertEqual(0, git_cl.main(['archive', '-f'])) |
| 2187 | |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 2188 | def test_cmd_issue_erase_existing(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 2189 | self.mockGit.config['branch.master.gerritissue'] = '123' |
| 2190 | self.mockGit.config['branch.master.gerritserver'] = ( |
| 2191 | 'https://chromium-review.googlesource.com') |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 2192 | self.calls = [ |
Aaron Gable | ca01e2c | 2017-07-19 11:16:02 -0700 | [diff] [blame] | 2193 | ((['git', 'log', '-1', '--format=%B'],), 'This is a description'), |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 2194 | ] |
| 2195 | self.assertEqual(0, git_cl.main(['issue', '0'])) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 2196 | self.assertNotIn('branch.master.gerritissue', self.mockGit.config) |
| 2197 | self.assertNotIn('branch.master.gerritserver', self.mockGit.config) |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 2198 | |
Aaron Gable | 400e989 | 2017-07-12 15:31:21 -0700 | [diff] [blame] | 2199 | def test_cmd_issue_erase_existing_with_change_id(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 2200 | self.mockGit.config['branch.master.gerritissue'] = '123' |
| 2201 | self.mockGit.config['branch.master.gerritserver'] = ( |
| 2202 | 'https://chromium-review.googlesource.com') |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2203 | mock.patch('git_cl.Changelist.FetchDescription', |
| 2204 | lambda _: 'This is a description\n\nChange-Id: Ideadbeef').start() |
Aaron Gable | 400e989 | 2017-07-12 15:31:21 -0700 | [diff] [blame] | 2205 | self.calls = [ |
Aaron Gable | ca01e2c | 2017-07-19 11:16:02 -0700 | [diff] [blame] | 2206 | ((['git', 'log', '-1', '--format=%B'],), |
| 2207 | 'This is a description\n\nChange-Id: Ideadbeef'), |
| 2208 | ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''), |
Aaron Gable | 400e989 | 2017-07-12 15:31:21 -0700 | [diff] [blame] | 2209 | ] |
| 2210 | self.assertEqual(0, git_cl.main(['issue', '0'])) |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 2211 | self.assertNotIn('branch.master.gerritissue', self.mockGit.config) |
| 2212 | self.assertNotIn('branch.master.gerritserver', self.mockGit.config) |
Aaron Gable | 400e989 | 2017-07-12 15:31:21 -0700 | [diff] [blame] | 2213 | |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 2214 | def test_cmd_issue_json(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 2215 | self.mockGit.config['branch.master.gerritissue'] = '123' |
| 2216 | self.mockGit.config['branch.master.gerritserver'] = ( |
| 2217 | 'https://chromium-review.googlesource.com') |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 2218 | self.calls = [ |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 2219 | (('write_json', 'output.json', |
Andrii Shyshkalov | a185e2e | 2018-11-21 00:42:55 +0000 | [diff] [blame] | 2220 | {'issue': 123, |
| 2221 | 'issue_url': 'https://chromium-review.googlesource.com/123'}), |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 2222 | ''), |
| 2223 | ] |
| 2224 | self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json'])) |
| 2225 | |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2226 | def _common_GerritCommitMsgHookCheck(self): |
Edward Lemur | 15a9b8c | 2020-02-13 00:52:30 +0000 | [diff] [blame] | 2227 | mock.patch( |
| 2228 | 'git_cl.os.path.abspath', |
| 2229 | lambda path: self._mocked_call(['abspath', path])).start() |
| 2230 | mock.patch( |
| 2231 | 'git_cl.os.path.exists', |
| 2232 | lambda path: self._mocked_call(['exists', path])).start() |
| 2233 | mock.patch( |
| 2234 | 'git_cl.gclient_utils.FileRead', |
| 2235 | lambda path: self._mocked_call(['FileRead', path])).start() |
| 2236 | mock.patch( |
| 2237 | 'git_cl.gclient_utils.rm_file_or_tree', |
| 2238 | lambda path: self._mocked_call(['rm_file_or_tree', path])).start() |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2239 | return git_cl.Changelist(issue=123) |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2240 | |
| 2241 | def test_GerritCommitMsgHookCheck_custom_hook(self): |
| 2242 | cl = self._common_GerritCommitMsgHookCheck() |
| 2243 | self.calls += [ |
Edward Lemur | 15a9b8c | 2020-02-13 00:52:30 +0000 | [diff] [blame] | 2244 | ((['exists', '.git/hooks/commit-msg'],), True), |
| 2245 | ((['FileRead', '.git/hooks/commit-msg'],), |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2246 | '#!/bin/sh\necho "custom hook"') |
| 2247 | ] |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2248 | cl._GerritCommitMsgHookCheck(offer_removal=True) |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2249 | |
| 2250 | def test_GerritCommitMsgHookCheck_not_exists(self): |
| 2251 | cl = self._common_GerritCommitMsgHookCheck() |
| 2252 | self.calls += [ |
Edward Lemur | 15a9b8c | 2020-02-13 00:52:30 +0000 | [diff] [blame] | 2253 | ((['exists', '.git/hooks/commit-msg'],), False), |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2254 | ] |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2255 | cl._GerritCommitMsgHookCheck(offer_removal=True) |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2256 | |
| 2257 | def test_GerritCommitMsgHookCheck(self): |
| 2258 | cl = self._common_GerritCommitMsgHookCheck() |
| 2259 | self.calls += [ |
Edward Lemur | 15a9b8c | 2020-02-13 00:52:30 +0000 | [diff] [blame] | 2260 | ((['exists', '.git/hooks/commit-msg'],), True), |
| 2261 | ((['FileRead', '.git/hooks/commit-msg'],), |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2262 | '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'), |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2263 | (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'), |
Edward Lemur | 15a9b8c | 2020-02-13 00:52:30 +0000 | [diff] [blame] | 2264 | ((['rm_file_or_tree', '.git/hooks/commit-msg'],), |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2265 | ''), |
| 2266 | ] |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2267 | cl._GerritCommitMsgHookCheck(offer_removal=True) |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2268 | |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2269 | def test_GerritCmdLand(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 2270 | self.mockGit.config['branch.master.gerritsquashhash'] = 'deadbeaf' |
| 2271 | self.mockGit.config['branch.master.gerritserver'] = ( |
| 2272 | 'chromium-review.googlesource.com') |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2273 | self.calls += [ |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2274 | ((['git', 'diff', 'deadbeaf'],), ''), # No diff. |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2275 | ] |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2276 | cl = git_cl.Changelist(issue=123) |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2277 | cl._GetChangeDetail = lambda *args, **kwargs: { |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2278 | 'labels': {}, |
| 2279 | 'current_revision': 'deadbeaf', |
| 2280 | } |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2281 | cl._GetChangeCommit = lambda: { |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2282 | 'commit': 'deadbeef', |
Aaron Gable | 02cdbb4 | 2016-12-13 16:24:25 -0800 | [diff] [blame] | 2283 | 'web_links': [{'name': 'gitiles', |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2284 | 'url': 'https://git.googlesource.com/test/+/deadbeef'}], |
| 2285 | } |
Edward Lemur | 125d60a | 2019-09-13 18:25:41 +0000 | [diff] [blame] | 2286 | cl.SubmitIssue = lambda wait_for_merge: None |
Olivier Robin | 75ee725 | 2018-04-13 10:02:56 +0200 | [diff] [blame] | 2287 | self.assertEqual(0, cl.CMDLand(force=True, |
| 2288 | bypass_hooks=True, |
| 2289 | verbose=True, |
| 2290 | parallel=False)) |
Edward Lemur | 73c7670 | 2020-02-06 23:57:18 +0000 | [diff] [blame] | 2291 | self.assertIn( |
| 2292 | 'Issue chromium-review.googlesource.com/123 has been submitted', |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2293 | sys.stdout.getvalue()) |
Edward Lemur | 73c7670 | 2020-02-06 23:57:18 +0000 | [diff] [blame] | 2294 | self.assertIn( |
| 2295 | 'Landed as: https://git.googlesource.com/test/+/deadbeef', |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2296 | sys.stdout.getvalue()) |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2297 | |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2298 | def _mock_gerrit_changes_for_detail_cache(self): |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2299 | mock.patch('git_cl.Changelist._GetGerritHost', lambda _: 'host').start() |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2300 | |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2301 | def test_gerrit_change_detail_cache_simple(self): |
| 2302 | self._mock_gerrit_changes_for_detail_cache() |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2303 | gerrit_util.GetChangeDetail.side_effect = ['a', 'b'] |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2304 | cl1 = git_cl.Changelist(issue=1) |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2305 | cl1._cached_remote_url = ( |
| 2306 | True, 'https://chromium.googlesource.com/a/my/repo.git/') |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2307 | cl2 = git_cl.Changelist(issue=2) |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2308 | cl2._cached_remote_url = ( |
| 2309 | True, 'https://chromium.googlesource.com/ab/repo') |
Andrii Shyshkalov | b721460 | 2018-08-22 23:20:26 +0000 | [diff] [blame] | 2310 | self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss. |
| 2311 | self.assertEqual(cl1._GetChangeDetail(), 'a') |
| 2312 | self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss. |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2313 | |
| 2314 | def test_gerrit_change_detail_cache_options(self): |
| 2315 | self._mock_gerrit_changes_for_detail_cache() |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2316 | gerrit_util.GetChangeDetail.side_effect = ['cab', 'ad'] |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2317 | cl = git_cl.Changelist(issue=1) |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2318 | cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/') |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 2319 | self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab') |
| 2320 | self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab') |
| 2321 | self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab') |
| 2322 | self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab') |
| 2323 | self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab') |
| 2324 | self.assertEqual(cl._GetChangeDetail(), 'cab') |
| 2325 | |
| 2326 | self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad') |
| 2327 | self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab') |
| 2328 | self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad') |
| 2329 | self.assertEqual(cl._GetChangeDetail(), 'cab') |
| 2330 | |
Andrii Shyshkalov | 21fb824 | 2017-02-15 21:09:27 +0100 | [diff] [blame] | 2331 | def test_gerrit_description_caching(self): |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2332 | gerrit_util.GetChangeDetail.return_value = { |
| 2333 | 'current_revision': 'rev1', |
| 2334 | 'revisions': { |
| 2335 | 'rev1': {'commit': {'message': 'desc1'}}, |
| 2336 | }, |
| 2337 | } |
Andrii Shyshkalov | 21fb824 | 2017-02-15 21:09:27 +0100 | [diff] [blame] | 2338 | |
| 2339 | self._mock_gerrit_changes_for_detail_cache() |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2340 | cl = git_cl.Changelist(issue=1) |
Andrii Shyshkalov | 03e0ed2 | 2018-08-28 19:39:30 +0000 | [diff] [blame] | 2341 | cl._cached_remote_url = ( |
| 2342 | True, 'https://chromium.googlesource.com/a/my/repo.git/') |
Edward Lemur | 6c6827c | 2020-02-06 21:15:18 +0000 | [diff] [blame] | 2343 | self.assertEqual(cl.FetchDescription(), 'desc1') |
| 2344 | self.assertEqual(cl.FetchDescription(), 'desc1') # cache hit. |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2345 | |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 2346 | def test_print_current_creds(self): |
| 2347 | class CookiesAuthenticatorMock(object): |
| 2348 | def __init__(self): |
| 2349 | self.gitcookies = { |
| 2350 | 'host.googlesource.com': ('user', 'pass'), |
| 2351 | 'host-review.googlesource.com': ('user', 'pass'), |
| 2352 | } |
| 2353 | self.netrc = self |
| 2354 | self.netrc.hosts = { |
| 2355 | 'github.com': ('user2', None, 'pass2'), |
| 2356 | 'host2.googlesource.com': ('user3', None, 'pass'), |
| 2357 | } |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2358 | mock.patch('git_cl.gerrit_util.CookiesAuthenticator', |
| 2359 | CookiesAuthenticatorMock).start() |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 2360 | git_cl._GitCookiesChecker().print_current_creds(include_netrc=True) |
| 2361 | self.assertEqual(list(sys.stdout.getvalue().splitlines()), [ |
| 2362 | ' Host\t User\t Which file', |
| 2363 | '============================\t=====\t===========', |
| 2364 | 'host-review.googlesource.com\t user\t.gitcookies', |
| 2365 | ' host.googlesource.com\t user\t.gitcookies', |
| 2366 | ' host2.googlesource.com\tuser3\t .netrc', |
| 2367 | ]) |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2368 | sys.stdout.seek(0) |
| 2369 | sys.stdout.truncate(0) |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 2370 | git_cl._GitCookiesChecker().print_current_creds(include_netrc=False) |
| 2371 | self.assertEqual(list(sys.stdout.getvalue().splitlines()), [ |
| 2372 | ' Host\tUser\t Which file', |
| 2373 | '============================\t====\t===========', |
| 2374 | 'host-review.googlesource.com\tuser\t.gitcookies', |
| 2375 | ' host.googlesource.com\tuser\t.gitcookies', |
| 2376 | ]) |
| 2377 | |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 2378 | def _common_creds_check_mocks(self): |
| 2379 | def exists_mock(path): |
| 2380 | dirname = os.path.dirname(path) |
| 2381 | if dirname == os.path.expanduser('~'): |
| 2382 | dirname = '~' |
| 2383 | base = os.path.basename(path) |
| 2384 | if base in ('.netrc', '.gitcookies'): |
| 2385 | return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base)) |
| 2386 | # git cl also checks for existence other files not relevant to this test. |
| 2387 | return None |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2388 | mock.patch('os.path.exists', exists_mock).start() |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 2389 | |
| 2390 | def test_creds_check_gitcookies_not_configured(self): |
| 2391 | self._common_creds_check_mocks() |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2392 | mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds', |
| 2393 | lambda _, include_netrc=False: []).start() |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 2394 | self.calls = [ |
Aaron Gable | 8797cab | 2018-03-06 13:55:00 -0800 | [diff] [blame] | 2395 | ((['git', 'config', '--path', 'http.cookiefile'],), CERR1), |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 2396 | ((['git', 'config', '--global', 'http.cookiefile'],), CERR1), |
| 2397 | (('os.path.exists', '~/.netrc'), True), |
| 2398 | (('ask_for_data', 'Press Enter to setup .gitcookies, ' |
| 2399 | 'or Ctrl+C to abort'), ''), |
| 2400 | ((['git', 'config', '--global', 'http.cookiefile', |
| 2401 | os.path.expanduser('~/.gitcookies')], ), ''), |
| 2402 | ] |
| 2403 | self.assertEqual(0, git_cl.main(['creds-check'])) |
Edward Lemur | 73c7670 | 2020-02-06 23:57:18 +0000 | [diff] [blame] | 2404 | self.assertTrue( |
| 2405 | sys.stdout.getvalue().startswith( |
| 2406 | 'You seem to be using outdated .netrc for git credentials:')) |
| 2407 | self.assertIn( |
| 2408 | '\nConfigured git to use .gitcookies from', |
| 2409 | sys.stdout.getvalue()) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 2410 | |
| 2411 | def test_creds_check_gitcookies_configured_custom_broken(self): |
| 2412 | self._common_creds_check_mocks() |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2413 | mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds', |
| 2414 | lambda _, include_netrc=False: []).start() |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 2415 | self.calls = [ |
Aaron Gable | 8797cab | 2018-03-06 13:55:00 -0800 | [diff] [blame] | 2416 | ((['git', 'config', '--path', 'http.cookiefile'],), CERR1), |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 2417 | ((['git', 'config', '--global', 'http.cookiefile'],), |
| 2418 | '/custom/.gitcookies'), |
| 2419 | (('os.path.exists', '/custom/.gitcookies'), False), |
| 2420 | (('ask_for_data', 'Reconfigure git to use default .gitcookies? ' |
| 2421 | 'Press Enter to reconfigure, or Ctrl+C to abort'), ''), |
| 2422 | ((['git', 'config', '--global', 'http.cookiefile', |
| 2423 | os.path.expanduser('~/.gitcookies')], ), ''), |
| 2424 | ] |
| 2425 | self.assertEqual(0, git_cl.main(['creds-check'])) |
Edward Lemur | 73c7670 | 2020-02-06 23:57:18 +0000 | [diff] [blame] | 2426 | self.assertIn( |
| 2427 | 'WARNING: You have configured custom path to .gitcookies: ', |
| 2428 | sys.stdout.getvalue()) |
| 2429 | self.assertIn( |
| 2430 | 'However, your configured .gitcookies file is missing.', |
| 2431 | sys.stdout.getvalue()) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 2432 | |
Andrii Shyshkalov | 625986d | 2017-03-16 00:24:37 +0100 | [diff] [blame] | 2433 | def test_git_cl_comment_add_gerrit(self): |
Edward Lemur | 8515328 | 2020-02-14 22:06:29 +0000 | [diff] [blame] | 2434 | self.mockGit.branchref = None |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 2435 | self.mockGit.config['remote.origin.url'] = ( |
| 2436 | 'https://chromium.googlesource.com/infra/infra') |
Andrii Shyshkalov | 625986d | 2017-03-16 00:24:37 +0100 | [diff] [blame] | 2437 | self.calls = [ |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 2438 | (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10', |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2439 | 'msg', None, None, None), |
Aaron Gable | 636b13f | 2017-07-14 10:42:48 -0700 | [diff] [blame] | 2440 | None), |
Andrii Shyshkalov | 625986d | 2017-03-16 00:24:37 +0100 | [diff] [blame] | 2441 | ] |
Edward Lemur | 52969c9 | 2020-02-06 18:15:28 +0000 | [diff] [blame] | 2442 | self.assertEqual(0, git_cl.main(['comment', '-i', '10', '-a', 'msg'])) |
Andrii Shyshkalov | 625986d | 2017-03-16 00:24:37 +0100 | [diff] [blame] | 2443 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2444 | @mock.patch('git_cl.Changelist.GetBranch', return_value='foo') |
| 2445 | def test_git_cl_comments_fetch_gerrit(self, *_mocks): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 2446 | self.mockGit.config['remote.origin.url'] = ( |
| 2447 | 'https://chromium.googlesource.com/infra/infra') |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2448 | gerrit_util.GetChangeDetail.return_value = { |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2449 | 'owner': {'email': 'owner@example.com'}, |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2450 | 'current_revision': 'ba5eba11', |
| 2451 | 'revisions': { |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2452 | 'deadbeaf': { |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2453 | '_number': 1, |
| 2454 | }, |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2455 | 'ba5eba11': { |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2456 | '_number': 2, |
| 2457 | }, |
| 2458 | }, |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 2459 | 'messages': [ |
| 2460 | { |
| 2461 | u'_revision_number': 1, |
| 2462 | u'author': { |
| 2463 | u'_account_id': 1111084, |
| 2464 | u'email': u'commit-bot@chromium.org', |
| 2465 | u'name': u'Commit Bot' |
| 2466 | }, |
| 2467 | u'date': u'2017-03-15 20:08:45.000000000', |
| 2468 | u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b', |
Dirk Pranke | f6a5880 | 2017-10-17 12:49:42 -0700 | [diff] [blame] | 2469 | u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...', |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 2470 | u'tag': u'autogenerated:cq:dry-run' |
| 2471 | }, |
| 2472 | { |
| 2473 | u'_revision_number': 2, |
| 2474 | u'author': { |
| 2475 | u'_account_id': 11151243, |
| 2476 | u'email': u'owner@example.com', |
| 2477 | u'name': u'owner' |
| 2478 | }, |
| 2479 | u'date': u'2017-03-16 20:00:41.000000000', |
| 2480 | u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234', |
| 2481 | u'message': u'PTAL', |
| 2482 | }, |
| 2483 | { |
| 2484 | u'_revision_number': 2, |
| 2485 | u'author': { |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2486 | u'_account_id': 148512, |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 2487 | u'email': u'reviewer@example.com', |
| 2488 | u'name': u'reviewer' |
| 2489 | }, |
| 2490 | u'date': u'2017-03-17 05:19:37.500000000', |
| 2491 | u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568', |
| 2492 | u'message': u'Patch Set 2: Code-Review+1', |
| 2493 | }, |
| 2494 | ] |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2495 | } |
| 2496 | self.calls = [ |
Andrii Shyshkalov | 889677c | 2018-08-28 20:43:06 +0000 | [diff] [blame] | 2497 | (('GetChangeComments', 'chromium-review.googlesource.com', |
| 2498 | 'infra%2Finfra~1'), { |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2499 | '/COMMIT_MSG': [ |
| 2500 | { |
| 2501 | 'author': {'email': u'reviewer@example.com'}, |
| 2502 | 'updated': u'2017-03-17 05:19:37.500000000', |
| 2503 | 'patch_set': 2, |
| 2504 | 'side': 'REVISION', |
| 2505 | 'message': 'Please include a bug link', |
| 2506 | }, |
| 2507 | ], |
| 2508 | 'codereview.settings': [ |
| 2509 | { |
| 2510 | 'author': {'email': u'owner@example.com'}, |
| 2511 | 'updated': u'2017-03-16 20:00:41.000000000', |
| 2512 | 'patch_set': 2, |
| 2513 | 'side': 'PARENT', |
| 2514 | 'line': 42, |
| 2515 | 'message': 'I removed this because it is bad', |
| 2516 | }, |
| 2517 | ] |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2518 | }), |
| 2519 | (('GetChangeRobotComments', 'chromium-review.googlesource.com', |
| 2520 | 'infra%2Finfra~1'), {}), |
Leszek Swirski | 45b20c4 | 2018-09-17 17:05:26 +0000 | [diff] [blame] | 2521 | ] * 2 + [ |
| 2522 | (('write_json', 'output.json', [ |
| 2523 | { |
| 2524 | u'date': u'2017-03-16 20:00:41.000000', |
| 2525 | u'message': ( |
| 2526 | u'PTAL\n' + |
| 2527 | u'\n' + |
| 2528 | u'codereview.settings\n' + |
| 2529 | u' Base, Line 42: https://chromium-review.googlesource.com/' + |
| 2530 | u'c/1/2/codereview.settings#b42\n' + |
| 2531 | u' I removed this because it is bad\n'), |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2532 | u'autogenerated': False, |
Leszek Swirski | 45b20c4 | 2018-09-17 17:05:26 +0000 | [diff] [blame] | 2533 | u'approval': False, |
| 2534 | u'disapproval': False, |
| 2535 | u'sender': u'owner@example.com' |
| 2536 | }, { |
| 2537 | u'date': u'2017-03-17 05:19:37.500000', |
| 2538 | u'message': ( |
| 2539 | u'Patch Set 2: Code-Review+1\n' + |
| 2540 | u'\n' + |
| 2541 | u'/COMMIT_MSG\n' + |
| 2542 | u' PS2, File comment: https://chromium-review.googlesource' + |
| 2543 | u'.com/c/1/2//COMMIT_MSG#\n' + |
| 2544 | u' Please include a bug link\n'), |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2545 | u'autogenerated': False, |
Leszek Swirski | 45b20c4 | 2018-09-17 17:05:26 +0000 | [diff] [blame] | 2546 | u'approval': False, |
| 2547 | u'disapproval': False, |
| 2548 | u'sender': u'reviewer@example.com' |
| 2549 | } |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2550 | ]), '') |
Leszek Swirski | 45b20c4 | 2018-09-17 17:05:26 +0000 | [diff] [blame] | 2551 | ] |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 2552 | expected_comments_summary = [ |
| 2553 | git_cl._CommentSummary( |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2554 | message=( |
| 2555 | u'PTAL\n' + |
| 2556 | u'\n' + |
| 2557 | u'codereview.settings\n' + |
| 2558 | u' Base, Line 42: https://chromium-review.googlesource.com/' + |
| 2559 | u'c/1/2/codereview.settings#b42\n' + |
| 2560 | u' I removed this because it is bad\n'), |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 2561 | date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0), |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2562 | autogenerated=False, |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 2563 | disapproval=False, approval=False, sender=u'owner@example.com'), |
| 2564 | git_cl._CommentSummary( |
Aaron Gable | 0ffdf2d | 2017-06-05 13:01:17 -0700 | [diff] [blame] | 2565 | message=( |
| 2566 | u'Patch Set 2: Code-Review+1\n' + |
| 2567 | u'\n' + |
| 2568 | u'/COMMIT_MSG\n' + |
| 2569 | u' PS2, File comment: https://chromium-review.googlesource.com/' + |
| 2570 | u'c/1/2//COMMIT_MSG#\n' + |
| 2571 | u' Please include a bug link\n'), |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 2572 | date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000), |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2573 | autogenerated=False, |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 2574 | disapproval=False, approval=False, sender=u'reviewer@example.com'), |
| 2575 | ] |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2576 | cl = git_cl.Changelist( |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2577 | issue=1, branchref='refs/heads/foo') |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 2578 | self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary) |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2579 | self.assertEqual( |
| 2580 | 0, git_cl.main(['comments', '-i', '1', '-j', 'output.json'])) |
| 2581 | |
| 2582 | def test_git_cl_comments_robot_comments(self): |
| 2583 | # git cl comments also fetches robot comments (which are considered a type |
| 2584 | # of autogenerated comment), and unlike other types of comments, only robot |
| 2585 | # comments from the latest patchset are shown. |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 2586 | self.mockGit.config['remote.origin.url'] = ( |
| 2587 | 'https://chromium.googlesource.com/infra/infra') |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2588 | gerrit_util.GetChangeDetail.return_value = { |
| 2589 | 'owner': {'email': 'owner@example.com'}, |
| 2590 | 'current_revision': 'ba5eba11', |
| 2591 | 'revisions': { |
| 2592 | 'deadbeaf': { |
| 2593 | '_number': 1, |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2594 | }, |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2595 | 'ba5eba11': { |
| 2596 | '_number': 2, |
| 2597 | }, |
| 2598 | }, |
| 2599 | 'messages': [ |
| 2600 | { |
| 2601 | u'_revision_number': 1, |
| 2602 | u'author': { |
| 2603 | u'_account_id': 1111084, |
| 2604 | u'email': u'commit-bot@chromium.org', |
| 2605 | u'name': u'Commit Bot' |
| 2606 | }, |
| 2607 | u'date': u'2017-03-15 20:08:45.000000000', |
| 2608 | u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b', |
| 2609 | u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...', |
| 2610 | u'tag': u'autogenerated:cq:dry-run' |
| 2611 | }, |
| 2612 | { |
| 2613 | u'_revision_number': 1, |
| 2614 | u'author': { |
| 2615 | u'_account_id': 123, |
| 2616 | u'email': u'tricium@serviceaccount.com', |
| 2617 | u'name': u'Tricium' |
| 2618 | }, |
| 2619 | u'date': u'2017-03-16 20:00:41.000000000', |
| 2620 | u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234', |
| 2621 | u'message': u'(1 comment)', |
| 2622 | u'tag': u'autogenerated:tricium', |
| 2623 | }, |
| 2624 | { |
| 2625 | u'_revision_number': 1, |
| 2626 | u'author': { |
| 2627 | u'_account_id': 123, |
| 2628 | u'email': u'tricium@serviceaccount.com', |
| 2629 | u'name': u'Tricium' |
| 2630 | }, |
| 2631 | u'date': u'2017-03-16 20:00:41.000000000', |
| 2632 | u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234', |
| 2633 | u'message': u'(1 comment)', |
| 2634 | u'tag': u'autogenerated:tricium', |
| 2635 | }, |
| 2636 | { |
| 2637 | u'_revision_number': 2, |
| 2638 | u'author': { |
| 2639 | u'_account_id': 123, |
| 2640 | u'email': u'tricium@serviceaccount.com', |
| 2641 | u'name': u'reviewer' |
| 2642 | }, |
| 2643 | u'date': u'2017-03-17 05:30:37.000000000', |
| 2644 | u'tag': u'autogenerated:tricium', |
| 2645 | u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568', |
| 2646 | u'message': u'(1 comment)', |
| 2647 | }, |
| 2648 | ] |
| 2649 | } |
| 2650 | self.calls = [ |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2651 | (('GetChangeComments', 'chromium-review.googlesource.com', |
| 2652 | 'infra%2Finfra~1'), {}), |
| 2653 | (('GetChangeRobotComments', 'chromium-review.googlesource.com', |
| 2654 | 'infra%2Finfra~1'), { |
| 2655 | 'codereview.settings': [ |
| 2656 | { |
| 2657 | u'author': {u'email': u'tricium@serviceaccount.com'}, |
| 2658 | u'updated': u'2017-03-17 05:30:37.000000000', |
| 2659 | u'robot_run_id': u'5565031076855808', |
| 2660 | u'robot_id': u'Linter/Category', |
| 2661 | u'tag': u'autogenerated:tricium', |
| 2662 | u'patch_set': 2, |
| 2663 | u'side': u'REVISION', |
| 2664 | u'message': u'Linter warning message text', |
| 2665 | u'line': 32, |
| 2666 | }, |
| 2667 | ], |
| 2668 | }), |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2669 | ] |
| 2670 | expected_comments_summary = [ |
| 2671 | git_cl._CommentSummary(date=datetime.datetime(2017, 3, 17, 5, 30, 37), |
| 2672 | message=( |
| 2673 | u'(1 comment)\n\ncodereview.settings\n' |
| 2674 | u' PS2, Line 32: https://chromium-review.googlesource.com/' |
| 2675 | u'c/1/2/codereview.settings#32\n' |
| 2676 | u' Linter warning message text\n'), |
| 2677 | sender=u'tricium@serviceaccount.com', |
| 2678 | autogenerated=True, approval=False, disapproval=False) |
| 2679 | ] |
| 2680 | cl = git_cl.Changelist( |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2681 | issue=1, branchref='refs/heads/foo') |
Quinten Yearsley | 0e617c0 | 2019-02-20 00:37:03 +0000 | [diff] [blame] | 2682 | self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary) |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 2683 | |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 2684 | def test_get_remote_url_with_mirror(self): |
| 2685 | original_os_path_isdir = os.path.isdir |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2686 | |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 2687 | def selective_os_path_isdir_mock(path): |
| 2688 | if path == '/cache/this-dir-exists': |
| 2689 | return self._mocked_call('os.path.isdir', path) |
| 2690 | return original_os_path_isdir(path) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2691 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2692 | mock.patch('os.path.isdir', selective_os_path_isdir_mock).start() |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 2693 | |
| 2694 | url = 'https://chromium.googlesource.com/my/repo' |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 2695 | self.mockGit.config['remote.origin.url'] = ( |
| 2696 | '/cache/this-dir-exists') |
| 2697 | self.mockGit.config['/cache/this-dir-exists:remote.origin.url'] = ( |
| 2698 | url) |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 2699 | self.calls = [ |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 2700 | (('os.path.isdir', '/cache/this-dir-exists'), |
| 2701 | True), |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 2702 | ] |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2703 | cl = git_cl.Changelist(issue=1) |
Andrii Shyshkalov | 81db1d5 | 2018-08-23 02:17:41 +0000 | [diff] [blame] | 2704 | self.assertEqual(cl.GetRemoteUrl(), url) |
| 2705 | self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached. |
| 2706 | |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2707 | def test_get_remote_url_non_existing_mirror(self): |
| 2708 | original_os_path_isdir = os.path.isdir |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2709 | |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2710 | def selective_os_path_isdir_mock(path): |
| 2711 | if path == '/cache/this-dir-doesnt-exist': |
| 2712 | return self._mocked_call('os.path.isdir', path) |
| 2713 | return original_os_path_isdir(path) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2714 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2715 | mock.patch('os.path.isdir', selective_os_path_isdir_mock).start() |
| 2716 | mock.patch('logging.error', |
| 2717 | lambda *a: self._mocked_call('logging.error', *a)).start() |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2718 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 2719 | self.mockGit.config['remote.origin.url'] = ( |
| 2720 | '/cache/this-dir-doesnt-exist') |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2721 | self.calls = [ |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2722 | (('os.path.isdir', '/cache/this-dir-doesnt-exist'), |
| 2723 | False), |
| 2724 | (('logging.error', |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 2725 | 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", ' |
| 2726 | 'but it doesn\'t exist.', { |
| 2727 | 'remote': 'origin', |
| 2728 | 'branch': 'master', |
| 2729 | 'url': '/cache/this-dir-doesnt-exist'} |
| 2730 | ), None), |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2731 | ] |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2732 | cl = git_cl.Changelist(issue=1) |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2733 | self.assertIsNone(cl.GetRemoteUrl()) |
| 2734 | |
| 2735 | def test_get_remote_url_misconfigured_mirror(self): |
| 2736 | original_os_path_isdir = os.path.isdir |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2737 | |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2738 | def selective_os_path_isdir_mock(path): |
| 2739 | if path == '/cache/this-dir-exists': |
| 2740 | return self._mocked_call('os.path.isdir', path) |
| 2741 | return original_os_path_isdir(path) |
Quinten Yearsley | d9cbe7a | 2019-09-03 16:49:11 +0000 | [diff] [blame] | 2742 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2743 | mock.patch('os.path.isdir', selective_os_path_isdir_mock).start() |
| 2744 | mock.patch('logging.error', |
| 2745 | lambda *a: self._mocked_call('logging.error', *a)).start() |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2746 | |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 2747 | self.mockGit.config['remote.origin.url'] = ( |
| 2748 | '/cache/this-dir-exists') |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2749 | self.calls = [ |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2750 | (('os.path.isdir', '/cache/this-dir-exists'), True), |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2751 | (('logging.error', |
| 2752 | 'Remote "%(remote)s" for branch "%(branch)s" points to ' |
| 2753 | '"%(cache_path)s", but it is misconfigured.\n' |
| 2754 | '"%(cache_path)s" must be a git repo and must have a remote named ' |
| 2755 | '"%(remote)s" pointing to the git host.', { |
| 2756 | 'remote': 'origin', |
| 2757 | 'cache_path': '/cache/this-dir-exists', |
| 2758 | 'branch': 'master'} |
| 2759 | ), None), |
| 2760 | ] |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2761 | cl = git_cl.Changelist(issue=1) |
Edward Lemur | 298f2cf | 2019-02-22 21:40:39 +0000 | [diff] [blame] | 2762 | self.assertIsNone(cl.GetRemoteUrl()) |
| 2763 | |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 2764 | def test_gerrit_change_identifier_with_project(self): |
Edward Lemur | 2696407 | 2020-02-19 19:18:51 +0000 | [diff] [blame] | 2765 | self.mockGit.config['remote.origin.url'] = ( |
| 2766 | 'https://chromium.googlesource.com/a/my/repo.git/') |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2767 | cl = git_cl.Changelist(issue=123456) |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 2768 | self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456') |
| 2769 | |
| 2770 | def test_gerrit_change_identifier_without_project(self): |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 2771 | mock.patch('logging.error', |
| 2772 | lambda *a: self._mocked_call('logging.error', *a)).start() |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 2773 | |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 2774 | self.calls = [ |
Josip | 906bfde | 2020-01-31 22:38:49 +0000 | [diff] [blame] | 2775 | (('logging.error', |
| 2776 | 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", ' |
| 2777 | 'but it doesn\'t exist.', { |
| 2778 | 'remote': 'origin', |
| 2779 | 'branch': 'master', |
| 2780 | 'url': ''} |
| 2781 | ), None), |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 2782 | ] |
Edward Lemur | f38bc17 | 2019-09-03 21:02:13 +0000 | [diff] [blame] | 2783 | cl = git_cl.Changelist(issue=123456) |
Andrii Shyshkalov | 2d0e03c | 2018-08-25 04:18:09 +0000 | [diff] [blame] | 2784 | self.assertEqual(cl._GerritChangeIdentifier(), '123456') |
Andrii Shyshkalov | 1e82867 | 2018-08-23 22:34:37 +0000 | [diff] [blame] | 2785 | |
Quinten Yearsley | 0c62da9 | 2017-05-31 13:39:42 -0700 | [diff] [blame] | 2786 | |
Edward Lemur | 9aa1a96 | 2020-02-25 00:58:38 +0000 | [diff] [blame] | 2787 | class ChangelistTest(unittest.TestCase): |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 2788 | def setUp(self): |
| 2789 | super(ChangelistTest, self).setUp() |
| 2790 | mock.patch('gclient_utils.FileRead').start() |
| 2791 | mock.patch('gclient_utils.FileWrite').start() |
| 2792 | mock.patch('gclient_utils.temporary_file', TemporaryFileMock()).start() |
| 2793 | mock.patch( |
| 2794 | 'git_cl.Changelist.GetCodereviewServer', |
| 2795 | return_value='https://chromium-review.googlesource.com').start() |
| 2796 | mock.patch('git_cl.Changelist.GetAuthor', return_value='author').start() |
| 2797 | mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start() |
| 2798 | mock.patch('git_cl.Changelist.GetPatchset', return_value=7).start() |
| 2799 | mock.patch('git_cl.PRESUBMIT_SUPPORT', 'PRESUBMIT_SUPPORT').start() |
| 2800 | mock.patch('git_cl.Settings.GetRoot', return_value='root').start() |
| 2801 | mock.patch('git_cl.time_time').start() |
| 2802 | mock.patch('metrics.collector').start() |
| 2803 | mock.patch('subprocess2.Popen').start() |
| 2804 | self.addCleanup(mock.patch.stopall) |
| 2805 | self.temp_count = 0 |
| 2806 | |
Edward Lemur | 9aa1a96 | 2020-02-25 00:58:38 +0000 | [diff] [blame] | 2807 | @mock.patch('git_cl.RunGitWithCode') |
| 2808 | def testGetLocalDescription(self, _mock): |
| 2809 | git_cl.RunGitWithCode.return_value = (0, 'description') |
| 2810 | cl = git_cl.Changelist() |
| 2811 | self.assertEqual('description', cl.GetLocalDescription('branch')) |
| 2812 | self.assertEqual('description', cl.GetLocalDescription('branch')) |
| 2813 | git_cl.RunGitWithCode.assert_called_once_with( |
| 2814 | ['log', '--pretty=format:%s%n%n%b', 'branch...']) |
| 2815 | |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 2816 | def testRunHook(self): |
| 2817 | expected_results = { |
| 2818 | 'more_cc': ['more@example.com', 'cc@example.com'], |
| 2819 | 'should_continue': True, |
| 2820 | } |
| 2821 | gclient_utils.FileRead.return_value = json.dumps(expected_results) |
| 2822 | git_cl.time_time.side_effect = [100, 200] |
| 2823 | mockProcess = mock.Mock() |
| 2824 | mockProcess.wait.return_value = 0 |
| 2825 | subprocess2.Popen.return_value = mockProcess |
| 2826 | |
| 2827 | cl = git_cl.Changelist() |
| 2828 | results = cl.RunHook( |
| 2829 | committing=True, |
| 2830 | may_prompt=True, |
| 2831 | verbose=2, |
| 2832 | parallel=True, |
| 2833 | upstream='upstream', |
| 2834 | description='description', |
| 2835 | all_files=True) |
| 2836 | |
| 2837 | self.assertEqual(expected_results, results) |
| 2838 | subprocess2.Popen.assert_called_once_with([ |
| 2839 | 'vpython', 'PRESUBMIT_SUPPORT', |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 2840 | '--author', 'author', |
| 2841 | '--root', 'root', |
| 2842 | '--upstream', 'upstream', |
| 2843 | '--verbose', '--verbose', |
| 2844 | '--issue', '123456', |
| 2845 | '--patchset', '7', |
| 2846 | '--gerrit_url', 'https://chromium-review.googlesource.com', |
Edward Lemur | 7552630 | 2020-02-27 22:31:05 +0000 | [diff] [blame] | 2847 | '--commit', |
Edward Lemur | 227d510 | 2020-02-25 23:45:35 +0000 | [diff] [blame] | 2848 | '--may_prompt', |
| 2849 | '--parallel', |
| 2850 | '--all_files', |
| 2851 | '--json_output', '/tmp/fake-temp2', |
| 2852 | '--description_file', '/tmp/fake-temp1', |
| 2853 | ]) |
| 2854 | gclient_utils.FileWrite.assert_called_once_with( |
| 2855 | '/tmp/fake-temp1', b'description', mode='wb') |
| 2856 | metrics.collector.add_repeated('sub_commands', { |
| 2857 | 'command': 'presubmit', |
| 2858 | 'execution_time': 100, |
| 2859 | 'exit_code': 0, |
| 2860 | }) |
| 2861 | |
| 2862 | @mock.patch('sys.exit', side_effect=SystemExitMock) |
| 2863 | def testRunHook_Failure(self, _mock): |
| 2864 | git_cl.time_time.side_effect = [100, 200] |
| 2865 | mockProcess = mock.Mock() |
| 2866 | mockProcess.wait.return_value = 2 |
| 2867 | subprocess2.Popen.return_value = mockProcess |
| 2868 | |
| 2869 | cl = git_cl.Changelist() |
| 2870 | with self.assertRaises(SystemExitMock): |
| 2871 | cl.RunHook( |
| 2872 | committing=True, |
| 2873 | may_prompt=True, |
| 2874 | verbose=2, |
| 2875 | parallel=True, |
| 2876 | upstream='upstream', |
| 2877 | description='description', |
| 2878 | all_files=True) |
| 2879 | |
| 2880 | sys.exit.assert_called_once_with(2) |
| 2881 | |
Edward Lemur | 7552630 | 2020-02-27 22:31:05 +0000 | [diff] [blame] | 2882 | def testRunPostUploadHook(self): |
| 2883 | cl = git_cl.Changelist() |
| 2884 | cl.RunPostUploadHook(2, 'upstream', 'description') |
| 2885 | |
| 2886 | subprocess2.Popen.assert_called_once_with([ |
| 2887 | 'vpython', 'PRESUBMIT_SUPPORT', |
| 2888 | '--author', 'author', |
| 2889 | '--root', 'root', |
| 2890 | '--upstream', 'upstream', |
| 2891 | '--verbose', '--verbose', |
| 2892 | '--issue', '123456', |
| 2893 | '--patchset', '7', |
| 2894 | '--gerrit_url', 'https://chromium-review.googlesource.com', |
| 2895 | '--post_upload', |
| 2896 | '--description_file', '/tmp/fake-temp1', |
| 2897 | ]) |
| 2898 | gclient_utils.FileWrite.assert_called_once_with( |
| 2899 | '/tmp/fake-temp1', b'description', mode='wb') |
| 2900 | |
Edward Lemur | 9aa1a96 | 2020-02-25 00:58:38 +0000 | [diff] [blame] | 2901 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 2902 | class CMDTestCaseBase(unittest.TestCase): |
| 2903 | _STATUSES = [ |
| 2904 | 'STATUS_UNSPECIFIED', 'SCHEDULED', 'STARTED', 'SUCCESS', 'FAILURE', |
| 2905 | 'INFRA_FAILURE', 'CANCELED', |
| 2906 | ] |
| 2907 | _CHANGE_DETAIL = { |
| 2908 | 'project': 'depot_tools', |
| 2909 | 'status': 'OPEN', |
| 2910 | 'owner': {'email': 'owner@e.mail'}, |
| 2911 | 'current_revision': 'beeeeeef', |
| 2912 | 'revisions': { |
| 2913 | 'deadbeaf': {'_number': 6}, |
| 2914 | 'beeeeeef': { |
| 2915 | '_number': 7, |
| 2916 | 'fetch': {'http': { |
| 2917 | 'url': 'https://chromium.googlesource.com/depot_tools', |
| 2918 | 'ref': 'refs/changes/56/123456/7' |
| 2919 | }}, |
| 2920 | }, |
| 2921 | }, |
| 2922 | } |
| 2923 | _DEFAULT_RESPONSE = { |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 2924 | 'builds': [{ |
| 2925 | 'id': str(100 + idx), |
| 2926 | 'builder': { |
| 2927 | 'project': 'chromium', |
| 2928 | 'bucket': 'try', |
| 2929 | 'builder': 'bot_' + status.lower(), |
| 2930 | }, |
| 2931 | 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10), |
| 2932 | 'tags': [], |
| 2933 | 'status': status, |
| 2934 | } for idx, status in enumerate(_STATUSES)] |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 2935 | } |
| 2936 | |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 2937 | def setUp(self): |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 2938 | super(CMDTestCaseBase, self).setUp() |
Edward Lemur | 79d4f99 | 2019-11-11 23:49:02 +0000 | [diff] [blame] | 2939 | mock.patch('git_cl.sys.stdout', StringIO()).start() |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 2940 | mock.patch('git_cl.uuid.uuid4', return_value='uuid4').start() |
| 2941 | mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start() |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 2942 | mock.patch( |
| 2943 | 'git_cl.Changelist.GetCodereviewServer', |
| 2944 | return_value='https://chromium-review.googlesource.com').start() |
| 2945 | mock.patch( |
| 2946 | 'git_cl.Changelist._GetGerritHost', |
| 2947 | return_value='chromium-review.googlesource.com').start() |
| 2948 | mock.patch( |
| 2949 | 'git_cl.Changelist.GetMostRecentPatchset', |
| 2950 | return_value=7).start() |
| 2951 | mock.patch( |
| 2952 | 'git_cl.Changelist.GetRemoteUrl', |
| 2953 | return_value='https://chromium.googlesource.com/depot_tools').start() |
| 2954 | mock.patch( |
| 2955 | 'auth.Authenticator', |
| 2956 | return_value=AuthenticatorMock()).start() |
| 2957 | mock.patch( |
| 2958 | 'gerrit_util.GetChangeDetail', |
| 2959 | return_value=self._CHANGE_DETAIL).start() |
| 2960 | mock.patch( |
| 2961 | 'git_cl._call_buildbucket', |
| 2962 | return_value = self._DEFAULT_RESPONSE).start() |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 2963 | mock.patch('git_common.is_dirty_git_tree', return_value=False).start() |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 2964 | self.addCleanup(mock.patch.stopall) |
| 2965 | |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 2966 | |
Edward Lemur | 9468eba | 2020-02-27 19:07:22 +0000 | [diff] [blame] | 2967 | class CMDPresubmitTestCase(CMDTestCaseBase): |
| 2968 | def setUp(self): |
| 2969 | super(CMDPresubmitTestCase, self).setUp() |
| 2970 | mock.patch( |
| 2971 | 'git_cl.Changelist.GetCommonAncestorWithUpstream', |
| 2972 | return_value='upstream').start() |
| 2973 | mock.patch( |
| 2974 | 'git_cl.Changelist.FetchDescription', |
| 2975 | return_value='fetch description').start() |
| 2976 | mock.patch( |
| 2977 | 'git_cl.Changelist.GetLocalDescription', |
| 2978 | return_value='get description').start() |
| 2979 | mock.patch('git_cl.Changelist.RunHook').start() |
| 2980 | |
| 2981 | def testDefaultCase(self): |
| 2982 | self.assertEqual(0, git_cl.main(['presubmit'])) |
| 2983 | git_cl.Changelist.RunHook.assert_called_once_with( |
| 2984 | committing=True, |
| 2985 | may_prompt=False, |
| 2986 | verbose=0, |
| 2987 | parallel=None, |
| 2988 | upstream='upstream', |
| 2989 | description='fetch description', |
| 2990 | all_files=None) |
| 2991 | |
| 2992 | def testNoIssue(self): |
| 2993 | git_cl.Changelist.GetIssue.return_value = None |
| 2994 | self.assertEqual(0, git_cl.main(['presubmit'])) |
| 2995 | git_cl.Changelist.RunHook.assert_called_once_with( |
| 2996 | committing=True, |
| 2997 | may_prompt=False, |
| 2998 | verbose=0, |
| 2999 | parallel=None, |
| 3000 | upstream='upstream', |
| 3001 | description='get description', |
| 3002 | all_files=None) |
| 3003 | |
| 3004 | def testCustomBranch(self): |
| 3005 | self.assertEqual(0, git_cl.main(['presubmit', 'custom_branch'])) |
| 3006 | git_cl.Changelist.RunHook.assert_called_once_with( |
| 3007 | committing=True, |
| 3008 | may_prompt=False, |
| 3009 | verbose=0, |
| 3010 | parallel=None, |
| 3011 | upstream='custom_branch', |
| 3012 | description='fetch description', |
| 3013 | all_files=None) |
| 3014 | |
| 3015 | def testOptions(self): |
| 3016 | self.assertEqual( |
| 3017 | 0, git_cl.main(['presubmit', '-v', '-v', '--all', '--parallel', '-u'])) |
| 3018 | git_cl.Changelist.RunHook.assert_called_once_with( |
| 3019 | committing=False, |
| 3020 | may_prompt=False, |
| 3021 | verbose=2, |
| 3022 | parallel=True, |
| 3023 | upstream='upstream', |
| 3024 | description='fetch description', |
| 3025 | all_files=True) |
| 3026 | |
| 3027 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3028 | class CMDTryResultsTestCase(CMDTestCaseBase): |
| 3029 | _DEFAULT_REQUEST = { |
| 3030 | 'predicate': { |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 3031 | "gerritChanges": [{ |
| 3032 | "project": "depot_tools", |
| 3033 | "host": "chromium-review.googlesource.com", |
| 3034 | "patchset": 7, |
| 3035 | "change": 123456, |
| 3036 | }], |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3037 | }, |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 3038 | 'fields': ('builds.*.id,builds.*.builder,builds.*.status' + |
| 3039 | ',builds.*.createTime,builds.*.tags'), |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3040 | } |
| 3041 | |
| 3042 | def testNoJobs(self): |
| 3043 | git_cl._call_buildbucket.return_value = {} |
| 3044 | |
| 3045 | self.assertEqual(0, git_cl.main(['try-results'])) |
| 3046 | self.assertEqual('No tryjobs scheduled.\n', sys.stdout.getvalue()) |
| 3047 | git_cl._call_buildbucket.assert_called_once_with( |
| 3048 | mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds', |
| 3049 | self._DEFAULT_REQUEST) |
| 3050 | |
| 3051 | def testPrintToStdout(self): |
| 3052 | self.assertEqual(0, git_cl.main(['try-results'])) |
| 3053 | self.assertEqual([ |
| 3054 | 'Successes:', |
| 3055 | ' bot_success https://ci.chromium.org/b/103', |
| 3056 | 'Infra Failures:', |
| 3057 | ' bot_infra_failure https://ci.chromium.org/b/105', |
| 3058 | 'Failures:', |
| 3059 | ' bot_failure https://ci.chromium.org/b/104', |
| 3060 | 'Canceled:', |
| 3061 | ' bot_canceled ', |
| 3062 | 'Started:', |
| 3063 | ' bot_started https://ci.chromium.org/b/102', |
| 3064 | 'Scheduled:', |
| 3065 | ' bot_scheduled id=101', |
| 3066 | 'Other:', |
| 3067 | ' bot_status_unspecified id=100', |
| 3068 | 'Total: 7 tryjobs', |
| 3069 | ], sys.stdout.getvalue().splitlines()) |
| 3070 | git_cl._call_buildbucket.assert_called_once_with( |
| 3071 | mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds', |
| 3072 | self._DEFAULT_REQUEST) |
| 3073 | |
| 3074 | def testPrintToStdoutWithMasters(self): |
| 3075 | self.assertEqual(0, git_cl.main(['try-results', '--print-master'])) |
| 3076 | self.assertEqual([ |
| 3077 | 'Successes:', |
| 3078 | ' try bot_success https://ci.chromium.org/b/103', |
| 3079 | 'Infra Failures:', |
| 3080 | ' try bot_infra_failure https://ci.chromium.org/b/105', |
| 3081 | 'Failures:', |
| 3082 | ' try bot_failure https://ci.chromium.org/b/104', |
| 3083 | 'Canceled:', |
| 3084 | ' try bot_canceled ', |
| 3085 | 'Started:', |
| 3086 | ' try bot_started https://ci.chromium.org/b/102', |
| 3087 | 'Scheduled:', |
| 3088 | ' try bot_scheduled id=101', |
| 3089 | 'Other:', |
| 3090 | ' try bot_status_unspecified id=100', |
| 3091 | 'Total: 7 tryjobs', |
| 3092 | ], sys.stdout.getvalue().splitlines()) |
| 3093 | git_cl._call_buildbucket.assert_called_once_with( |
| 3094 | mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds', |
| 3095 | self._DEFAULT_REQUEST) |
| 3096 | |
| 3097 | @mock.patch('git_cl.write_json') |
| 3098 | def testWriteToJson(self, mockJsonDump): |
| 3099 | self.assertEqual(0, git_cl.main(['try-results', '--json', 'file.json'])) |
| 3100 | git_cl._call_buildbucket.assert_called_once_with( |
| 3101 | mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds', |
| 3102 | self._DEFAULT_REQUEST) |
| 3103 | mockJsonDump.assert_called_once_with( |
| 3104 | 'file.json', self._DEFAULT_RESPONSE['builds']) |
| 3105 | |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 3106 | def test_filter_failed_for_one_simple(self): |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame^] | 3107 | self.assertEqual([], git_cl._filter_failed_for_retry([])) |
| 3108 | self.assertEqual( |
| 3109 | [ |
| 3110 | ('chromium', 'try', 'bot_failure'), |
| 3111 | ('chromium', 'try', 'bot_infra_failure'), |
| 3112 | ], |
| 3113 | git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds'])) |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 3114 | |
| 3115 | def test_filter_failed_for_retry_many_builds(self): |
| 3116 | |
| 3117 | def _build(name, created_sec, status, experimental=False): |
| 3118 | assert 0 <= created_sec < 100, created_sec |
| 3119 | b = { |
| 3120 | 'id': 112112, |
| 3121 | 'builder': { |
| 3122 | 'project': 'chromium', |
| 3123 | 'bucket': 'try', |
| 3124 | 'builder': name, |
| 3125 | }, |
| 3126 | 'createTime': '2019-10-09T08:00:%02d.854286Z' % created_sec, |
| 3127 | 'status': status, |
| 3128 | 'tags': [], |
| 3129 | } |
| 3130 | if experimental: |
| 3131 | b['tags'].append({'key': 'cq_experimental', 'value': 'true'}) |
| 3132 | return b |
| 3133 | |
| 3134 | builds = [ |
| 3135 | _build('flaky-last-green', 1, 'FAILURE'), |
| 3136 | _build('flaky-last-green', 2, 'SUCCESS'), |
| 3137 | _build('flaky', 1, 'SUCCESS'), |
| 3138 | _build('flaky', 2, 'FAILURE'), |
| 3139 | _build('running', 1, 'FAILED'), |
| 3140 | _build('running', 2, 'SCHEDULED'), |
| 3141 | _build('yep-still-running', 1, 'STARTED'), |
| 3142 | _build('yep-still-running', 2, 'FAILURE'), |
| 3143 | _build('cq-experimental', 1, 'SUCCESS', experimental=True), |
| 3144 | _build('cq-experimental', 2, 'FAILURE', experimental=True), |
| 3145 | |
| 3146 | # Simulate experimental in CQ builder, which developer decided |
| 3147 | # to retry manually which resulted in 2nd build non-experimental. |
| 3148 | _build('sometimes-experimental', 1, 'FAILURE', experimental=True), |
| 3149 | _build('sometimes-experimental', 2, 'FAILURE', experimental=False), |
| 3150 | ] |
| 3151 | builds.sort(key=lambda b: b['status']) # ~deterministic shuffle. |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame^] | 3152 | self.assertEqual( |
| 3153 | [ |
| 3154 | ('chromium', 'try', 'flaky'), |
| 3155 | ('chromium', 'try', 'sometimes-experimental'), |
| 3156 | ], |
| 3157 | git_cl._filter_failed_for_retry(builds)) |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3158 | |
| 3159 | |
| 3160 | class CMDTryTestCase(CMDTestCaseBase): |
| 3161 | |
| 3162 | @mock.patch('git_cl.Changelist.SetCQState') |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame^] | 3163 | def testSetCQDryRunByDefault(self, mockSetCQState): |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3164 | mockSetCQState.return_value = 0 |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 3165 | self.assertEqual(0, git_cl.main(['try'])) |
| 3166 | git_cl.Changelist.SetCQState.assert_called_with(git_cl._CQState.DRY_RUN) |
| 3167 | self.assertEqual( |
| 3168 | sys.stdout.getvalue(), |
| 3169 | 'Scheduling CQ dry run on: ' |
| 3170 | 'https://chromium-review.googlesource.com/123456\n') |
| 3171 | |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 3172 | @mock.patch('git_cl._call_buildbucket') |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3173 | def testScheduleOnBuildbucket(self, mockCallBuildbucket): |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 3174 | mockCallBuildbucket.return_value = {} |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 3175 | |
| 3176 | self.assertEqual(0, git_cl.main([ |
| 3177 | 'try', '-B', 'luci.chromium.try', '-b', 'win', |
| 3178 | '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])) |
| 3179 | self.assertIn( |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame^] | 3180 | 'Scheduling jobs on:\n' |
| 3181 | ' chromium/try: win', |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 3182 | git_cl.sys.stdout.getvalue()) |
| 3183 | |
| 3184 | expected_request = { |
| 3185 | "requests": [{ |
| 3186 | "scheduleBuild": { |
| 3187 | "requestId": "uuid4", |
| 3188 | "builder": { |
| 3189 | "project": "chromium", |
| 3190 | "builder": "win", |
| 3191 | "bucket": "try", |
| 3192 | }, |
| 3193 | "gerritChanges": [{ |
| 3194 | "project": "depot_tools", |
| 3195 | "host": "chromium-review.googlesource.com", |
| 3196 | "patchset": 7, |
| 3197 | "change": 123456, |
| 3198 | }], |
| 3199 | "properties": { |
| 3200 | "category": "git_cl_try", |
| 3201 | "json": [{"a": 1}, None], |
| 3202 | "key": "val", |
| 3203 | }, |
| 3204 | "tags": [ |
| 3205 | {"value": "win", "key": "builder"}, |
| 3206 | {"value": "git_cl_try", "key": "user_agent"}, |
| 3207 | ], |
| 3208 | }, |
| 3209 | }], |
| 3210 | } |
| 3211 | mockCallBuildbucket.assert_called_with( |
| 3212 | mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request) |
| 3213 | |
Anthony Polito | 1a5fe23 | 2020-01-24 23:17:52 +0000 | [diff] [blame] | 3214 | @mock.patch('git_cl._call_buildbucket') |
| 3215 | def testScheduleOnBuildbucketWithRevision(self, mockCallBuildbucket): |
| 3216 | mockCallBuildbucket.return_value = {} |
| 3217 | |
| 3218 | self.assertEqual(0, git_cl.main([ |
| 3219 | 'try', '-B', 'luci.chromium.try', '-b', 'win', '-b', 'linux', |
| 3220 | '-p', 'key=val', '-p', 'json=[{"a":1}, null]', |
| 3221 | '-r', 'beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef'])) |
| 3222 | self.assertIn( |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame^] | 3223 | 'Scheduling jobs on:\n' |
| 3224 | ' chromium/try: linux\n' |
| 3225 | ' chromium/try: win', |
Anthony Polito | 1a5fe23 | 2020-01-24 23:17:52 +0000 | [diff] [blame] | 3226 | git_cl.sys.stdout.getvalue()) |
| 3227 | |
| 3228 | expected_request = { |
| 3229 | "requests": [{ |
| 3230 | "scheduleBuild": { |
| 3231 | "requestId": "uuid4", |
| 3232 | "builder": { |
| 3233 | "project": "chromium", |
| 3234 | "builder": "linux", |
| 3235 | "bucket": "try", |
| 3236 | }, |
| 3237 | "gerritChanges": [{ |
| 3238 | "project": "depot_tools", |
| 3239 | "host": "chromium-review.googlesource.com", |
| 3240 | "patchset": 7, |
| 3241 | "change": 123456, |
| 3242 | }], |
| 3243 | "properties": { |
| 3244 | "category": "git_cl_try", |
| 3245 | "json": [{"a": 1}, None], |
| 3246 | "key": "val", |
| 3247 | }, |
| 3248 | "tags": [ |
| 3249 | {"value": "linux", "key": "builder"}, |
| 3250 | {"value": "git_cl_try", "key": "user_agent"}, |
| 3251 | ], |
| 3252 | "gitilesCommit": { |
| 3253 | "host": "chromium-review.googlesource.com", |
| 3254 | "project": "depot_tools", |
| 3255 | "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef", |
| 3256 | } |
| 3257 | }, |
| 3258 | }, |
| 3259 | { |
| 3260 | "scheduleBuild": { |
| 3261 | "requestId": "uuid4", |
| 3262 | "builder": { |
| 3263 | "project": "chromium", |
| 3264 | "builder": "win", |
| 3265 | "bucket": "try", |
| 3266 | }, |
| 3267 | "gerritChanges": [{ |
| 3268 | "project": "depot_tools", |
| 3269 | "host": "chromium-review.googlesource.com", |
| 3270 | "patchset": 7, |
| 3271 | "change": 123456, |
| 3272 | }], |
| 3273 | "properties": { |
| 3274 | "category": "git_cl_try", |
| 3275 | "json": [{"a": 1}, None], |
| 3276 | "key": "val", |
| 3277 | }, |
| 3278 | "tags": [ |
| 3279 | {"value": "win", "key": "builder"}, |
| 3280 | {"value": "git_cl_try", "key": "user_agent"}, |
| 3281 | ], |
| 3282 | "gitilesCommit": { |
| 3283 | "host": "chromium-review.googlesource.com", |
| 3284 | "project": "depot_tools", |
| 3285 | "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef", |
| 3286 | } |
| 3287 | }, |
| 3288 | }], |
| 3289 | } |
| 3290 | mockCallBuildbucket.assert_called_with( |
| 3291 | mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request) |
| 3292 | |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame^] | 3293 | @mock.patch('sys.stderr', StringIO()) |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3294 | def testScheduleOnBuildbucket_WrongBucket(self): |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame^] | 3295 | with self.assertRaises(SystemExit): |
| 3296 | git_cl.main([ |
| 3297 | 'try', '-B', 'not-a-bucket', '-b', 'win', |
| 3298 | '-p', 'key=val', '-p', 'json=[{"a":1}, null]']) |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 3299 | self.assertIn( |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame^] | 3300 | 'Invalid bucket: not-a-bucket.', |
| 3301 | sys.stderr.getvalue()) |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 3302 | |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 3303 | @mock.patch('git_cl._call_buildbucket') |
| 3304 | @mock.patch('git_cl.fetch_try_jobs') |
| 3305 | def testScheduleOnBuildbucketRetryFailed( |
| 3306 | self, mockFetchTryJobs, mockCallBuildbucket): |
| 3307 | |
| 3308 | git_cl.fetch_try_jobs.side_effect = lambda *_, **kw: { |
| 3309 | 7: [], |
| 3310 | 6: [{ |
| 3311 | 'id': 112112, |
| 3312 | 'builder': { |
| 3313 | 'project': 'chromium', |
| 3314 | 'bucket': 'try', |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 3315 | 'builder': 'linux',}, |
| 3316 | 'createTime': '2019-10-09T08:00:01.854286Z', |
| 3317 | 'tags': [], |
| 3318 | 'status': 'FAILURE',}],}[kw['patchset']] |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 3319 | mockCallBuildbucket.return_value = {} |
| 3320 | |
| 3321 | self.assertEqual(0, git_cl.main(['try', '--retry-failed'])) |
| 3322 | self.assertIn( |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame^] | 3323 | 'Scheduling jobs on:\n' |
| 3324 | ' chromium/try: linux', |
Andrii Shyshkalov | aeee6a8 | 2019-10-09 21:56:25 +0000 | [diff] [blame] | 3325 | git_cl.sys.stdout.getvalue()) |
| 3326 | |
| 3327 | expected_request = { |
| 3328 | "requests": [{ |
| 3329 | "scheduleBuild": { |
| 3330 | "requestId": "uuid4", |
| 3331 | "builder": { |
| 3332 | "project": "chromium", |
| 3333 | "bucket": "try", |
| 3334 | "builder": "linux", |
| 3335 | }, |
| 3336 | "gerritChanges": [{ |
| 3337 | "project": "depot_tools", |
| 3338 | "host": "chromium-review.googlesource.com", |
| 3339 | "patchset": 7, |
| 3340 | "change": 123456, |
| 3341 | }], |
| 3342 | "properties": { |
| 3343 | "category": "git_cl_try", |
| 3344 | }, |
| 3345 | "tags": [ |
| 3346 | {"value": "linux", "key": "builder"}, |
| 3347 | {"value": "git_cl_try", "key": "user_agent"}, |
| 3348 | {"value": "1", "key": "retry_failed"}, |
| 3349 | ], |
| 3350 | }, |
| 3351 | }], |
| 3352 | } |
| 3353 | mockCallBuildbucket.assert_called_with( |
| 3354 | mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request) |
| 3355 | |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 3356 | def test_parse_bucket(self): |
| 3357 | test_cases = [ |
| 3358 | { |
| 3359 | 'bucket': 'chromium/try', |
| 3360 | 'result': ('chromium', 'try'), |
| 3361 | }, |
| 3362 | { |
| 3363 | 'bucket': 'luci.chromium.try', |
| 3364 | 'result': ('chromium', 'try'), |
| 3365 | 'has_warning': True, |
| 3366 | }, |
| 3367 | { |
| 3368 | 'bucket': 'skia.primary', |
| 3369 | 'result': ('skia', 'skia.primary'), |
| 3370 | 'has_warning': True, |
| 3371 | }, |
| 3372 | { |
| 3373 | 'bucket': 'not-a-bucket', |
| 3374 | 'result': (None, None), |
| 3375 | }, |
| 3376 | ] |
| 3377 | |
| 3378 | for test_case in test_cases: |
| 3379 | git_cl.sys.stdout.truncate(0) |
| 3380 | self.assertEqual( |
| 3381 | test_case['result'], git_cl._parse_bucket(test_case['bucket'])) |
| 3382 | if test_case.get('has_warning'): |
Edward Lemur | 6215c79 | 2019-10-03 21:59:05 +0000 | [diff] [blame] | 3383 | expected_warning = 'WARNING Please use %s/%s to specify the bucket' % ( |
| 3384 | test_case['result']) |
| 3385 | self.assertIn(expected_warning, git_cl.sys.stdout.getvalue()) |
Edward Lemur | 4c707a2 | 2019-09-24 21:13:43 +0000 | [diff] [blame] | 3386 | |
| 3387 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3388 | class CMDUploadTestCase(CMDTestCaseBase): |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 3389 | def setUp(self): |
| 3390 | super(CMDUploadTestCase, self).setUp() |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3391 | mock.patch('git_cl.fetch_try_jobs').start() |
| 3392 | mock.patch('git_cl._trigger_try_jobs', return_value={}).start() |
| 3393 | mock.patch('git_cl.Changelist.CMDUpload', return_value=0).start() |
Anthony Polito | 46689b0 | 2019-11-15 20:56:41 +0000 | [diff] [blame] | 3394 | mock.patch('git_cl.Settings.GetIsGerrit', return_value=True).start() |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 3395 | self.addCleanup(mock.patch.stopall) |
| 3396 | |
Edward Lesmes | 7677e5c | 2020-02-19 20:39:03 +0000 | [diff] [blame] | 3397 | def testWarmUpChangeDetailCache(self): |
| 3398 | self.assertEqual(0, git_cl.main(['upload'])) |
| 3399 | gerrit_util.GetChangeDetail.assert_called_once_with( |
| 3400 | 'chromium-review.googlesource.com', 'depot_tools~123456', |
| 3401 | frozenset([ |
| 3402 | 'LABELS', 'CURRENT_REVISION', 'DETAILED_ACCOUNTS', |
| 3403 | 'CURRENT_COMMIT'])) |
| 3404 | |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3405 | def testUploadRetryFailed(self): |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 3406 | # This test mocks out the actual upload part, and just asserts that after |
| 3407 | # upload, if --retry-failed is added, then the tool will fetch try jobs |
| 3408 | # from the previous patchset and trigger the right builders on the latest |
| 3409 | # patchset. |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3410 | git_cl.fetch_try_jobs.side_effect = [ |
| 3411 | # Latest patchset: No builds. |
| 3412 | [], |
| 3413 | # Patchset before latest: Some builds. |
Andrii Shyshkalov | 2cbae8a | 2019-10-11 21:30:27 +0000 | [diff] [blame] | 3414 | [{ |
| 3415 | 'id': str(100 + idx), |
| 3416 | 'builder': { |
| 3417 | 'project': 'chromium', |
| 3418 | 'bucket': 'try', |
| 3419 | 'builder': 'bot_' + status.lower(), |
| 3420 | }, |
| 3421 | 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10), |
| 3422 | 'tags': [], |
| 3423 | 'status': status, |
| 3424 | } for idx, status in enumerate(self._STATUSES)], |
Andrii Shyshkalov | 1ad5811 | 2019-10-08 01:46:14 +0000 | [diff] [blame] | 3425 | ] |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3426 | |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 3427 | self.assertEqual(0, git_cl.main(['upload', '--retry-failed'])) |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3428 | self.assertEqual([ |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 3429 | mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7), |
| 3430 | mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6), |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3431 | ], git_cl.fetch_try_jobs.mock_calls) |
Edward Lemur | 4576851 | 2020-03-02 19:03:14 +0000 | [diff] [blame^] | 3432 | expected_buckets = [ |
| 3433 | ('chromium', 'try', 'bot_failure'), |
| 3434 | ('chromium', 'try', 'bot_infra_failure'), |
| 3435 | ] |
Edward Lemur | baaf6be | 2019-10-09 18:00:44 +0000 | [diff] [blame] | 3436 | git_cl._trigger_try_jobs.assert_called_once_with( |
Edward Lemur | 5b929a4 | 2019-10-21 17:57:39 +0000 | [diff] [blame] | 3437 | mock.ANY, expected_buckets, mock.ANY, 8) |
Quinten Yearsley | a19d353 | 2019-09-30 21:54:39 +0000 | [diff] [blame] | 3438 | |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3439 | |
Edward Lemur | da4b6c6 | 2020-02-13 00:28:40 +0000 | [diff] [blame] | 3440 | class CMDFormatTestCase(unittest.TestCase): |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3441 | |
| 3442 | def setUp(self): |
| 3443 | super(CMDFormatTestCase, self).setUp() |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 3444 | mock.patch('git_cl.RunCommand').start() |
| 3445 | mock.patch('clang_format.FindClangFormatToolInChromiumTree').start() |
| 3446 | mock.patch('clang_format.FindClangFormatScriptInChromiumTree').start() |
| 3447 | mock.patch('git_cl.settings').start() |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3448 | self._top_dir = tempfile.mkdtemp() |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 3449 | self.addCleanup(mock.patch.stopall) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3450 | |
| 3451 | def tearDown(self): |
| 3452 | shutil.rmtree(self._top_dir) |
| 3453 | super(CMDFormatTestCase, self).tearDown() |
| 3454 | |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 3455 | def _make_temp_file(self, fname, contents): |
| 3456 | with open(os.path.join(self._top_dir, fname), 'w') as tf: |
| 3457 | tf.write('\n'.join(contents)) |
| 3458 | |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3459 | def _make_yapfignore(self, contents): |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 3460 | self._make_temp_file('.yapfignore', contents) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3461 | |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 3462 | def _check_yapf_filtering(self, files, expected): |
| 3463 | self.assertEqual(expected, git_cl._FilterYapfIgnoredFiles( |
| 3464 | files, git_cl._GetYapfIgnorePatterns(self._top_dir))) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3465 | |
Jamie Madill | 5e96ad1 | 2020-01-13 16:08:35 +0000 | [diff] [blame] | 3466 | def testClangFormatDiffFull(self): |
| 3467 | self._make_temp_file('test.cc', ['// test']) |
| 3468 | git_cl.settings.GetFormatFullByDefault.return_value = False |
| 3469 | diff_file = [os.path.join(self._top_dir, 'test.cc')] |
| 3470 | mock_opts = mock.Mock(full=True, dry_run=True, diff=False) |
| 3471 | |
| 3472 | # Diff |
| 3473 | git_cl.RunCommand.return_value = ' // test' |
| 3474 | return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file, |
| 3475 | self._top_dir, 'HEAD') |
| 3476 | self.assertEqual(2, return_value) |
| 3477 | |
| 3478 | # No diff |
| 3479 | git_cl.RunCommand.return_value = '// test' |
| 3480 | return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file, |
| 3481 | self._top_dir, 'HEAD') |
| 3482 | self.assertEqual(0, return_value) |
| 3483 | |
| 3484 | def testClangFormatDiff(self): |
| 3485 | git_cl.settings.GetFormatFullByDefault.return_value = False |
| 3486 | mock_opts = mock.Mock(full=False, dry_run=True, diff=False) |
| 3487 | |
| 3488 | # Diff |
| 3489 | git_cl.RunCommand.return_value = 'error' |
| 3490 | return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir, |
| 3491 | 'HEAD') |
| 3492 | self.assertEqual(2, return_value) |
| 3493 | |
| 3494 | # No diff |
| 3495 | git_cl.RunCommand.return_value = '' |
| 3496 | return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir, |
| 3497 | 'HEAD') |
| 3498 | self.assertEqual(0, return_value) |
| 3499 | |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 3500 | def testYapfignoreExplicit(self): |
| 3501 | self._make_yapfignore(['foo/bar.py', 'foo/bar/baz.py']) |
| 3502 | files = [ |
| 3503 | 'bar.py', |
| 3504 | 'foo/bar.py', |
| 3505 | 'foo/baz.py', |
| 3506 | 'foo/bar/baz.py', |
| 3507 | 'foo/bar/foobar.py', |
| 3508 | ] |
| 3509 | expected = [ |
| 3510 | 'bar.py', |
| 3511 | 'foo/baz.py', |
| 3512 | 'foo/bar/foobar.py', |
| 3513 | ] |
| 3514 | self._check_yapf_filtering(files, expected) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3515 | |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 3516 | def testYapfignoreSingleWildcards(self): |
| 3517 | self._make_yapfignore(['*bar.py', 'foo*', 'baz*.py']) |
| 3518 | files = [ |
| 3519 | 'bar.py', # Matched by *bar.py. |
| 3520 | 'bar.txt', |
| 3521 | 'foobar.py', # Matched by *bar.py, foo*. |
| 3522 | 'foobar.txt', # Matched by foo*. |
| 3523 | 'bazbar.py', # Matched by *bar.py, baz*.py. |
| 3524 | 'bazbar.txt', |
| 3525 | 'foo/baz.txt', # Matched by foo*. |
| 3526 | 'bar/bar.py', # Matched by *bar.py. |
| 3527 | 'baz/foo.py', # Matched by baz*.py, foo*. |
| 3528 | 'baz/foo.txt', |
| 3529 | ] |
| 3530 | expected = [ |
| 3531 | 'bar.txt', |
| 3532 | 'bazbar.txt', |
| 3533 | 'baz/foo.txt', |
| 3534 | ] |
| 3535 | self._check_yapf_filtering(files, expected) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3536 | |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 3537 | def testYapfignoreMultiplewildcards(self): |
| 3538 | self._make_yapfignore(['*bar*', '*foo*baz.txt']) |
| 3539 | files = [ |
| 3540 | 'bar.py', # Matched by *bar*. |
| 3541 | 'bar.txt', # Matched by *bar*. |
| 3542 | 'abar.py', # Matched by *bar*. |
| 3543 | 'foobaz.txt', # Matched by *foo*baz.txt. |
| 3544 | 'foobaz.py', |
| 3545 | 'afoobaz.txt', # Matched by *foo*baz.txt. |
| 3546 | ] |
| 3547 | expected = [ |
| 3548 | 'foobaz.py', |
| 3549 | ] |
| 3550 | self._check_yapf_filtering(files, expected) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3551 | |
| 3552 | def testYapfignoreComments(self): |
| 3553 | self._make_yapfignore(['test.py', '#test2.py']) |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 3554 | files = [ |
| 3555 | 'test.py', |
| 3556 | 'test2.py', |
| 3557 | ] |
| 3558 | expected = [ |
| 3559 | 'test2.py', |
| 3560 | ] |
| 3561 | self._check_yapf_filtering(files, expected) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3562 | |
| 3563 | def testYapfignoreBlankLines(self): |
| 3564 | self._make_yapfignore(['test.py', '', '', 'test2.py']) |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 3565 | files = [ |
| 3566 | 'test.py', |
| 3567 | 'test2.py', |
| 3568 | 'test3.py', |
| 3569 | ] |
| 3570 | expected = [ |
| 3571 | 'test3.py', |
| 3572 | ] |
| 3573 | self._check_yapf_filtering(files, expected) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3574 | |
| 3575 | def testYapfignoreWhitespace(self): |
| 3576 | self._make_yapfignore([' test.py ']) |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 3577 | files = [ |
| 3578 | 'test.py', |
| 3579 | 'test2.py', |
| 3580 | ] |
| 3581 | expected = [ |
| 3582 | 'test2.py', |
| 3583 | ] |
| 3584 | self._check_yapf_filtering(files, expected) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3585 | |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 3586 | def testYapfignoreNoFiles(self): |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3587 | self._make_yapfignore(['test.py']) |
Brian Sheedy | b4307d5 | 2019-12-02 19:18:17 +0000 | [diff] [blame] | 3588 | self._check_yapf_filtering([], []) |
| 3589 | |
| 3590 | def testYapfignoreMissingYapfignore(self): |
| 3591 | files = [ |
| 3592 | 'test.py', |
| 3593 | ] |
| 3594 | expected = [ |
| 3595 | 'test.py', |
| 3596 | ] |
| 3597 | self._check_yapf_filtering(files, expected) |
Brian Sheedy | 59b06a8 | 2019-10-14 17:03:29 +0000 | [diff] [blame] | 3598 | |
| 3599 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 3600 | if __name__ == '__main__': |
Andrii Shyshkalov | 18df0cd | 2017-01-25 15:22:20 +0100 | [diff] [blame] | 3601 | logging.basicConfig( |
| 3602 | level=logging.DEBUG if '-v' in sys.argv else logging.ERROR) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 3603 | unittest.main() |