blob: a34b59a58ea9d5def9a75dfd59a80102e1ab5438 [file] [log] [blame]
Edward Lemur0db01f02019-11-12 22:01:51 +00001#!/usr/bin/env vpython3
2# coding=utf-8
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00003# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00004# Use of this source code is governed by a BSD-style license that can be
5# found in the LICENSE file.
6
7"""Unit tests for git_cl.py."""
8
Edward Lemur85153282020-02-14 22:06:29 +00009from __future__ import print_function
Edward Lemur0db01f02019-11-12 22:01:51 +000010from __future__ import unicode_literals
11
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +010012import datetime
tandriide281ae2016-10-12 06:02:30 -070013import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010014import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000015import os
Edward Lemur85153282020-02-14 22:06:29 +000016import pprint
Brian Sheedy59b06a82019-10-14 17:03:29 +000017import shutil
maruel@chromium.orgddd59412011-11-30 14:20:38 +000018import sys
Aaron Gable9a03ae02017-11-03 11:31:07 -070019import tempfile
maruel@chromium.orgddd59412011-11-30 14:20:38 +000020import unittest
21
Edward Lemura8145022020-01-06 18:47:54 +000022if sys.version_info.major == 2:
23 from StringIO import StringIO
24 import mock
25else:
26 from io import StringIO
27 from unittest import mock
28
maruel@chromium.orgddd59412011-11-30 14:20:38 +000029sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
30
Edward Lemur5ba1e9c2018-07-23 18:19:02 +000031import metrics
32# We have to disable monitoring before importing git_cl.
33metrics.DISABLE_METRICS_COLLECTION = True
34
Jamie Madill5e96ad12020-01-13 16:08:35 +000035import clang_format
Eric Boren2fb63102018-10-05 13:05:03 +000036import gerrit_util
maruel@chromium.orgddd59412011-11-30 14:20:38 +000037import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000038import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000039import git_footers
Edward Lemur85153282020-02-14 22:06:29 +000040import git_new_branch
41import scm
maruel@chromium.orgddd59412011-11-30 14:20:38 +000042import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000043
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000044
Edward Lemur0db01f02019-11-12 22:01:51 +000045def callError(code=1, cmd='', cwd='', stdout=b'', stderr=b''):
tandrii5d48c322016-08-18 16:19:37 -070046 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
47
48
Edward Lemur4c707a22019-09-24 21:13:43 +000049def _constantFn(return_value):
50 def f(*args, **kwargs):
51 return return_value
52 return f
53
54
tandrii5d48c322016-08-18 16:19:37 -070055CERR1 = callError(1)
56
57
Edward Lemur0db01f02019-11-12 22:01:51 +000058def MakeNamedTemporaryFileMock(test, expected_content):
Aaron Gable9a03ae02017-11-03 11:31:07 -070059 class NamedTemporaryFileMock(object):
60 def __init__(self, *args, **kwargs):
61 self.name = '/tmp/named'
Edward Lemur0db01f02019-11-12 22:01:51 +000062 self.expected_content = expected_content.encode('utf-8', 'replace')
Aaron Gable9a03ae02017-11-03 11:31:07 -070063
64 def __enter__(self):
65 return self
66
67 def __exit__(self, _type, _value, _tb):
68 pass
69
70 def write(self, content):
71 if self.expected_content:
Edward Lemur0db01f02019-11-12 22:01:51 +000072 test.assertEqual(self.expected_content, content)
Aaron Gable9a03ae02017-11-03 11:31:07 -070073
74 def close(self):
75 pass
76
77 return NamedTemporaryFileMock
78
79
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000080class ChangelistMock(object):
81 # A class variable so we can access it when we don't have access to the
82 # instance that's being set.
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +000083 desc = ''
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000084 def __init__(self, **kwargs):
85 pass
86 def GetIssue(self):
87 return 1
Edward Lemur6c6827c2020-02-06 21:15:18 +000088 def FetchDescription(self):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000089 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070090 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000091 ChangelistMock.desc = desc
92
tandrii5d48c322016-08-18 16:19:37 -070093
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000094class PresubmitMock(object):
95 def __init__(self, *args, **kwargs):
96 self.reviewers = []
Daniel Cheng7227d212017-11-17 08:12:37 -080097 self.more_cc = ['chromium-reviews+test-more-cc@chromium.org']
98
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000099 @staticmethod
100 def should_continue():
101 return True
102
103
Edward Lemur85153282020-02-14 22:06:29 +0000104class GitMocks(object):
105 def __init__(self, config=None, branchref=None):
106 self.branchref = branchref or 'refs/heads/master'
107 self.config = config or {}
108
109 def GetBranchRef(self, _root):
110 return self.branchref
111
112 def NewBranch(self, branchref):
113 self.branchref = branchref
114
Edward Lemur26964072020-02-19 19:18:51 +0000115 def GetConfig(self, root, key, default=None):
116 if root != '':
117 key = '%s:%s' % (root, key)
Edward Lemur85153282020-02-14 22:06:29 +0000118 return self.config.get(key, default)
119
Edward Lemur26964072020-02-19 19:18:51 +0000120 def SetConfig(self, root, key, value=None):
121 if root != '':
122 key = '%s:%s' % (root, key)
Edward Lemur85153282020-02-14 22:06:29 +0000123 if value:
124 self.config[key] = value
125 return
126 if key not in self.config:
127 raise CERR1
128 del self.config[key]
129
130
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000131class WatchlistsMock(object):
132 def __init__(self, _):
133 pass
134 @staticmethod
135 def GetWatchersForPaths(_):
136 return ['joe@example.com']
137
138
Edward Lemur4c707a22019-09-24 21:13:43 +0000139class CodereviewSettingsFileMock(object):
140 def __init__(self):
141 pass
142 # pylint: disable=no-self-use
143 def read(self):
144 return ('CODE_REVIEW_SERVER: gerrit.chromium.org\n' +
145 'GERRIT_HOST: True\n')
146
147
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000148class AuthenticatorMock(object):
149 def __init__(self, *_args):
150 pass
151 def has_cached_credentials(self):
152 return True
tandrii221ab252016-10-06 08:12:04 -0700153 def authorize(self, http):
154 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000155
156
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100157def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000158 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
159
160 Usage:
161 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100162 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000163
164 OR
165 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100166 CookiesAuthenticatorMockFactory(
167 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000168 """
169 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800170 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000171 # Intentionally not calling super() because it reads actual cookie files.
172 pass
173 @classmethod
174 def get_gitcookies_path(cls):
175 return '~/.gitcookies'
176 @classmethod
177 def get_netrc_path(cls):
178 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100179 def _get_auth_for_host(self, host):
180 if same_auth:
181 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000182 return (hosts_with_creds or {}).get(host)
183 return CookiesAuthenticatorMock
184
Aaron Gable9a03ae02017-11-03 11:31:07 -0700185
kmarshall9249e012016-08-23 12:02:16 -0700186class MockChangelistWithBranchAndIssue():
187 def __init__(self, branch, issue):
188 self.branch = branch
189 self.issue = issue
190 def GetBranch(self):
191 return self.branch
192 def GetIssue(self):
193 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000194
tandriic2405f52016-10-10 08:13:15 -0700195
196class SystemExitMock(Exception):
197 pass
198
199
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000200class TestGitClBasic(unittest.TestCase):
Edward Lemur6c6827c2020-02-06 21:15:18 +0000201 def test_fetch_description(self):
Edward Lemurf38bc172019-09-03 21:02:13 +0000202 cl = git_cl.Changelist(issue=1, codereview_host='host')
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100203 cl.description = 'x'
204 cl.has_description = True
Edward Lemur6c6827c2020-02-06 21:15:18 +0000205 self.assertEqual(cl.FetchDescription(), 'x')
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700206
Andrii Shyshkalov71f0da32019-07-15 22:45:18 +0000207 def test_set_preserve_tryjobs(self):
208 d = git_cl.ChangeDescription('Simple.')
209 d.set_preserve_tryjobs()
210 self.assertEqual(d.description.splitlines(), [
211 'Simple.',
212 '',
213 'Cq-Do-Not-Cancel-Tryjobs: true',
214 ])
215 before = d.description
216 d.set_preserve_tryjobs()
217 self.assertEqual(before, d.description)
218
219 d = git_cl.ChangeDescription('\n'.join([
220 'One is enough',
221 '',
222 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
223 'Change-Id: Ideadbeef',
224 ]))
225 d.set_preserve_tryjobs()
226 self.assertEqual(d.description.splitlines(), [
227 'One is enough',
228 '',
229 'Cq-Do-Not-Cancel-Tryjobs: dups not encouraged, but don\'t hurt',
230 'Change-Id: Ideadbeef',
231 'Cq-Do-Not-Cancel-Tryjobs: true',
232 ])
233
tandriif9aefb72016-07-01 09:06:51 -0700234 def test_get_bug_line_values(self):
235 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
236 self.assertEqual(f('', ''), [])
237 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
238 self.assertEqual(f('v8', '456'), ['v8:456'])
239 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
240 # Not nice, but not worth carying.
241 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
242 ['v8:456', 'chromium:123', 'v8:123'])
243
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100244 def _test_git_number(self, parent_msg, dest_ref, child_msg,
245 parent_hash='parenthash'):
246 desc = git_cl.ChangeDescription(child_msg)
247 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
248 return desc.description
249
250 def assertEqualByLine(self, actual, expected):
251 self.assertEqual(actual.splitlines(), expected.splitlines())
252
253 def test_git_number_bad_parent(self):
254 with self.assertRaises(ValueError):
255 self._test_git_number('Parent', 'refs/heads/master', 'Child')
256
257 def test_git_number_bad_parent_footer(self):
258 with self.assertRaises(AssertionError):
259 self._test_git_number(
260 'Parent\n'
261 '\n'
262 'Cr-Commit-Position: wrong',
263 'refs/heads/master', 'Child')
264
265 def test_git_number_bad_lineage_ignored(self):
266 actual = self._test_git_number(
267 'Parent\n'
268 '\n'
269 'Cr-Commit-Position: refs/heads/master@{#1}\n'
270 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
271 'refs/heads/master', 'Child')
272 self.assertEqualByLine(
273 actual,
274 'Child\n'
275 '\n'
276 'Cr-Commit-Position: refs/heads/master@{#2}\n'
277 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
278
279 def test_git_number_same_branch(self):
280 actual = self._test_git_number(
281 'Parent\n'
282 '\n'
283 'Cr-Commit-Position: refs/heads/master@{#12}',
284 dest_ref='refs/heads/master',
285 child_msg='Child')
286 self.assertEqualByLine(
287 actual,
288 'Child\n'
289 '\n'
290 'Cr-Commit-Position: refs/heads/master@{#13}')
291
Andrii Shyshkalovde37c012017-07-06 21:06:50 +0200292 def test_git_number_same_branch_mixed_footers(self):
293 actual = self._test_git_number(
294 'Parent\n'
295 '\n'
296 'Cr-Commit-Position: refs/heads/master@{#12}',
297 dest_ref='refs/heads/master',
298 child_msg='Child\n'
299 '\n'
300 'Broken-by: design\n'
301 'BUG=123')
302 self.assertEqualByLine(
303 actual,
304 'Child\n'
305 '\n'
306 'Broken-by: design\n'
307 'BUG=123\n'
308 'Cr-Commit-Position: refs/heads/master@{#13}')
309
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100310 def test_git_number_same_branch_with_originals(self):
311 actual = self._test_git_number(
312 'Parent\n'
313 '\n'
314 'Cr-Commit-Position: refs/heads/master@{#12}',
315 dest_ref='refs/heads/master',
316 child_msg='Child\n'
317 '\n'
318 'Some users are smart and insert their own footers\n'
319 '\n'
320 'Cr-Whatever: value\n'
321 'Cr-Commit-Position: refs/copy/paste@{#22}')
322 self.assertEqualByLine(
323 actual,
324 'Child\n'
325 '\n'
326 'Some users are smart and insert their own footers\n'
327 '\n'
328 'Cr-Original-Whatever: value\n'
329 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
330 'Cr-Commit-Position: refs/heads/master@{#13}')
331
332 def test_git_number_new_branch(self):
333 actual = self._test_git_number(
334 'Parent\n'
335 '\n'
336 'Cr-Commit-Position: refs/heads/master@{#12}',
337 dest_ref='refs/heads/branch',
338 child_msg='Child')
339 self.assertEqualByLine(
340 actual,
341 'Child\n'
342 '\n'
343 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
344 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
345
346 def test_git_number_lineage(self):
347 actual = self._test_git_number(
348 'Parent\n'
349 '\n'
350 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
351 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
352 dest_ref='refs/heads/branch',
353 child_msg='Child')
354 self.assertEqualByLine(
355 actual,
356 'Child\n'
357 '\n'
358 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
359 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
360
361 def test_git_number_moooooooore_lineage(self):
362 actual = self._test_git_number(
363 'Parent\n'
364 '\n'
365 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
366 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
367 dest_ref='refs/heads/mooore',
368 child_msg='Child')
369 self.assertEqualByLine(
370 actual,
371 'Child\n'
372 '\n'
373 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
374 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
375 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
376
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100377 def test_git_number_ever_moooooooore_lineage(self):
Robert Iannucci456b0d62018-03-13 19:15:50 -0700378 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100379 actual = self._test_git_number(
380 'CQ commit on fresh new branch + numbering.\n'
381 '\n'
382 'NOTRY=True\n'
383 'NOPRESUBMIT=True\n'
384 'BUG=\n'
385 '\n'
386 'Review-Url: https://codereview.chromium.org/2577703003\n'
387 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
388 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
389 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
390 dest_ref='refs/heads/gnumb-test/cl',
391 child_msg='git cl on fresh new branch + numbering.\n'
392 '\n'
393 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
394 self.assertEqualByLine(
395 actual,
396 'git cl on fresh new branch + numbering.\n'
397 '\n'
398 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
399 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
400 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
401 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
402 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100403
404 def test_git_number_cherry_pick(self):
405 actual = self._test_git_number(
406 'Parent\n'
407 '\n'
408 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
409 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
410 dest_ref='refs/heads/branch',
411 child_msg='Child, which is cherry-pick from master\n'
412 '\n'
413 'Cr-Commit-Position: refs/heads/master@{#100}\n'
414 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
415 self.assertEqualByLine(
416 actual,
417 'Child, which is cherry-pick from master\n'
418 '\n'
419 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
420 '\n'
421 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
422 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
423 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
424
Edward Lemurda4b6c62020-02-13 00:28:40 +0000425 @mock.patch('gerrit_util.GetAccountDetails')
426 def test_valid_accounts(self, mockGetAccountDetails):
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000427 mock_per_account = {
428 'u1': None, # 404, doesn't exist.
429 'u2': {
430 '_account_id': 123124,
431 'avatars': [],
432 'email': 'u2@example.com',
433 'name': 'User Number 2',
434 'status': 'OOO',
435 },
436 'u3': git_cl.gerrit_util.GerritError(500, 'retries didn\'t help :('),
437 }
438 def GetAccountDetailsMock(_, account):
439 # Poor-man's mock library's side_effect.
440 v = mock_per_account.pop(account)
441 if isinstance(v, Exception):
442 raise v
443 return v
444
Edward Lemurda4b6c62020-02-13 00:28:40 +0000445 mockGetAccountDetails.side_effect = GetAccountDetailsMock
446 actual = git_cl.gerrit_util.ValidAccounts(
447 'host', ['u1', 'u2', 'u3'], max_threads=1)
Andrii Shyshkalovba7b0a42018-10-15 03:20:35 +0000448 self.assertEqual(actual, {
449 'u2': {
450 '_account_id': 123124,
451 'avatars': [],
452 'email': 'u2@example.com',
453 'name': 'User Number 2',
454 'status': 'OOO',
455 },
456 })
457
458
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200459class TestParseIssueURL(unittest.TestCase):
460 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
Edward Lemurf38bc172019-09-03 21:02:13 +0000461 fail=False):
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200462 self.assertIsNotNone(parsed)
463 if fail:
464 self.assertFalse(parsed.valid)
465 return
466 self.assertTrue(parsed.valid)
467 self.assertEqual(parsed.issue, issue)
468 self.assertEqual(parsed.patchset, patchset)
469 self.assertEqual(parsed.hostname, hostname)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200470
Edward Lemur678a6842019-10-03 22:25:05 +0000471 def test_ParseIssueNumberArgument(self):
472 def test(arg, *args, **kwargs):
473 self._validate(git_cl.ParseIssueNumberArgument(arg), *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200474
Edward Lemur678a6842019-10-03 22:25:05 +0000475 test('123', 123)
476 test('', fail=True)
477 test('abc', fail=True)
478 test('123/1', fail=True)
479 test('123a', fail=True)
480 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200481
Edward Lemur678a6842019-10-03 22:25:05 +0000482 test('https://codereview.source.com/123',
483 123, None, 'codereview.source.com')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200484 test('http://chrome-review.source.com/c/123',
485 123, None, 'chrome-review.source.com')
486 test('https://chrome-review.source.com/c/123/',
487 123, None, 'chrome-review.source.com')
488 test('https://chrome-review.source.com/c/123/4',
489 123, 4, 'chrome-review.source.com')
490 test('https://chrome-review.source.com/#/c/123/4',
491 123, 4, 'chrome-review.source.com')
492 test('https://chrome-review.source.com/c/123/4',
493 123, 4, 'chrome-review.source.com')
494 test('https://chrome-review.source.com/123',
495 123, None, 'chrome-review.source.com')
496 test('https://chrome-review.source.com/123/4',
497 123, 4, 'chrome-review.source.com')
498
Edward Lemur678a6842019-10-03 22:25:05 +0000499 test('https://chrome-review.source.com/bad/123/4', fail=True)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200500 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
501 test('https://chrome-review.source.com/c/abc/', fail=True)
502 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
503
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200504
505
Edward Lemurda4b6c62020-02-13 00:28:40 +0000506class GitCookiesCheckerTest(unittest.TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100507 def setUp(self):
508 super(GitCookiesCheckerTest, self).setUp()
509 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100510 self.c._all_hosts = []
Edward Lemurda4b6c62020-02-13 00:28:40 +0000511 mock.patch('sys.stdout', StringIO()).start()
512 self.addCleanup(mock.patch.stopall)
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100513
514 def mock_hosts_creds(self, subhost_identity_pairs):
515 def ensure_googlesource(h):
516 if not h.endswith(self.c._GOOGLESOURCE):
517 assert not h.endswith('.')
518 return h + '.' + self.c._GOOGLESOURCE
519 return h
520 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
521 for h, i in subhost_identity_pairs]
522
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200523 def test_identity_parsing(self):
524 self.assertEqual(self.c._parse_identity('ldap.google.com'),
525 ('ldap', 'google.com'))
526 self.assertEqual(self.c._parse_identity('git-ldap.example.com'),
527 ('ldap', 'example.com'))
528 # Specical case because we know there are no subdomains in chromium.org.
529 self.assertEqual(self.c._parse_identity('git-note.period.chromium.org'),
530 ('note.period', 'chromium.org'))
Lei Zhangd3f769a2017-12-15 15:16:14 -0800531 # Pathological: ".period." can be either username OR domain, more likely
532 # domain.
Andrii Shyshkalov0d2dea02017-07-17 15:17:55 +0200533 self.assertEqual(self.c._parse_identity('git-note.period.example.com'),
534 ('note', 'period.example.com'))
535
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100536 def test_analysis_nothing(self):
537 self.c._all_hosts = []
538 self.assertFalse(self.c.has_generic_host())
539 self.assertEqual(set(), self.c.get_conflicting_hosts())
540 self.assertEqual(set(), self.c.get_duplicated_hosts())
541 self.assertEqual(set(), self.c.get_partially_configured_hosts())
542 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
543
544 def test_analysis(self):
545 self.mock_hosts_creds([
546 ('.googlesource.com', 'git-example.chromium.org'),
547
548 ('chromium', 'git-example.google.com'),
549 ('chromium-review', 'git-example.google.com'),
550 ('chrome-internal', 'git-example.chromium.org'),
551 ('chrome-internal-review', 'git-example.chromium.org'),
552 ('conflict', 'git-example.google.com'),
553 ('conflict-review', 'git-example.chromium.org'),
554 ('dup', 'git-example.google.com'),
555 ('dup', 'git-example.google.com'),
556 ('dup-review', 'git-example.google.com'),
557 ('partial', 'git-example.google.com'),
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200558 ('gpartial-review', 'git-example.google.com'),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100559 ])
560 self.assertTrue(self.c.has_generic_host())
561 self.assertEqual(set(['conflict.googlesource.com']),
562 self.c.get_conflicting_hosts())
563 self.assertEqual(set(['dup.googlesource.com']),
564 self.c.get_duplicated_hosts())
Andrii Shyshkalovc8173822017-07-10 12:10:53 +0200565 self.assertEqual(set(['partial.googlesource.com',
566 'gpartial-review.googlesource.com']),
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100567 self.c.get_partially_configured_hosts())
568 self.assertEqual(set(['chromium.googlesource.com',
569 'chrome-internal.googlesource.com']),
570 self.c.get_hosts_with_wrong_identities())
571
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100572 def test_report_no_problems(self):
573 self.test_analysis_nothing()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100574 self.assertFalse(self.c.find_and_report_problems())
575 self.assertEqual(sys.stdout.getvalue(), '')
576
Edward Lemurda4b6c62020-02-13 00:28:40 +0000577 @mock.patch(
578 'git_cl.gerrit_util.CookiesAuthenticator.get_gitcookies_path',
579 return_value='~/.gitcookies')
580 def test_report(self, *_mocks):
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100581 self.test_analysis()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100582 self.assertTrue(self.c.find_and_report_problems())
583 with open(os.path.join(os.path.dirname(__file__),
584 'git_cl_creds_check_report.txt')) as f:
585 expected = f.read()
586 def by_line(text):
587 return [l.rstrip() for l in text.rstrip().splitlines()]
Robert Iannucci456b0d62018-03-13 19:15:50 -0700588 self.maxDiff = 10000 # pylint: disable=attribute-defined-outside-init
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200589 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100590
Nodir Turakulovd0e2cd22017-11-15 10:22:06 -0800591
Edward Lemurda4b6c62020-02-13 00:28:40 +0000592class TestGitCl(unittest.TestCase):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000593 def setUp(self):
594 super(TestGitCl, self).setUp()
595 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700596 self._calls_done = []
Edward Lemurda4b6c62020-02-13 00:28:40 +0000597 mock.patch('sys.stdout', StringIO()).start()
598 mock.patch(
599 'git_cl.time_time',
600 lambda: self._mocked_call('time.time')).start()
601 mock.patch(
602 'git_cl.metrics.collector.add_repeated',
603 lambda *a: self._mocked_call('add_repeated', *a)).start()
604 mock.patch('subprocess2.call', self._mocked_call).start()
605 mock.patch('subprocess2.check_call', self._mocked_call).start()
606 mock.patch('subprocess2.check_output', self._mocked_call).start()
607 mock.patch(
608 'subprocess2.communicate',
609 lambda *a, **_k: ([self._mocked_call(*a), ''], 0)).start()
610 mock.patch(
611 'git_cl.gclient_utils.CheckCallAndFilter',
612 self._mocked_call).start()
613 mock.patch('git_common.is_dirty_git_tree', lambda x: False).start()
614 mock.patch(
615 'git_common.get_or_create_merge_base',
616 lambda *a: self._mocked_call('get_or_create_merge_base', *a)).start()
617 mock.patch('git_cl.BranchExists', return_value=True).start()
618 mock.patch('git_cl.FindCodereviewSettingsFile', return_value='').start()
619 mock.patch(
620 'git_cl.SaveDescriptionBackup',
621 lambda _: self._mocked_call('SaveDescriptionBackup')).start()
622 mock.patch(
623 'git_cl.ask_for_data',
624 lambda prompt: self._mocked_call('ask_for_data', prompt)).start()
625 mock.patch(
626 'git_cl.write_json',
627 lambda *a: self._mocked_call('write_json', *a)).start()
628 mock.patch(
629 'git_cl.presubmit_support.DoPresubmitChecks', PresubmitMock).start()
630 mock.patch('git_cl.watchlists.Watchlists', WatchlistsMock).start()
631 mock.patch('git_cl.auth.Authenticator', AuthenticatorMock).start()
Edward Lesmes7677e5c2020-02-19 20:39:03 +0000632 mock.patch('gerrit_util.GetChangeDetail').start()
Edward Lemurda4b6c62020-02-13 00:28:40 +0000633 mock.patch(
634 'git_cl.gerrit_util.GetChangeComments',
635 lambda *a: self._mocked_call('GetChangeComments', *a)).start()
636 mock.patch(
637 'git_cl.gerrit_util.GetChangeRobotComments',
638 lambda *a: self._mocked_call('GetChangeRobotComments', *a)).start()
639 mock.patch(
640 'git_cl.gerrit_util.AddReviewers',
641 lambda *a: self._mocked_call('AddReviewers', *a)).start()
642 mock.patch(
643 'git_cl.gerrit_util.SetReview',
644 lambda h, i, msg=None, labels=None, notify=None, ready=None: (
645 self._mocked_call(
646 'SetReview', h, i, msg, labels, notify, ready))).start()
647 mock.patch(
648 'git_cl.gerrit_util.LuciContextAuthenticator.is_luci',
649 return_value=False).start()
650 mock.patch(
651 'git_cl.gerrit_util.GceAuthenticator.is_gce',
652 return_value=False).start()
653 mock.patch(
654 'git_cl.gerrit_util.ValidAccounts',
655 lambda *a: self._mocked_call('ValidAccounts', *a)).start()
Edward Lemurd55c5072020-02-20 01:09:07 +0000656 mock.patch('sys.exit', side_effect=SystemExitMock).start()
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000657 mock.patch('git_cl.Settings.GetRoot', return_value='').start()
Edward Lemur85153282020-02-14 22:06:29 +0000658 self.mockGit = GitMocks()
659 mock.patch('scm.GIT.GetBranchRef', self.mockGit.GetBranchRef).start()
660 mock.patch('scm.GIT.GetConfig', self.mockGit.GetConfig).start()
661 mock.patch('scm.GIT.SetConfig', self.mockGit.SetConfig).start()
662 mock.patch('git_new_branch.main', self.mockGit.NewBranch).start()
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000663 mock.patch(
Edward Lemur85153282020-02-14 22:06:29 +0000664 'scm.GIT.FetchUpstreamTuple',
Edward Lemur15a9b8c2020-02-13 00:52:30 +0000665 return_value=('origin', 'refs/heads/master')).start()
Edward Lemur85153282020-02-14 22:06:29 +0000666 mock.patch(
667 'scm.GIT.CaptureStatus', return_value=[('M', 'foo.txt')]).start()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000668 # It's important to reset settings to not have inter-tests interference.
669 git_cl.settings = None
Edward Lemurda4b6c62020-02-13 00:28:40 +0000670 self.addCleanup(mock.patch.stopall)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000671
672 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000673 try:
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +0000674 self.assertEqual([], self.calls)
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100675 except AssertionError:
Edward Lemur85153282020-02-14 22:06:29 +0000676 calls = ''.join(' %s\n' % str(call) for call in self.calls[:5])
677 if len(self.calls) > 5:
678 calls += ' ...\n'
679 self.fail(
680 '\n'
681 'There are un-consumed calls after this test has finished:\n' +
682 calls)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000683 finally:
684 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000685
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000686 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000687 self.assertTrue(
688 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700689 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000690 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000691 expected_args, result = top
692
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000693 # Also logs otherwise it could get caught in a try/finally and be hard to
694 # diagnose.
695 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700696 N = 5
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +0000697 prior_calls = '\n '.join(
tandrii9d206752016-06-20 11:32:47 -0700698 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
699 for i, c in enumerate(self._calls_done[-N:]))
700 following_calls = '\n '.join(
701 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
702 for i, c in enumerate(self.calls[:N]))
703 extended_msg = (
704 'A few prior calls:\n %s\n\n'
705 'This (expected):\n @%d: %r\n'
706 'This (actual):\n @%d: %r\n\n'
707 'A few following expected calls:\n %s' %
708 (prior_calls, len(self._calls_done), expected_args,
709 len(self._calls_done), args, following_calls))
tandrii9d206752016-06-20 11:32:47 -0700710
tandrii99a72f22016-08-17 14:33:24 -0700711 self.fail('@%d\n'
712 ' Expected: %r\n'
Edward Lemur26964072020-02-19 19:18:51 +0000713 ' Actual: %r\n'
714 '\n'
715 '%s' % (
716 len(self._calls_done), expected_args, args, extended_msg))
tandrii9d206752016-06-20 11:32:47 -0700717
718 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700719 if isinstance(result, Exception):
720 raise result
Edward Lemur0db01f02019-11-12 22:01:51 +0000721 # stdout from git commands is supposed to be a bytestream. Convert it here
722 # instead of converting all test output in this file to bytes.
723 if args[0][0] == 'git' and not isinstance(result, bytes):
724 result = result.encode('utf-8')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000725 return result
726
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100727 def test_ask_for_explicit_yes_true(self):
728 self.calls = [
729 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
730 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
731 ]
732 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
733
tandrii48df5812016-10-17 03:55:37 -0700734 def test_LoadCodereviewSettingsFromFile_gerrit(self):
Edward Lemur79d4f992019-11-11 23:49:02 +0000735 codereview_file = StringIO('GERRIT_HOST: true')
tandrii48df5812016-10-17 03:55:37 -0700736 self.calls = [
737 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700738 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
739 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
740 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
741 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700742 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
743 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700744 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
745 CERR1),
Jamie Madilldc4d19e2019-10-24 21:50:02 +0000746 ((['git', 'config', '--unset-all', 'rietveld.format-full-by-default'],),
747 CERR1),
tandrii48df5812016-10-17 03:55:37 -0700748 ((['git', 'config', 'gerrit.host', 'true'],), ''),
749 ]
750 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
751
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000752 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100753 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200754 fetched_status=None, other_cl_owner=None,
Anthony Polito8b955342019-09-24 19:01:36 +0000755 custom_cl_base=None, short_hostname='chromium',
756 change_id=None):
Edward Lemur26964072020-02-19 19:18:51 +0000757 calls = []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200758 if custom_cl_base:
759 ancestor_revision = custom_cl_base
760 else:
761 # Determine ancestor_revision to be merge base.
762 ancestor_revision = 'fake_ancestor_sha'
763 calls += [
Edward Lemurda4b6c62020-02-13 00:28:40 +0000764 (('get_or_create_merge_base', 'master', 'refs/remotes/origin/master'),
765 ancestor_revision),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200766 ]
767
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100768 if issue:
Edward Lesmes7677e5c2020-02-19 20:39:03 +0000769 gerrit_util.GetChangeDetail.return_value = {
770 'owner': {'email': (other_cl_owner or 'owner@example.com')},
771 'change_id': (change_id or '123456789'),
772 'current_revision': 'sha1_of_current_revision',
773 'revisions': {'sha1_of_current_revision': {
774 'commit': {'message': fetched_description},
775 }},
776 'status': fetched_status or 'NEW',
777 }
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100778 if fetched_status == 'ABANDONED':
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +0100779 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100780 if other_cl_owner:
781 calls += [
782 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
783 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100784
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100785 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200786 ((['git', 'rev-parse', 'HEAD'],), '12345'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100787 ]
788
789 if not issue:
790 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200791 ((['git', 'log', '--pretty=format:%s%n%n%b',
792 ancestor_revision + '...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000793 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100794 ]
795
796 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200797 ((['git', 'config', 'user.email'],), 'me@example.com'),
Edward Lemur2c48f242019-06-04 16:14:09 +0000798 (('time.time',), 1000,),
799 (('time.time',), 3000,),
800 (('add_repeated', 'sub_commands', {
801 'execution_time': 2000,
802 'command': 'presubmit',
803 'exit_code': 0
804 }), None,),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200805 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50'] +
806 ([custom_cl_base] if custom_cl_base else
807 [ancestor_revision, 'HEAD']),),
808 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +0100809 ]
810 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +0000811
Edward Lemur26964072020-02-19 19:18:51 +0000812 def _gerrit_upload_calls(self, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -0700813 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000814 expected_upstream_ref='origin/refs/heads/master',
Aaron Gablefd238082017-06-07 13:42:34 -0700815 title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +0100816 post_amend_description=None, issue=None, cc=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000817 custom_cl_base=None, tbr=None,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +0000818 short_hostname='chromium',
Edward Lemur1b52d872019-05-09 21:12:12 +0000819 labels=None, change_id=None, original_title=None,
Anthony Polito8b955342019-09-24 19:01:36 +0000820 final_description=None, gitcookies_exists=True,
Josipe827b0f2020-01-30 00:07:20 +0000821 force=False, edit_description=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000822 if post_amend_description is None:
823 post_amend_description = description
bradnelsond975b302016-10-23 12:20:23 -0700824 cc = cc or []
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200825 # Determined in `_gerrit_base_calls`.
826 determined_ancestor_revision = custom_cl_base or 'fake_ancestor_sha'
827
828 calls = []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000829
Edward Lemur26964072020-02-19 19:18:51 +0000830 if squash_mode in ('override_squash', 'override_nosquash'):
831 self.mockGit.config['gerrit.override-squash-uploads'] = (
832 'true' if squash_mode == 'override_squash' else 'false')
tandriia60502f2016-06-20 02:01:53 -0700833
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000834 # If issue is given, then description is fetched from Gerrit instead.
835 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000836 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200837 ((['git', 'log', '--pretty=format:%s\n\n%b',
838 ((custom_cl_base + '..') if custom_cl_base else
839 'fake_ancestor_sha..HEAD')],),
840 description),
841 ]
Aaron Gableb56ad332017-01-06 15:24:31 -0800842 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000843 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -0800844 else:
845 if not title:
846 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200847 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
848 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -0800849 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000850 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000851 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000852 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200853 (('DownloadGerritHook', False), ''),
854 # Amending of commit message to get the Change-Id.
855 ((['git', 'log', '--pretty=format:%s\n\n%b',
856 determined_ancestor_revision + '..HEAD'],),
857 description),
858 ((['git', 'commit', '--amend', '-m', description],), ''),
859 ((['git', 'log', '--pretty=format:%s\n\n%b',
860 determined_ancestor_revision + '..HEAD'],),
861 post_amend_description)
862 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000863 if squash:
Anthony Polito8b955342019-09-24 19:01:36 +0000864 if force or not issue:
Anthony Polito8b955342019-09-24 19:01:36 +0000865 if not force:
866 calls += [
Anthony Polito8b955342019-09-24 19:01:36 +0000867 ((['RunEditor'],), description),
868 ]
Josipe827b0f2020-01-30 00:07:20 +0000869 # user wants to edit description
870 if edit_description:
871 calls += [
Josipe827b0f2020-01-30 00:07:20 +0000872 ((['RunEditor'],), edit_description),
873 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000874 ref_to_push = 'abcdef0123456789'
875 calls += [
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200876 ]
877
878 if custom_cl_base is None:
879 calls += [
Edward Lemurda4b6c62020-02-13 00:28:40 +0000880 (('get_or_create_merge_base', 'master', 'refs/remotes/origin/master'),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000881 'origin/master'),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200882 ]
883 parent = 'origin/master'
884 else:
885 calls += [
886 ((['git', 'merge-base', '--is-ancestor', custom_cl_base,
887 'refs/remotes/origin/master'],),
888 callError(1)), # Means not ancenstor.
889 (('ask_for_data',
890 'Do you take responsibility for cleaning up potential mess '
891 'resulting from proceeding with upload? Press Enter to upload, '
892 'or Ctrl+C to abort'), ''),
893 ]
894 parent = custom_cl_base
895
896 calls += [
897 ((['git', 'rev-parse', 'HEAD:'],), # `HEAD:` means HEAD's tree hash.
898 '0123456789abcdef'),
899 ((['git', 'commit-tree', '0123456789abcdef', '-p', parent,
Aaron Gable9a03ae02017-11-03 11:31:07 -0700900 '-F', '/tmp/named'],),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200901 ref_to_push),
902 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000903 else:
904 ref_to_push = 'HEAD'
905
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000906 calls += [
Andrii Shyshkalovd9fdc1f2018-09-27 02:13:09 +0000907 (('SaveDescriptionBackup',), None),
Andrii Shyshkalov550e9242017-04-12 17:14:49 +0200908 ((['git', 'rev-list',
909 (custom_cl_base if custom_cl_base else expected_upstream_ref) + '..' +
910 ref_to_push],),
911 '1hashPerLine\n'),
912 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +0000913
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000914 metrics_arguments = []
915
Aaron Gableafd52772017-06-27 16:40:10 -0700916 if notify:
Aaron Gable844cf292017-06-28 11:32:59 -0700917 ref_suffix = '%ready,notify=ALL'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000918 metrics_arguments += ['ready', 'notify=ALL']
Aaron Gable844cf292017-06-28 11:32:59 -0700919 else:
Jamie Madill276da0b2018-04-27 14:41:20 -0400920 if not issue and squash:
Aaron Gable844cf292017-06-28 11:32:59 -0700921 ref_suffix = '%wip'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000922 metrics_arguments.append('wip')
Aaron Gable844cf292017-06-28 11:32:59 -0700923 else:
924 ref_suffix = '%notify=NONE'
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000925 metrics_arguments.append('notify=NONE')
Aaron Gable9b713dd2016-12-14 16:04:21 -0800926
Aaron Gable70f4e242017-06-26 10:45:59 -0700927 if title:
Aaron Gableafd52772017-06-27 16:40:10 -0700928 ref_suffix += ',m=' + title
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000929 metrics_arguments.append('m')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +0000930
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000931 if short_hostname == 'chromium':
932 # All reviwers and ccs get into ref_suffix.
933 for r in sorted(reviewers):
934 ref_suffix += ',r=%s' % r
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000935 metrics_arguments.append('r')
Edward Lemur4508b422019-10-03 21:56:35 +0000936 if issue is None:
937 cc += ['chromium-reviews+test-more-cc@chromium.org', 'joe@example.com']
938 for c in sorted(cc):
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000939 ref_suffix += ',cc=%s' % c
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000940 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000941 reviewers, cc = [], []
942 else:
943 # TODO(crbug/877717): remove this case.
944 calls += [
945 (('ValidAccounts', '%s-review.googlesource.com' % short_hostname,
946 sorted(reviewers) + ['joe@example.com',
947 'chromium-reviews+test-more-cc@chromium.org'] + cc),
948 {
949 e: {'email': e}
950 for e in (reviewers + ['joe@example.com'] + cc)
951 })
952 ]
953 for r in sorted(reviewers):
954 if r != 'bad-account-or-email':
955 ref_suffix += ',r=%s' % r
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000956 metrics_arguments.append('r')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000957 reviewers.remove(r)
Edward Lemur4508b422019-10-03 21:56:35 +0000958 if issue is None:
959 cc += ['joe@example.com']
960 for c in sorted(cc):
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000961 ref_suffix += ',cc=%s' % c
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000962 metrics_arguments.append('cc')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +0000963 if c in cc:
964 cc.remove(c)
Andrii Shyshkalov76988a82018-10-15 03:12:25 +0000965
Edward Lemur687ca902018-12-05 02:30:30 +0000966 for k, v in sorted((labels or {}).items()):
967 ref_suffix += ',l=%s+%d' % (k, v)
968 metrics_arguments.append('l=%s+%d' % (k, v))
969
970 if tbr:
971 calls += [
972 (('GetCodeReviewTbrScore',
973 '%s-review.googlesource.com' % short_hostname,
974 'my/repo'),
975 2,),
976 ]
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +0000977
Edward Lemur01f4a4f2018-11-03 00:40:38 +0000978 calls += [
979 (('time.time',), 1000,),
980 ((['git', 'push',
981 'https://%s.googlesource.com/my/repo' % short_hostname,
982 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
983 (('remote:\n'
984 'remote: Processing changes: (\)\n'
985 'remote: Processing changes: (|)\n'
986 'remote: Processing changes: (/)\n'
987 'remote: Processing changes: (-)\n'
988 'remote: Processing changes: new: 1 (/)\n'
989 'remote: Processing changes: new: 1, done\n'
990 'remote:\n'
991 'remote: New Changes:\n'
992 'remote: https://%s-review.googlesource.com/#/c/my/repo/+/123456'
993 ' XXX\n'
994 'remote:\n'
995 'To https://%s.googlesource.com/my/repo\n'
996 ' * [new branch] hhhh -> refs/for/refs/heads/master\n'
997 ) % (short_hostname, short_hostname)),),
998 (('time.time',), 2000,),
999 (('add_repeated',
1000 'sub_commands',
1001 {
1002 'execution_time': 1000,
1003 'command': 'git push',
1004 'exit_code': 0,
1005 'arguments': sorted(metrics_arguments),
1006 }),
1007 None,),
1008 ]
1009
Edward Lemur1b52d872019-05-09 21:12:12 +00001010 final_description = final_description or post_amend_description.strip()
1011 original_title = original_title or title or '<untitled>'
1012 # Trace-related calls
1013 calls += [
1014 # Write a description with context for the current trace.
1015 ((['FileWrite', 'TRACES_DIR/20170316T200041.000000-README',
Edward Lemur75391d42019-05-14 23:35:56 +00001016 'Thu Mar 16 20:00:41 2017\n'
1017 '%(short_hostname)s-review.googlesource.com\n'
1018 '%(change_id)s\n'
1019 '%(title)s\n'
1020 '%(description)s\n'
1021 '1000\n'
1022 '0\n'
1023 '%(trace_name)s' % {
Edward Lemur1b52d872019-05-09 21:12:12 +00001024 'short_hostname': short_hostname,
1025 'change_id': change_id,
1026 'description': final_description,
1027 'title': original_title,
Edward Lemur75391d42019-05-14 23:35:56 +00001028 'trace_name': 'TRACES_DIR/20170316T200041.000000',
Edward Lemur1b52d872019-05-09 21:12:12 +00001029 }],),
1030 None,
1031 ),
1032 # Read traces and shorten git hashes.
1033 ((['os.path.isfile', 'TEMP_DIR/trace-packet'],),
1034 True,
1035 ),
1036 ((['FileRead', 'TEMP_DIR/trace-packet'],),
1037 ('git-hash: 0123456789012345678901234567890123456789\n'
1038 'git-hash: abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde\n'),
1039 ),
1040 ((['FileWrite', 'TEMP_DIR/trace-packet',
1041 'git-hash: 012345\n'
1042 'git-hash: abcdea\n'],),
1043 None,
1044 ),
1045 # Make zip file for the git traces.
1046 ((['make_archive', 'TRACES_DIR/20170316T200041.000000-traces', 'zip',
1047 'TEMP_DIR'],),
1048 None,
1049 ),
1050 # Collect git config and gitcookies.
1051 ((['git', 'config', '-l'],),
1052 'git-config-output',
1053 ),
1054 ((['FileWrite', 'TEMP_DIR/git-config', 'git-config-output'],),
1055 None,
1056 ),
1057 ((['os.path.isfile', '~/.gitcookies'],),
1058 gitcookies_exists,
1059 ),
1060 ]
1061 if gitcookies_exists:
1062 calls += [
1063 ((['FileRead', '~/.gitcookies'],),
1064 'gitcookies 1/SECRET',
1065 ),
1066 ((['FileWrite', 'TEMP_DIR/gitcookies', 'gitcookies REDACTED'],),
1067 None,
1068 ),
1069 ]
1070 calls += [
1071 # Make zip file for the git config and gitcookies.
1072 ((['make_archive', 'TRACES_DIR/20170316T200041.000000-git-info', 'zip',
1073 'TEMP_DIR'],),
1074 None,
1075 ),
1076 ]
1077
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001078 # TODO(crbug/877717): this should never be used.
1079 if squash and short_hostname != 'chromium':
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001080 calls += [
1081 (('AddReviewers',
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00001082 'chromium-review.googlesource.com', 'my%2Frepo~123456',
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001083 sorted(reviewers),
Andrii Shyshkalov2f727912018-10-15 17:02:33 +00001084 cc + ['chromium-reviews+test-more-cc@chromium.org'],
1085 notify),
1086 ''),
Andrii Shyshkalov0ec9d152018-08-23 00:22:58 +00001087 ]
Edward Lemur26964072020-02-19 19:18:51 +00001088 calls += [
1089 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
1090 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +00001091 return calls
1092
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001093 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001094 self,
1095 upload_args,
1096 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001097 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001098 squash=True,
1099 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001100 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001101 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001102 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001103 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001104 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001105 cc=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001106 fetched_status=None,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001107 other_cl_owner=None,
Aaron Gablefd238082017-06-07 13:42:34 -07001108 custom_cl_base=None,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001109 tbr=None,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001110 short_hostname='chromium',
Edward Lemur1b52d872019-05-09 21:12:12 +00001111 labels=None,
1112 change_id=None,
1113 original_title=None,
1114 final_description=None,
Anthony Polito8b955342019-09-24 19:01:36 +00001115 gitcookies_exists=True,
1116 force=False,
Josipe827b0f2020-01-30 00:07:20 +00001117 edit_description=None,
Anthony Polito8b955342019-09-24 19:01:36 +00001118 fetched_description=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001119 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001120 if squash_mode is None:
1121 if '--no-squash' in upload_args:
1122 squash_mode = 'nosquash'
1123 elif '--squash' in upload_args:
1124 squash_mode = 'squash'
1125 else:
1126 squash_mode = 'default'
1127
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001128 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001129 cc = cc or []
Edward Lemurda4b6c62020-02-13 00:28:40 +00001130 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001131 CookiesAuthenticatorMockFactory(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001132 same_auth=('git-owner.example.com', '', 'pass'))).start()
1133 mock.patch('git_cl.Changelist._GerritCommitMsgHookCheck',
1134 lambda _, offer_removal: None).start()
1135 mock.patch('git_cl.gclient_utils.RunEditor',
1136 lambda *_, **__: self._mocked_call(['RunEditor'])).start()
1137 mock.patch('git_cl.DownloadGerritHook', lambda force: self._mocked_call(
1138 'DownloadGerritHook', force)).start()
1139 mock.patch('git_cl.gclient_utils.FileRead',
1140 lambda path: self._mocked_call(['FileRead', path])).start()
1141 mock.patch('git_cl.gclient_utils.FileWrite',
Edward Lemur1b52d872019-05-09 21:12:12 +00001142 lambda path, contents: self._mocked_call(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001143 ['FileWrite', path, contents])).start()
1144 mock.patch('git_cl.datetime_now',
1145 lambda: datetime.datetime(2017, 3, 16, 20, 0, 41, 0)).start()
1146 mock.patch('git_cl.tempfile.mkdtemp', lambda: 'TEMP_DIR').start()
1147 mock.patch('git_cl.TRACES_DIR', 'TRACES_DIR').start()
1148 mock.patch('git_cl.TRACES_README_FORMAT',
Edward Lemur75391d42019-05-14 23:35:56 +00001149 '%(now)s\n'
1150 '%(gerrit_host)s\n'
1151 '%(change_id)s\n'
1152 '%(title)s\n'
1153 '%(description)s\n'
1154 '%(execution_time)s\n'
1155 '%(exit_code)s\n'
Edward Lemurda4b6c62020-02-13 00:28:40 +00001156 '%(trace_name)s').start()
1157 mock.patch('git_cl.shutil.make_archive',
1158 lambda *args: self._mocked_call(['make_archive'] +
1159 list(args))).start()
1160 mock.patch('os.path.isfile',
1161 lambda path: self._mocked_call(['os.path.isfile', path])).start()
Edward Lemurd55c5072020-02-20 01:09:07 +00001162 mock.patch('git_cl.Changelist.GitSanityChecks', return_value=True).start()
tandriia60502f2016-06-20 02:01:53 -07001163
Edward Lemur26964072020-02-19 19:18:51 +00001164 self.mockGit.config['gerrit.host'] = 'true'
Edward Lemur85153282020-02-14 22:06:29 +00001165 self.mockGit.config['branch.master.gerritissue'] = (
1166 str(issue) if issue else None)
1167 self.mockGit.config['remote.origin.url'] = (
1168 'https://%s.googlesource.com/my/repo' % short_hostname)
1169
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001170 self.calls = self._gerrit_base_calls(
1171 issue=issue,
Anthony Polito8b955342019-09-24 19:01:36 +00001172 fetched_description=fetched_description or description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001173 fetched_status=fetched_status,
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001174 other_cl_owner=other_cl_owner,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001175 custom_cl_base=custom_cl_base,
Anthony Polito8b955342019-09-24 19:01:36 +00001176 short_hostname=short_hostname,
1177 change_id=change_id)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001178 if fetched_status != 'ABANDONED':
Edward Lemurda4b6c62020-02-13 00:28:40 +00001179 mock.patch(
1180 'tempfile.NamedTemporaryFile',
1181 MakeNamedTemporaryFileMock(
1182 self, expected_content=description)).start()
1183 mock.patch('os.remove', return_value=True).start()
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001184 self.calls += self._gerrit_upload_calls(
1185 description, reviewers, squash,
1186 squash_mode=squash_mode,
1187 expected_upstream_ref=expected_upstream_ref,
Aaron Gablefd238082017-06-07 13:42:34 -07001188 title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001189 post_amend_description=post_amend_description,
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00001190 issue=issue, cc=cc,
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001191 custom_cl_base=custom_cl_base, tbr=tbr,
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001192 short_hostname=short_hostname,
Edward Lemur1b52d872019-05-09 21:12:12 +00001193 labels=labels,
1194 change_id=change_id,
1195 original_title=original_title,
1196 final_description=final_description,
Anthony Polito8b955342019-09-24 19:01:36 +00001197 gitcookies_exists=gitcookies_exists,
Josipe827b0f2020-01-30 00:07:20 +00001198 force=force,
1199 edit_description=edit_description)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001200 # Uncomment when debugging.
Raul Tambre80ee78e2019-05-06 22:41:05 +00001201 # print('\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001202 git_cl.main(['upload'] + upload_args)
Edward Lemur85153282020-02-14 22:06:29 +00001203 if squash:
Edward Lemur26964072020-02-19 19:18:51 +00001204 self.assertIssueAndPatchset(patchset=None)
Edward Lemur85153282020-02-14 22:06:29 +00001205 self.assertEqual(
1206 'abcdef0123456789',
Edward Lemur26964072020-02-19 19:18:51 +00001207 scm.GIT.GetBranchConfig('', 'master', 'gerritsquashhash'))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001208
Edward Lemur1b52d872019-05-09 21:12:12 +00001209 def test_gerrit_upload_traces_no_gitcookies(self):
1210 self._run_gerrit_upload_test(
1211 ['--no-squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001212 'desc ✔\n\nBUG=\n',
Edward Lemur1b52d872019-05-09 21:12:12 +00001213 [],
1214 squash=False,
Edward Lemur0db01f02019-11-12 22:01:51 +00001215 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001216 change_id='Ixxx',
1217 gitcookies_exists=False)
1218
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001219 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001220 self._run_gerrit_upload_test(
1221 ['--no-squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001222 'desc ✔\n\nBUG=\n',
tandriia60502f2016-06-20 02:01:53 -07001223 [],
1224 squash=False,
Edward Lemur0db01f02019-11-12 22:01:51 +00001225 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001226 change_id='Ixxx')
tandriia60502f2016-06-20 02:01:53 -07001227
1228 def test_gerrit_upload_without_change_id_override_nosquash(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001229 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001230 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001231 'desc ✔\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001232 [],
tandriia60502f2016-06-20 02:01:53 -07001233 squash=False,
1234 squash_mode='override_nosquash',
Edward Lemur0db01f02019-11-12 22:01:51 +00001235 post_amend_description='desc ✔\n\nBUG=\n\nChange-Id: Ixxx',
Edward Lemur1b52d872019-05-09 21:12:12 +00001236 change_id='Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001237
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001238 def test_gerrit_no_reviewer(self):
1239 self._run_gerrit_upload_test(
1240 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001241 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001242 [],
1243 squash=False,
Edward Lemur1b52d872019-05-09 21:12:12 +00001244 squash_mode='override_nosquash',
1245 change_id='I123456789')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001246
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001247 def test_gerrit_no_reviewer_non_chromium_host(self):
1248 # TODO(crbug/877717): remove this test case.
1249 self._run_gerrit_upload_test(
1250 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001251 'desc ✔\n\nBUG=\n\nChange-Id: I123456789\n',
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001252 [],
1253 squash=False,
1254 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001255 short_hostname='other',
1256 change_id='I123456789')
Andrii Shyshkalov0da5e8f2018-10-30 17:29:18 +00001257
Nick Carter8692b182017-11-06 16:30:38 -08001258 def test_gerrit_patchset_title_special_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001259 self._run_gerrit_upload_test(
Nick Carter8692b182017-11-06 16:30:38 -08001260 ['-f', '-t', 'We\'ll escape ^_ ^ special chars...@{u}'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001261 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001262 squash=False,
1263 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001264 title='We%27ll_escape_%5E%5F_%5E_special_chars%2E%2E%2E%40%7Bu%7D',
1265 change_id='I123456789',
1266 original_title='We\'ll escape ^_ ^ special chars...@{u}')
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001267
ukai@chromium.orge8077812012-02-03 03:41:46 +00001268 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001269 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001270 ['-r', 'foo@example.com', '--send-mail'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001271 'desc ✔\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001272 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001273 squash=False,
1274 squash_mode='override_nosquash',
Edward Lemur1b52d872019-05-09 21:12:12 +00001275 notify=True,
1276 change_id='I123456789',
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001277 final_description=(
Edward Lemur0db01f02019-11-12 22:01:51 +00001278 'desc ✔\n\nBUG=\nR=foo@example.com\n\nChange-Id: I123456789'))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001279
Anthony Polito8b955342019-09-24 19:01:36 +00001280 def test_gerrit_upload_force_sets_bug(self):
1281 self._run_gerrit_upload_test(
1282 ['-b', '10000', '-f'],
1283 u'desc=\n\nBug: 10000\nChange-Id: Ixxx',
1284 [],
1285 force=True,
1286 expected_upstream_ref='origin/master',
1287 fetched_description='desc=\n\nChange-Id: Ixxx',
1288 original_title='Initial upload',
1289 change_id='Ixxx')
1290
1291 def test_gerrit_upload_force_sets_bug_if_wrong_changeid(self):
1292 self._run_gerrit_upload_test(
1293 ['-b', '10000', '-f', '-m', 'Title'],
1294 u'desc=\n\nChange-Id: Ixxxx\n\nChange-Id: Izzzz\nBug: 10000',
1295 [],
1296 force=True,
1297 issue='123456',
1298 expected_upstream_ref='origin/master',
1299 fetched_description='desc=\n\nChange-Id: Ixxxx',
1300 original_title='Title',
1301 title='Title',
1302 change_id='Izzzz')
1303
Dan Beamd8b04ca2019-10-10 21:23:26 +00001304 def test_gerrit_upload_force_sets_fixed(self):
1305 self._run_gerrit_upload_test(
1306 ['-x', '10000', '-f'],
1307 u'desc=\n\nFixed: 10000\nChange-Id: Ixxx',
1308 [],
1309 force=True,
1310 expected_upstream_ref='origin/master',
1311 fetched_description='desc=\n\nChange-Id: Ixxx',
1312 original_title='Initial upload',
1313 change_id='Ixxx')
1314
ukai@chromium.orge8077812012-02-03 03:41:46 +00001315 def test_gerrit_reviewer_multiple(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001316 mock.patch('git_cl.gerrit_util.GetCodeReviewTbrScore',
1317 lambda *a: self._mocked_call('GetCodeReviewTbrScore', *a)).start()
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001318 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001319 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001320 'desc ✔\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
bradnelsond975b302016-10-23 12:20:23 -07001321 'CC=more@example.com,people@example.com\n\n'
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001322 'Change-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001323 ['reviewer@example.com', 'another@example.com'],
Yoshisato Yanagisawa81e3ff52017-09-26 15:33:34 +09001324 expected_upstream_ref='origin/master',
Aaron Gablefd238082017-06-07 13:42:34 -07001325 cc=['more@example.com', 'people@example.com'],
Edward Lemur687ca902018-12-05 02:30:30 +00001326 tbr='reviewer@example.com',
Edward Lemur1b52d872019-05-09 21:12:12 +00001327 labels={'Code-Review': 2},
1328 change_id='123456789',
1329 original_title='Initial upload')
tandriia60502f2016-06-20 02:01:53 -07001330
1331 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001332 self._run_gerrit_upload_test(
1333 [],
Edward Lemur0db01f02019-11-12 22:01:51 +00001334 'desc ✔\nBUG=\n\nChange-Id: 123456789',
tandriia60502f2016-06-20 02:01:53 -07001335 [],
Edward Lemur1b52d872019-05-09 21:12:12 +00001336 expected_upstream_ref='origin/master',
1337 change_id='123456789',
1338 original_title='Initial upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001339
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001340 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001341 self._run_gerrit_upload_test(
1342 ['--squash'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001343 'desc ✔\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001344 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001345 squash=True,
Edward Lemur1b52d872019-05-09 21:12:12 +00001346 expected_upstream_ref='origin/master',
1347 change_id='123456789',
1348 original_title='Initial upload')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001349
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001350 def test_gerrit_upload_squash_first_with_labels(self):
1351 self._run_gerrit_upload_test(
1352 ['--squash', '--cq-dry-run', '--enable-auto-submit'],
Edward Lemur0db01f02019-11-12 22:01:51 +00001353 'desc ✔\nBUG=\n\nChange-Id: 123456789',
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001354 [],
1355 squash=True,
1356 expected_upstream_ref='origin/master',
Edward Lemur1b52d872019-05-09 21:12:12 +00001357 labels={'Commit-Queue': 1, 'Auto-Submit': 1},
1358 change_id='123456789',
1359 original_title='Initial upload')
Andrii Shyshkalove7a7fc42018-10-30 17:35:09 +00001360
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001361 def test_gerrit_upload_squash_first_against_rev(self):
1362 custom_cl_base = 'custom_cl_base_rev_or_branch'
1363 self._run_gerrit_upload_test(
1364 ['--squash', custom_cl_base],
Edward Lemur0db01f02019-11-12 22:01:51 +00001365 'desc ✔\nBUG=\n\nChange-Id: 123456789',
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001366 [],
1367 squash=True,
1368 expected_upstream_ref='origin/master',
Edward Lemur1b52d872019-05-09 21:12:12 +00001369 custom_cl_base=custom_cl_base,
1370 change_id='123456789',
1371 original_title='Initial upload')
Andrii Shyshkalov550e9242017-04-12 17:14:49 +02001372 self.assertIn(
1373 'If you proceed with upload, more than 1 CL may be created by Gerrit',
1374 sys.stdout.getvalue())
1375
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001376 def test_gerrit_upload_squash_reupload(self):
Edward Lemur0db01f02019-11-12 22:01:51 +00001377 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001378 self._run_gerrit_upload_test(
1379 ['--squash'],
1380 description,
1381 [],
1382 squash=True,
1383 expected_upstream_ref='origin/master',
Edward Lemur1b52d872019-05-09 21:12:12 +00001384 issue=123456,
1385 change_id='123456789',
1386 original_title='User input')
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001387
Edward Lemurd55c5072020-02-20 01:09:07 +00001388 @mock.patch('sys.stderr', StringIO())
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001389 def test_gerrit_upload_squash_reupload_to_abandoned(self):
Edward Lemur0db01f02019-11-12 22:01:51 +00001390 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001391 with self.assertRaises(SystemExitMock):
1392 self._run_gerrit_upload_test(
1393 ['--squash'],
1394 description,
1395 [],
1396 squash=True,
1397 expected_upstream_ref='origin/master',
1398 issue=123456,
Edward Lemur1b52d872019-05-09 21:12:12 +00001399 fetched_status='ABANDONED',
1400 change_id='123456789')
Edward Lemurd55c5072020-02-20 01:09:07 +00001401 self.assertEqual(
1402 'Change https://chromium-review.googlesource.com/123456 has been '
1403 'abandoned, new uploads are not allowed\n',
1404 sys.stderr.getvalue())
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001405
Edward Lemurda4b6c62020-02-13 00:28:40 +00001406 @mock.patch(
1407 'gerrit_util.GetAccountDetails',
1408 return_value={'email': 'yet-another@example.com'})
1409 def test_gerrit_upload_squash_reupload_to_not_owned(self, _mock):
Edward Lemur0db01f02019-11-12 22:01:51 +00001410 description = 'desc ✔\nBUG=\n\nChange-Id: 123456789'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001411 self._run_gerrit_upload_test(
1412 ['--squash'],
1413 description,
1414 [],
1415 squash=True,
1416 expected_upstream_ref='origin/master',
1417 issue=123456,
Edward Lemur1b52d872019-05-09 21:12:12 +00001418 other_cl_owner='other@example.com',
1419 change_id='123456789',
1420 original_title='User input')
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001421 self.assertIn(
Quinten Yearsley0c62da92017-05-31 13:39:42 -07001422 'WARNING: Change 123456 is owned by other@example.com, but you '
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001423 'authenticate to Gerrit as yet-another@example.com.\n'
1424 'Uploading may fail due to lack of permissions',
Edward Lemurda4b6c62020-02-13 00:28:40 +00001425 sys.stdout.getvalue())
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001426
Josipe827b0f2020-01-30 00:07:20 +00001427 def test_upload_change_description_editor(self):
1428 fetched_description = 'foo\n\nChange-Id: 123456789'
1429 description = 'bar\n\nChange-Id: 123456789'
1430 self._run_gerrit_upload_test(
1431 ['--squash', '--edit-description'],
1432 description,
1433 [],
1434 fetched_description=fetched_description,
1435 squash=True,
1436 expected_upstream_ref='origin/master',
1437 issue=123456,
1438 change_id='123456789',
1439 original_title='User input',
1440 edit_description=description)
1441
Edward Lemurda4b6c62020-02-13 00:28:40 +00001442 @mock.patch('git_cl.RunGit')
1443 @mock.patch('git_cl.CMDupload')
1444 @mock.patch('git_cl.ask_for_data')
1445 def test_upload_branch_deps(self, *_mocks):
rmistry@google.com2dd99862015-06-22 12:22:18 +00001446 def mock_run_git(*args, **_kwargs):
1447 if args[0] == ['for-each-ref',
1448 '--format=%(refname:short) %(upstream:short)',
1449 'refs/heads']:
1450 # Create a local branch dependency tree that looks like this:
1451 # test1 -> test2 -> test3 -> test4 -> test5
1452 # -> test3.1
1453 # test6 -> test0
1454 branch_deps = [
1455 'test2 test1', # test1 -> test2
1456 'test3 test2', # test2 -> test3
1457 'test3.1 test2', # test2 -> test3.1
1458 'test4 test3', # test3 -> test4
1459 'test5 test4', # test4 -> test5
1460 'test6 test0', # test0 -> test6
1461 'test7', # test7
1462 ]
1463 return '\n'.join(branch_deps)
Edward Lemurda4b6c62020-02-13 00:28:40 +00001464 git_cl.RunGit.side_effect = mock_run_git
1465 git_cl.CMDupload.return_value = 0
rmistry@google.com2dd99862015-06-22 12:22:18 +00001466
1467 class MockChangelist():
1468 def __init__(self):
1469 pass
1470 def GetBranch(self):
1471 return 'test1'
1472 def GetIssue(self):
1473 return '123'
1474 def GetPatchset(self):
1475 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001476 def IsGerrit(self):
1477 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001478
1479 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1480 # CMDupload should have been called 5 times because of 5 dependent branches.
Edward Lemurda4b6c62020-02-13 00:28:40 +00001481 self.assertEqual(5, len(git_cl.CMDupload.mock_calls))
1482 git_cl.ask_for_data.assert_called_once_with(
1483 'This command will checkout all dependent branches '
1484 'and run "git cl upload". Press Enter to continue, '
1485 'or Ctrl+C to abort')
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001486 self.assertEqual(0, ret)
rmistry@google.com2dd99862015-06-22 12:22:18 +00001487
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001488 def test_gerrit_change_id(self):
1489 self.calls = [
1490 ((['git', 'write-tree'], ),
1491 'hashtree'),
1492 ((['git', 'rev-parse', 'HEAD~0'], ),
1493 'branch-parent'),
1494 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1495 'A B <a@b.org> 1456848326 +0100'),
1496 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1497 'C D <c@d.org> 1456858326 +0100'),
1498 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1499 'hashchange'),
1500 ]
1501 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1502 self.assertEqual(change_id, 'Ihashchange')
1503
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001504 def test_desecription_append_footer(self):
1505 for init_desc, footer_line, expected_desc in [
1506 # Use unique desc first lines for easy test failure identification.
1507 ('foo', 'R=one', 'foo\n\nR=one'),
1508 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1509 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1510 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1511 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1512 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1513 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1514 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1515 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1516 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1517 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1518 ]:
1519 desc = git_cl.ChangeDescription(init_desc)
1520 desc.append_footer(footer_line)
1521 self.assertEqual(desc.description, expected_desc)
1522
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001523 def test_update_reviewers(self):
1524 data = [
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001525 ('foo', [], [],
1526 'foo'),
1527 ('foo\nR=xx', [], [],
1528 'foo\nR=xx'),
1529 ('foo\nTBR=xx', [], [],
1530 'foo\nTBR=xx'),
1531 ('foo', ['a@c'], [],
1532 'foo\n\nR=a@c'),
1533 ('foo\nR=xx', ['a@c'], [],
1534 'foo\n\nR=a@c, xx'),
1535 ('foo\nTBR=xx', ['a@c'], [],
1536 'foo\n\nR=a@c\nTBR=xx'),
1537 ('foo\nTBR=xx\nR=yy', ['a@c'], [],
1538 'foo\n\nR=a@c, yy\nTBR=xx'),
1539 ('foo\nBUG=', ['a@c'], [],
1540 'foo\nBUG=\nR=a@c'),
1541 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], [],
1542 'foo\n\nR=a@c, bar, xx\nTBR=yy'),
1543 ('foo', ['a@c', 'b@c'], [],
1544 'foo\n\nR=a@c, b@c'),
1545 ('foo\nBar\n\nR=\nBUG=', ['c@c'], [],
1546 'foo\nBar\n\nR=c@c\nBUG='),
1547 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], [],
1548 'foo\nBar\n\nR=c@c\nBUG='),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001549 # Same as the line before, but full of whitespaces.
1550 (
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001551 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], [],
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001552 'foo\nBar\n\nR=c@c\n BUG =',
1553 ),
1554 # Whitespaces aren't interpreted as new lines.
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001555 ('foo BUG=allo R=joe ', ['c@c'], [],
1556 'foo BUG=allo R=joe\n\nR=c@c'),
1557 # Redundant TBRs get promoted to Rs
1558 ('foo\n\nR=a@c\nTBR=t@c', ['b@c', 'a@c'], ['a@c', 't@c'],
1559 'foo\n\nR=a@c, b@c\nTBR=t@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001560 ]
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001561 expected = [i[-1] for i in data]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001562 actual = []
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001563 for orig, reviewers, tbrs, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001564 obj = git_cl.ChangeDescription(orig)
Robert Iannucci6c98dc62017-04-18 11:38:00 -07001565 obj.update_reviewers(reviewers, tbrs)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001566 actual.append(obj.description)
1567 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001568
Nodir Turakulov23b82142017-11-16 11:04:25 -08001569 def test_get_hash_tags(self):
1570 cases = [
1571 ('', []),
1572 ('a', []),
1573 ('[a]', ['a']),
1574 ('[aa]', ['aa']),
1575 ('[a ]', ['a']),
1576 ('[a- ]', ['a']),
1577 ('[a- b]', ['a-b']),
1578 ('[a--b]', ['a-b']),
1579 ('[a', []),
1580 ('[a]x', ['a']),
1581 ('[aa]x', ['aa']),
1582 ('[a b]', ['a-b']),
1583 ('[a b]', ['a-b']),
1584 ('[a__b]', ['a-b']),
1585 ('[a] x', ['a']),
1586 ('[a][b]', ['a', 'b']),
1587 ('[a] [b]', ['a', 'b']),
1588 ('[a][b]x', ['a', 'b']),
1589 ('[a][b] x', ['a', 'b']),
1590 ('[a]\n[b]', ['a']),
1591 ('[a\nb]', []),
1592 ('[a][', ['a']),
1593 ('Revert "[a] feature"', ['a']),
1594 ('Reland "[a] feature"', ['a']),
1595 ('Revert: [a] feature', ['a']),
1596 ('Reland: [a] feature', ['a']),
1597 ('Revert "Reland: [a] feature"', ['a']),
1598 ('Foo: feature', ['foo']),
1599 ('Foo Bar: feature', ['foo-bar']),
Anthony Polito02b5af32019-12-02 19:49:47 +00001600 ('Change Foo::Bar', []),
1601 ('Foo: Change Foo::Bar', ['foo']),
Nodir Turakulov23b82142017-11-16 11:04:25 -08001602 ('Revert "Foo bar: feature"', ['foo-bar']),
1603 ('Reland "Foo bar: feature"', ['foo-bar']),
1604 ]
1605 for desc, expected in cases:
1606 change_desc = git_cl.ChangeDescription(desc)
1607 actual = change_desc.get_hash_tags()
1608 self.assertEqual(
1609 actual,
1610 expected,
1611 'GetHashTags(%r) == %r, expected %r' % (desc, actual, expected))
1612
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001613 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001614 self.assertEqual(None, git_cl.GetTargetRef(None,
1615 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001616 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001617
wittman@chromium.org455dc922015-01-26 20:15:50 +00001618 # Check default target refs for branches.
1619 self.assertEqual('refs/heads/master',
1620 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001621 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001622 self.assertEqual('refs/heads/master',
1623 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001624 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001625 self.assertEqual('refs/heads/master',
1626 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001627 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001628 self.assertEqual('refs/branch-heads/123',
1629 git_cl.GetTargetRef('origin',
1630 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001631 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001632 self.assertEqual('refs/diff/test',
1633 git_cl.GetTargetRef('origin',
1634 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001635 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001636 self.assertEqual('refs/heads/chrome/m42',
1637 git_cl.GetTargetRef('origin',
1638 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001639 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001640
1641 # Check target refs for user-specified target branch.
1642 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1643 'refs/remotes/branch-heads/123'):
1644 self.assertEqual('refs/branch-heads/123',
1645 git_cl.GetTargetRef('origin',
1646 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001647 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001648 for branch in ('origin/master', 'remotes/origin/master',
1649 'refs/remotes/origin/master'):
1650 self.assertEqual('refs/heads/master',
1651 git_cl.GetTargetRef('origin',
1652 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001653 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001654 for branch in ('master', 'heads/master', 'refs/heads/master'):
1655 self.assertEqual('refs/heads/master',
1656 git_cl.GetTargetRef('origin',
1657 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001658 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001659
Edward Lemurda4b6c62020-02-13 00:28:40 +00001660 @mock.patch('git_common.is_dirty_git_tree', return_value=True)
1661 def test_patch_when_dirty(self, *_mocks):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001662 # Patch when local tree is dirty.
wychen@chromium.orga872e752015-04-28 23:42:18 +00001663 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1664
Edward Lemur85153282020-02-14 22:06:29 +00001665 def assertIssueAndPatchset(
1666 self, branch='master', issue='123456', patchset='7',
1667 git_short_host='chromium'):
1668 self.assertEqual(
Edward Lemur26964072020-02-19 19:18:51 +00001669 issue, scm.GIT.GetBranchConfig('', branch, 'gerritissue'))
Edward Lemur85153282020-02-14 22:06:29 +00001670 self.assertEqual(
Edward Lemur26964072020-02-19 19:18:51 +00001671 patchset, scm.GIT.GetBranchConfig('', branch, 'gerritpatchset'))
Edward Lemur85153282020-02-14 22:06:29 +00001672 self.assertEqual(
1673 'https://%s-review.googlesource.com' % git_short_host,
Edward Lemur26964072020-02-19 19:18:51 +00001674 scm.GIT.GetBranchConfig('', branch, 'gerritserver'))
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001675
Edward Lemur85153282020-02-14 22:06:29 +00001676 def _patch_common(self, git_short_host='chromium'):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001677 mock.patch('git_cl.IsGitVersionAtLeast', return_value=True).start()
Edward Lemur26964072020-02-19 19:18:51 +00001678 self.mockGit.config['remote.origin.url'] = (
1679 'https://%s.googlesource.com/my/repo' % git_short_host)
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001680 gerrit_util.GetChangeDetail.return_value = {
1681 'current_revision': '7777777777',
1682 'revisions': {
1683 '1111111111': {
1684 '_number': 1,
1685 'fetch': {'http': {
1686 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1687 'ref': 'refs/changes/56/123456/1',
1688 }},
1689 },
1690 '7777777777': {
1691 '_number': 7,
1692 'fetch': {'http': {
1693 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1694 'ref': 'refs/changes/56/123456/7',
1695 }},
1696 },
1697 },
1698 }
wychen@chromium.orga872e752015-04-28 23:42:18 +00001699
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001700 def test_patch_gerrit_default(self):
Edward Lemur85153282020-02-14 22:06:29 +00001701 self._patch_common()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001702 self.calls += [
1703 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1704 'refs/changes/56/123456/7'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001705 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001706 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001707 ]
1708 self.assertEqual(git_cl.main(['patch', '123456']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001709 self.assertIssueAndPatchset()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001710
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001711 def test_patch_gerrit_new_branch(self):
Edward Lemur85153282020-02-14 22:06:29 +00001712 self._patch_common()
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001713 self.calls += [
1714 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1715 'refs/changes/56/123456/7'],), ''),
1716 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001717 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001718 ]
Edward Lemur85153282020-02-14 22:06:29 +00001719 self.assertEqual(git_cl.main(['patch', '-b', 'feature', '123456']), 0)
1720 self.assertIssueAndPatchset(branch='feature')
Andrii Shyshkalovf57841b2018-08-28 00:48:53 +00001721
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001722 def test_patch_gerrit_force(self):
Edward Lemur85153282020-02-14 22:06:29 +00001723 self._patch_common('host')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001724 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001725 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001726 'refs/changes/56/123456/7'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001727 ((['git', 'reset', '--hard', 'FETCH_HEAD'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001728 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001729 ]
Edward Lemur52969c92020-02-06 18:15:28 +00001730 self.assertEqual(git_cl.main(['patch', '123456', '--force']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001731 self.assertIssueAndPatchset(git_short_host='host')
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001732
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001733 def test_patch_gerrit_guess_by_url(self):
Edward Lemur85153282020-02-14 22:06:29 +00001734 self._patch_common('else')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001735 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001736 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001737 'refs/changes/56/123456/1'],), ''),
Aaron Gable62619a32017-06-16 08:22:09 -07001738 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Aaron Gable9387b4f2017-06-08 10:50:03 -07001739 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001740 ]
1741 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001742 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
Edward Lemur85153282020-02-14 22:06:29 +00001743 self.assertIssueAndPatchset(patchset='1', git_short_host='else')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001744
Aaron Gable697a91b2018-01-19 15:20:15 -08001745 def test_patch_gerrit_guess_by_url_with_repo(self):
Edward Lemur85153282020-02-14 22:06:29 +00001746 self._patch_common('else')
Aaron Gable697a91b2018-01-19 15:20:15 -08001747 self.calls += [
1748 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
1749 'refs/changes/56/123456/1'],), ''),
1750 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
Aaron Gable697a91b2018-01-19 15:20:15 -08001751 ((['git', 'rev-parse', 'FETCH_HEAD'],), 'deadbeef'),
Aaron Gable697a91b2018-01-19 15:20:15 -08001752 ]
1753 self.assertEqual(git_cl.main(
1754 ['patch', 'https://else-review.googlesource.com/c/my/repo/+/123456/1']),
1755 0)
Edward Lemur85153282020-02-14 22:06:29 +00001756 self.assertIssueAndPatchset(patchset='1', git_short_host='else')
Aaron Gable697a91b2018-01-19 15:20:15 -08001757
Edward Lemurd55c5072020-02-20 01:09:07 +00001758 @mock.patch('sys.stderr', StringIO())
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001759 def test_patch_gerrit_conflict(self):
Edward Lemur85153282020-02-14 22:06:29 +00001760 self._patch_common()
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001761 self.calls += [
1762 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001763 'refs/changes/56/123456/7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001764 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001765 ]
1766 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001767 git_cl.main(['patch', '123456'])
Edward Lemurd55c5072020-02-20 01:09:07 +00001768 self.assertEqual(
1769 'Command "git cherry-pick FETCH_HEAD" failed.\n\n',
1770 sys.stderr.getvalue())
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001771
Edward Lemurda4b6c62020-02-13 00:28:40 +00001772 @mock.patch(
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001773 'gerrit_util.GetChangeDetail',
Edward Lemurda4b6c62020-02-13 00:28:40 +00001774 side_effect=gerrit_util.GerritError(404, ''))
Edward Lemurd55c5072020-02-20 01:09:07 +00001775 @mock.patch('sys.stderr', StringIO())
Edward Lemurda4b6c62020-02-13 00:28:40 +00001776 def test_patch_gerrit_not_exists(self, *_mocks):
Edward Lemur26964072020-02-19 19:18:51 +00001777 self.mockGit.config['remote.origin.url'] = (
1778 'https://chromium.googlesource.com/my/repo')
tandriic2405f52016-10-10 08:13:15 -07001779 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001780 self.assertEqual(1, git_cl.main(['patch', '123456']))
Edward Lemurd55c5072020-02-20 01:09:07 +00001781 self.assertEqual(
1782 'change 123456 at https://chromium-review.googlesource.com does not '
1783 'exist or you have no access to it\n',
1784 sys.stderr.getvalue())
tandriic2405f52016-10-10 08:13:15 -07001785
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001786 def _checkout_calls(self):
1787 return [
1788 ((['git', 'config', '--local', '--get-regexp',
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001789 'branch\\..*\\.gerritissue'], ),
1790 ('branch.ger-branch.gerritissue 123456\n'
1791 'branch.gbranch654.gerritissue 654321\n')),
1792 ]
1793
1794 def test_checkout_gerrit(self):
1795 """Tests git cl checkout <issue>."""
1796 self.calls = self._checkout_calls()
1797 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1798 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1799
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001800 def test_checkout_not_found(self):
1801 """Tests git cl checkout <issue>."""
1802 self.calls = self._checkout_calls()
1803 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1804
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001805 def test_checkout_no_branch_issues(self):
1806 """Tests git cl checkout <issue>."""
1807 self.calls = [
1808 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001809 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001810 ]
1811 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1812
Edward Lemur26964072020-02-19 19:18:51 +00001813 def _test_gerrit_ensure_authenticated_common(self, auth):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001814 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
1815 CookiesAuthenticatorMockFactory(hosts_with_creds=auth)).start()
Edward Lemur26964072020-02-19 19:18:51 +00001816 self.mockGit.config['remote.origin.url'] = (
1817 'https://chromium.googlesource.com/my/repo')
Edward Lemurf38bc172019-09-03 21:02:13 +00001818 cl = git_cl.Changelist()
tandrii@chromium.org28253532016-04-14 13:46:56 +00001819 cl.branch = 'master'
1820 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001821 return cl
1822
Edward Lemurd55c5072020-02-20 01:09:07 +00001823 @mock.patch('sys.stderr', StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001824 def test_gerrit_ensure_authenticated_missing(self):
1825 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001826 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001827 })
Edward Lemurd55c5072020-02-20 01:09:07 +00001828 with self.assertRaises(SystemExitMock):
1829 cl.EnsureAuthenticated(force=False)
1830 self.assertEqual(
1831 'Credentials for the following hosts are required:\n'
1832 ' chromium-review.googlesource.com\n'
1833 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1834 'You can (re)generate your credentials by visiting '
1835 'https://chromium-review.googlesource.com/new-password\n',
1836 sys.stderr.getvalue())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001837
1838 def test_gerrit_ensure_authenticated_conflict(self):
1839 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001840 'chromium.googlesource.com':
1841 ('git-one.example.com', None, 'secret1'),
1842 'chromium-review.googlesource.com':
1843 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001844 })
1845 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001846 (('ask_for_data', 'If you know what you are doing '
1847 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001848 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1849
1850 def test_gerrit_ensure_authenticated_ok(self):
1851 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001852 'chromium.googlesource.com':
1853 ('git-same.example.com', None, 'secret'),
1854 'chromium-review.googlesource.com':
1855 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001856 })
1857 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1858
tandrii@chromium.org28253532016-04-14 13:46:56 +00001859 def test_gerrit_ensure_authenticated_skipped(self):
Edward Lemur26964072020-02-19 19:18:51 +00001860 self.mockGit.config['gerrit.skip-ensure-authenticated'] = 'true'
1861 cl = self._test_gerrit_ensure_authenticated_common(auth={})
tandrii@chromium.org28253532016-04-14 13:46:56 +00001862 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1863
Eric Boren2fb63102018-10-05 13:05:03 +00001864 def test_gerrit_ensure_authenticated_bearer_token(self):
1865 cl = self._test_gerrit_ensure_authenticated_common(auth={
1866 'chromium.googlesource.com':
1867 ('', None, 'secret'),
1868 'chromium-review.googlesource.com':
1869 ('', None, 'secret'),
1870 })
1871 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1872 header = gerrit_util.CookiesAuthenticator().get_auth_header(
1873 'chromium.googlesource.com')
1874 self.assertTrue('Bearer' in header)
1875
Daniel Chengcf6269b2019-05-18 01:02:12 +00001876 def test_gerrit_ensure_authenticated_non_https(self):
Edward Lemur26964072020-02-19 19:18:51 +00001877 self.mockGit.config['remote.origin.url'] = 'custom-scheme://repo'
Daniel Chengcf6269b2019-05-18 01:02:12 +00001878 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00001879 (('logging.warning',
1880 'Ignoring branch %(branch)s with non-https remote '
1881 '%(remote)s', {
1882 'branch': 'master',
1883 'remote': 'custom-scheme://repo'}
1884 ), None),
Daniel Chengcf6269b2019-05-18 01:02:12 +00001885 ]
Edward Lemurda4b6c62020-02-13 00:28:40 +00001886 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
1887 CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
1888 mock.patch('logging.warning',
1889 lambda *a: self._mocked_call('logging.warning', *a)).start()
Edward Lemurf38bc172019-09-03 21:02:13 +00001890 cl = git_cl.Changelist()
Daniel Chengcf6269b2019-05-18 01:02:12 +00001891 cl.branch = 'master'
1892 cl.branchref = 'refs/heads/master'
1893 cl.lookedup_issue = True
1894 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1895
Florian Mayerae510e82020-01-30 21:04:48 +00001896 def test_gerrit_ensure_authenticated_non_url(self):
Edward Lemur26964072020-02-19 19:18:51 +00001897 self.mockGit.config['remote.origin.url'] = (
1898 'git@somehost.example:foo/bar.git')
Florian Mayerae510e82020-01-30 21:04:48 +00001899 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00001900 (('logging.error',
1901 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
1902 'but it doesn\'t exist.', {
1903 'remote': 'origin',
1904 'branch': 'master',
1905 'url': 'git@somehost.example:foo/bar.git'}
1906 ), None),
Florian Mayerae510e82020-01-30 21:04:48 +00001907 ]
Edward Lemurda4b6c62020-02-13 00:28:40 +00001908 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
1909 CookiesAuthenticatorMockFactory(hosts_with_creds={})).start()
1910 mock.patch('logging.error',
1911 lambda *a: self._mocked_call('logging.error', *a)).start()
Florian Mayerae510e82020-01-30 21:04:48 +00001912 cl = git_cl.Changelist()
1913 cl.branch = 'master'
1914 cl.branchref = 'refs/heads/master'
1915 cl.lookedup_issue = True
1916 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1917
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01001918 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
Edward Lemur85153282020-02-14 22:06:29 +00001919 self.mockGit.config['branch.master.gerritissue'] = '123'
1920 self.mockGit.config['branch.master.gerritserver'] = (
1921 'https://chromium-review.googlesource.com')
Edward Lemur26964072020-02-19 19:18:51 +00001922 self.mockGit.config['remote.origin.url'] = (
1923 'https://chromium.googlesource.com/infra/infra')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001924 self.calls = [
Edward Lemurda4b6c62020-02-13 00:28:40 +00001925 (('SetReview', 'chromium-review.googlesource.com',
1926 'infra%2Finfra~123', None,
1927 {'Commit-Queue': vote}, notify, None), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001928 ]
tandriid9e5ce52016-07-13 02:32:59 -07001929
1930 def test_cmd_set_commit_gerrit_clear(self):
1931 self._cmd_set_commit_gerrit_common(0)
1932 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
1933
1934 def test_cmd_set_commit_gerrit_dry(self):
Aaron Gable75e78722017-06-09 10:40:16 -07001935 self._cmd_set_commit_gerrit_common(1, notify=False)
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001936 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
1937
tandriid9e5ce52016-07-13 02:32:59 -07001938 def test_cmd_set_commit_gerrit(self):
1939 self._cmd_set_commit_gerrit_common(2)
1940 self.assertEqual(0, git_cl.main(['set-commit']))
1941
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001942 def test_description_display(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001943 mock.patch('git_cl.Changelist', ChangelistMock).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001944 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001945
1946 self.assertEqual(0, git_cl.main(['description', '-d']))
Edward Lemurda4b6c62020-02-13 00:28:40 +00001947 self.assertEqual('foo\n', sys.stdout.getvalue())
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001948
Edward Lemurda4b6c62020-02-13 00:28:40 +00001949 @mock.patch('sys.stderr', StringIO())
iannucci3c972b92016-08-17 13:24:10 -07001950 def test_StatusFieldOverrideIssueMissingArgs(self):
iannucci3c972b92016-08-17 13:24:10 -07001951 try:
1952 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
Edward Lemurd55c5072020-02-20 01:09:07 +00001953 except SystemExitMock:
Edward Lemur6c6827c2020-02-06 21:15:18 +00001954 self.assertIn(
Edward Lemurda4b6c62020-02-13 00:28:40 +00001955 '--field must be given when --issue is set.', sys.stderr.getvalue())
iannucci3c972b92016-08-17 13:24:10 -07001956
1957 def test_StatusFieldOverrideIssue(self):
iannucci3c972b92016-08-17 13:24:10 -07001958 def assertIssue(cl_self, *_args):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001959 self.assertEqual(cl_self.issue, 1)
iannucci3c972b92016-08-17 13:24:10 -07001960 return 'foobar'
1961
Edward Lemurda4b6c62020-02-13 00:28:40 +00001962 mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
iannuccie53c9352016-08-17 14:40:40 -07001963 self.assertEqual(
Edward Lemur52969c92020-02-06 18:15:28 +00001964 git_cl.main(['status', '--issue', '1', '--field', 'desc']),
iannuccie53c9352016-08-17 14:40:40 -07001965 0)
Edward Lemurda4b6c62020-02-13 00:28:40 +00001966 self.assertEqual(sys.stdout.getvalue(), 'foobar\n')
iannucci3c972b92016-08-17 13:24:10 -07001967
iannuccie53c9352016-08-17 14:40:40 -07001968 def test_SetCloseOverrideIssue(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00001969
iannuccie53c9352016-08-17 14:40:40 -07001970 def assertIssue(cl_self, *_args):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00001971 self.assertEqual(cl_self.issue, 1)
iannuccie53c9352016-08-17 14:40:40 -07001972 return 'foobar'
1973
Edward Lemurda4b6c62020-02-13 00:28:40 +00001974 mock.patch('git_cl.Changelist.FetchDescription', assertIssue).start()
1975 mock.patch('git_cl.Changelist.CloseIssue', lambda *_: None).start()
iannuccie53c9352016-08-17 14:40:40 -07001976 self.assertEqual(
Edward Lemur52969c92020-02-06 18:15:28 +00001977 git_cl.main(['set-close', '--issue', '1']), 0)
iannuccie53c9352016-08-17 14:40:40 -07001978
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00001979 def test_description(self):
Edward Lemur26964072020-02-19 19:18:51 +00001980 self.mockGit.config['remote.origin.url'] = (
1981 'https://chromium.googlesource.com/my/repo')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00001982 gerrit_util.GetChangeDetail.return_value = {
1983 'current_revision': 'sha1',
1984 'revisions': {'sha1': {
1985 'commit': {'message': 'foobar'},
1986 }},
1987 }
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001988 self.assertEqual(0, git_cl.main([
Andrii Shyshkalovdd672fb2018-10-16 06:09:51 +00001989 'description',
1990 'https://chromium-review.googlesource.com/c/my/repo/+/123123',
1991 '-d']))
Edward Lemurda4b6c62020-02-13 00:28:40 +00001992 self.assertEqual('foobar\n', sys.stdout.getvalue())
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00001993
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001994 def test_description_set_raw(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00001995 mock.patch('git_cl.Changelist', ChangelistMock).start()
1996 mock.patch('git_cl.sys.stdin', StringIO('hihi')).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00001997
1998 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
1999 self.assertEqual('hihi', ChangelistMock.desc)
2000
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002001 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002002 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002003
2004 def RunEditor(desc, _, **kwargs):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002005 self.assertEqual(
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002006 '# Enter a description of the change.\n'
2007 '# This will be displayed on the codereview site.\n'
2008 '# The first line will also be used as the subject of the review.\n'
2009 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002010 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002011 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002012 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002013 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002014 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002015
Edward Lemur6c6827c2020-02-06 21:15:18 +00002016 def UpdateDescription(_, desc, force=False):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002017 self.assertEqual(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002018
Edward Lemurda4b6c62020-02-13 00:28:40 +00002019 mock.patch('git_cl.Changelist.FetchDescription',
2020 lambda *args: current_desc).start()
2021 mock.patch('git_cl.Changelist.UpdateDescription',
2022 UpdateDescription).start()
2023 mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002024
Edward Lemur85153282020-02-14 22:06:29 +00002025 self.mockGit.config['branch.master.gerritissue'] = '123'
Edward Lemur52969c92020-02-06 18:15:28 +00002026 self.assertEqual(0, git_cl.main(['description']))
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002027
Dan Beamd8b04ca2019-10-10 21:23:26 +00002028 def test_description_does_not_append_bug_line_if_fixed_is_present(self):
2029 current_desc = 'Some.\n\nFixed: 123\nChange-Id: xxx'
2030
2031 def RunEditor(desc, _, **kwargs):
Raphael Kubo da Costae9342a72019-10-14 17:49:39 +00002032 self.assertEqual(
Dan Beamd8b04ca2019-10-10 21:23:26 +00002033 '# Enter a description of the change.\n'
2034 '# This will be displayed on the codereview site.\n'
2035 '# The first line will also be used as the subject of the review.\n'
2036 '#--------------------This line is 72 characters long'
2037 '--------------------\n'
2038 'Some.\n\nFixed: 123\nChange-Id: xxx',
2039 desc)
2040 return desc
2041
Edward Lemurda4b6c62020-02-13 00:28:40 +00002042 mock.patch('git_cl.Changelist.FetchDescription',
2043 lambda *args: current_desc).start()
2044 mock.patch('git_cl.gclient_utils.RunEditor', RunEditor).start()
Dan Beamd8b04ca2019-10-10 21:23:26 +00002045
Edward Lemur85153282020-02-14 22:06:29 +00002046 self.mockGit.config['branch.master.gerritissue'] = '123'
Edward Lemur52969c92020-02-06 18:15:28 +00002047 self.assertEqual(0, git_cl.main(['description']))
Dan Beamd8b04ca2019-10-10 21:23:26 +00002048
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002049 def test_description_set_stdin(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002050 mock.patch('git_cl.Changelist', ChangelistMock).start()
2051 mock.patch('git_cl.sys.stdin', StringIO('hi \r\n\t there\n\nman')).start()
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002052
2053 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2054 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2055
kmarshall3bff56b2016-06-06 18:31:47 -07002056 def test_archive(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002057 self.calls = [
2058 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
Edward Lemurf38bc172019-09-03 21:02:13 +00002059 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002060 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002061 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
Edward Lemurf38bc172019-09-03 21:02:13 +00002062 ((['git', 'branch', '-D', 'foo'],), '')
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002063 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002064
Edward Lemurda4b6c62020-02-13 00:28:40 +00002065 mock.patch('git_cl.get_cl_statuses',
kmarshall3bff56b2016-06-06 18:31:47 -07002066 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002067 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2068 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002069 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall3bff56b2016-06-06 18:31:47 -07002070
2071 self.assertEqual(0, git_cl.main(['archive', '-f']))
2072
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002073 def test_archive_tag_collision(self):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002074 self.calls = [
2075 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2076 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2077 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],),
2078 'refs/tags/git-cl-archived-456-foo'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002079 ((['git', 'tag', 'git-cl-archived-456-foo-2', 'foo'],), ''),
2080 ((['git', 'branch', '-D', 'foo'],), '')
2081 ]
2082
Edward Lemurda4b6c62020-02-13 00:28:40 +00002083 mock.patch('git_cl.get_cl_statuses',
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002084 lambda branches, fine_grained, max_processes:
2085 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2086 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002087 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002088
2089 self.assertEqual(0, git_cl.main(['archive', '-f']))
2090
kmarshall3bff56b2016-06-06 18:31:47 -07002091 def test_archive_current_branch_fails(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002092 self.calls = [
2093 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2094 'refs/heads/master'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002095 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002096 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002097
Edward Lemurda4b6c62020-02-13 00:28:40 +00002098 mock.patch('git_cl.get_cl_statuses',
kmarshall9249e012016-08-23 12:02:16 -07002099 lambda branches, fine_grained, max_processes:
Edward Lemurda4b6c62020-02-13 00:28:40 +00002100 [(MockChangelistWithBranchAndIssue('master', 1),
2101 'closed')]).start()
kmarshall9249e012016-08-23 12:02:16 -07002102
2103 self.assertEqual(1, git_cl.main(['archive', '-f']))
2104
2105 def test_archive_dry_run(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002106 self.calls = [
2107 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2108 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002109 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002110 ]
kmarshall3bff56b2016-06-06 18:31:47 -07002111
Edward Lemurda4b6c62020-02-13 00:28:40 +00002112 mock.patch('git_cl.get_cl_statuses',
kmarshall3bff56b2016-06-06 18:31:47 -07002113 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002114 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2115 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002116 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall3bff56b2016-06-06 18:31:47 -07002117
kmarshall9249e012016-08-23 12:02:16 -07002118 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2119
2120 def test_archive_no_tags(self):
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002121 self.calls = [
2122 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2123 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002124 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002125 ((['git', 'branch', '-D', 'foo'],), '')
2126 ]
kmarshall9249e012016-08-23 12:02:16 -07002127
Edward Lemurda4b6c62020-02-13 00:28:40 +00002128 mock.patch('git_cl.get_cl_statuses',
kmarshall9249e012016-08-23 12:02:16 -07002129 lambda branches, fine_grained, max_processes:
2130 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2131 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002132 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
kmarshall9249e012016-08-23 12:02:16 -07002133
2134 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002135
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002136 def test_archive_tag_cleanup_on_branch_deletion_error(self):
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002137 self.calls = [
2138 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2139 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2140 ((['git', 'for-each-ref', '--format=%(refname)', 'refs/tags'],), ''),
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002141 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],),
2142 'refs/tags/git-cl-archived-456-foo'),
2143 ((['git', 'branch', '-D', 'foo'],), CERR1),
2144 ((['git', 'tag', '-d', 'git-cl-archived-456-foo'],),
2145 'refs/tags/git-cl-archived-456-foo'),
2146 ]
2147
Edward Lemurda4b6c62020-02-13 00:28:40 +00002148 mock.patch('git_cl.get_cl_statuses',
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002149 lambda branches, fine_grained, max_processes:
2150 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2151 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
Edward Lemurda4b6c62020-02-13 00:28:40 +00002152 (MockChangelistWithBranchAndIssue('bar', 789), 'open')]).start()
Kevin Marshall0e60ecd2019-12-04 17:44:13 +00002153
2154 self.assertEqual(0, git_cl.main(['archive', '-f']))
2155
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002156 def test_cmd_issue_erase_existing(self):
Edward Lemur85153282020-02-14 22:06:29 +00002157 self.mockGit.config['branch.master.gerritissue'] = '123'
2158 self.mockGit.config['branch.master.gerritserver'] = (
2159 'https://chromium-review.googlesource.com')
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002160 self.calls = [
Aaron Gableca01e2c2017-07-19 11:16:02 -07002161 ((['git', 'log', '-1', '--format=%B'],), 'This is a description'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002162 ]
2163 self.assertEqual(0, git_cl.main(['issue', '0']))
Edward Lemur85153282020-02-14 22:06:29 +00002164 self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
2165 self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002166
Aaron Gable400e9892017-07-12 15:31:21 -07002167 def test_cmd_issue_erase_existing_with_change_id(self):
Edward Lemur85153282020-02-14 22:06:29 +00002168 self.mockGit.config['branch.master.gerritissue'] = '123'
2169 self.mockGit.config['branch.master.gerritserver'] = (
2170 'https://chromium-review.googlesource.com')
Edward Lemurda4b6c62020-02-13 00:28:40 +00002171 mock.patch('git_cl.Changelist.FetchDescription',
2172 lambda _: 'This is a description\n\nChange-Id: Ideadbeef').start()
Aaron Gable400e9892017-07-12 15:31:21 -07002173 self.calls = [
Aaron Gableca01e2c2017-07-19 11:16:02 -07002174 ((['git', 'log', '-1', '--format=%B'],),
2175 'This is a description\n\nChange-Id: Ideadbeef'),
2176 ((['git', 'commit', '--amend', '-m', 'This is a description\n'],), ''),
Aaron Gable400e9892017-07-12 15:31:21 -07002177 ]
2178 self.assertEqual(0, git_cl.main(['issue', '0']))
Edward Lemur85153282020-02-14 22:06:29 +00002179 self.assertNotIn('branch.master.gerritissue', self.mockGit.config)
2180 self.assertNotIn('branch.master.gerritserver', self.mockGit.config)
Aaron Gable400e9892017-07-12 15:31:21 -07002181
phajdan.jre328cf92016-08-22 04:12:17 -07002182 def test_cmd_issue_json(self):
Edward Lemur85153282020-02-14 22:06:29 +00002183 self.mockGit.config['branch.master.gerritissue'] = '123'
2184 self.mockGit.config['branch.master.gerritserver'] = (
2185 'https://chromium-review.googlesource.com')
phajdan.jre328cf92016-08-22 04:12:17 -07002186 self.calls = [
phajdan.jre328cf92016-08-22 04:12:17 -07002187 (('write_json', 'output.json',
Andrii Shyshkalova185e2e2018-11-21 00:42:55 +00002188 {'issue': 123,
2189 'issue_url': 'https://chromium-review.googlesource.com/123'}),
phajdan.jre328cf92016-08-22 04:12:17 -07002190 ''),
2191 ]
2192 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2193
tandrii16e0b4e2016-06-07 10:34:28 -07002194 def _common_GerritCommitMsgHookCheck(self):
Edward Lemur15a9b8c2020-02-13 00:52:30 +00002195 mock.patch(
2196 'git_cl.os.path.abspath',
2197 lambda path: self._mocked_call(['abspath', path])).start()
2198 mock.patch(
2199 'git_cl.os.path.exists',
2200 lambda path: self._mocked_call(['exists', path])).start()
2201 mock.patch(
2202 'git_cl.gclient_utils.FileRead',
2203 lambda path: self._mocked_call(['FileRead', path])).start()
2204 mock.patch(
2205 'git_cl.gclient_utils.rm_file_or_tree',
2206 lambda path: self._mocked_call(['rm_file_or_tree', path])).start()
Edward Lemurf38bc172019-09-03 21:02:13 +00002207 return git_cl.Changelist(issue=123)
tandrii16e0b4e2016-06-07 10:34:28 -07002208
2209 def test_GerritCommitMsgHookCheck_custom_hook(self):
2210 cl = self._common_GerritCommitMsgHookCheck()
2211 self.calls += [
Edward Lemur15a9b8c2020-02-13 00:52:30 +00002212 ((['exists', '.git/hooks/commit-msg'],), True),
2213 ((['FileRead', '.git/hooks/commit-msg'],),
tandrii16e0b4e2016-06-07 10:34:28 -07002214 '#!/bin/sh\necho "custom hook"')
2215 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002216 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002217
2218 def test_GerritCommitMsgHookCheck_not_exists(self):
2219 cl = self._common_GerritCommitMsgHookCheck()
2220 self.calls += [
Edward Lemur15a9b8c2020-02-13 00:52:30 +00002221 ((['exists', '.git/hooks/commit-msg'],), False),
tandrii16e0b4e2016-06-07 10:34:28 -07002222 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002223 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002224
2225 def test_GerritCommitMsgHookCheck(self):
2226 cl = self._common_GerritCommitMsgHookCheck()
2227 self.calls += [
Edward Lemur15a9b8c2020-02-13 00:52:30 +00002228 ((['exists', '.git/hooks/commit-msg'],), True),
2229 ((['FileRead', '.git/hooks/commit-msg'],),
tandrii16e0b4e2016-06-07 10:34:28 -07002230 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002231 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
Edward Lemur15a9b8c2020-02-13 00:52:30 +00002232 ((['rm_file_or_tree', '.git/hooks/commit-msg'],),
tandrii16e0b4e2016-06-07 10:34:28 -07002233 ''),
2234 ]
Edward Lemur125d60a2019-09-13 18:25:41 +00002235 cl._GerritCommitMsgHookCheck(offer_removal=True)
tandrii16e0b4e2016-06-07 10:34:28 -07002236
tandriic4344b52016-08-29 06:04:54 -07002237 def test_GerritCmdLand(self):
Edward Lemur85153282020-02-14 22:06:29 +00002238 self.mockGit.config['branch.master.gerritsquashhash'] = 'deadbeaf'
2239 self.mockGit.config['branch.master.gerritserver'] = (
2240 'chromium-review.googlesource.com')
tandriic4344b52016-08-29 06:04:54 -07002241 self.calls += [
tandriic4344b52016-08-29 06:04:54 -07002242 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
tandriic4344b52016-08-29 06:04:54 -07002243 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002244 cl = git_cl.Changelist(issue=123)
Edward Lemur125d60a2019-09-13 18:25:41 +00002245 cl._GetChangeDetail = lambda *args, **kwargs: {
tandriic4344b52016-08-29 06:04:54 -07002246 'labels': {},
2247 'current_revision': 'deadbeaf',
2248 }
Edward Lemur125d60a2019-09-13 18:25:41 +00002249 cl._GetChangeCommit = lambda: {
agable32978d92016-11-01 12:55:02 -07002250 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002251 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002252 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2253 }
Edward Lemur125d60a2019-09-13 18:25:41 +00002254 cl.SubmitIssue = lambda wait_for_merge: None
Olivier Robin75ee7252018-04-13 10:02:56 +02002255 self.assertEqual(0, cl.CMDLand(force=True,
2256 bypass_hooks=True,
2257 verbose=True,
2258 parallel=False))
Edward Lemur73c76702020-02-06 23:57:18 +00002259 self.assertIn(
2260 'Issue chromium-review.googlesource.com/123 has been submitted',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002261 sys.stdout.getvalue())
Edward Lemur73c76702020-02-06 23:57:18 +00002262 self.assertIn(
2263 'Landed as: https://git.googlesource.com/test/+/deadbeef',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002264 sys.stdout.getvalue())
tandriic4344b52016-08-29 06:04:54 -07002265
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002266 def _mock_gerrit_changes_for_detail_cache(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002267 mock.patch('git_cl.Changelist._GetGerritHost', lambda _: 'host').start()
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002268
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002269 def test_gerrit_change_detail_cache_simple(self):
2270 self._mock_gerrit_changes_for_detail_cache()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002271 gerrit_util.GetChangeDetail.side_effect = ['a', 'b']
Edward Lemurf38bc172019-09-03 21:02:13 +00002272 cl1 = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002273 cl1._cached_remote_url = (
2274 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemurf38bc172019-09-03 21:02:13 +00002275 cl2 = git_cl.Changelist(issue=2)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002276 cl2._cached_remote_url = (
2277 True, 'https://chromium.googlesource.com/ab/repo')
Andrii Shyshkalovb7214602018-08-22 23:20:26 +00002278 self.assertEqual(cl1._GetChangeDetail(), 'a') # Miss.
2279 self.assertEqual(cl1._GetChangeDetail(), 'a')
2280 self.assertEqual(cl2._GetChangeDetail(), 'b') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002281
2282 def test_gerrit_change_detail_cache_options(self):
2283 self._mock_gerrit_changes_for_detail_cache()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002284 gerrit_util.GetChangeDetail.side_effect = ['cab', 'ad']
Edward Lemurf38bc172019-09-03 21:02:13 +00002285 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002286 cl._cached_remote_url = (True, 'https://chromium.googlesource.com/repo/')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002287 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2288 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2289 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2290 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2291 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2292 self.assertEqual(cl._GetChangeDetail(), 'cab')
2293
2294 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2295 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2296 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2297 self.assertEqual(cl._GetChangeDetail(), 'cab')
2298
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002299 def test_gerrit_description_caching(self):
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002300 gerrit_util.GetChangeDetail.return_value = {
2301 'current_revision': 'rev1',
2302 'revisions': {
2303 'rev1': {'commit': {'message': 'desc1'}},
2304 },
2305 }
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002306
2307 self._mock_gerrit_changes_for_detail_cache()
Edward Lemurf38bc172019-09-03 21:02:13 +00002308 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov03e0ed22018-08-28 19:39:30 +00002309 cl._cached_remote_url = (
2310 True, 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemur6c6827c2020-02-06 21:15:18 +00002311 self.assertEqual(cl.FetchDescription(), 'desc1')
2312 self.assertEqual(cl.FetchDescription(), 'desc1') # cache hit.
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002313
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002314 def test_print_current_creds(self):
2315 class CookiesAuthenticatorMock(object):
2316 def __init__(self):
2317 self.gitcookies = {
2318 'host.googlesource.com': ('user', 'pass'),
2319 'host-review.googlesource.com': ('user', 'pass'),
2320 }
2321 self.netrc = self
2322 self.netrc.hosts = {
2323 'github.com': ('user2', None, 'pass2'),
2324 'host2.googlesource.com': ('user3', None, 'pass'),
2325 }
Edward Lemurda4b6c62020-02-13 00:28:40 +00002326 mock.patch('git_cl.gerrit_util.CookiesAuthenticator',
2327 CookiesAuthenticatorMock).start()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002328 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
2329 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2330 ' Host\t User\t Which file',
2331 '============================\t=====\t===========',
2332 'host-review.googlesource.com\t user\t.gitcookies',
2333 ' host.googlesource.com\t user\t.gitcookies',
2334 ' host2.googlesource.com\tuser3\t .netrc',
2335 ])
Edward Lemur79d4f992019-11-11 23:49:02 +00002336 sys.stdout.seek(0)
2337 sys.stdout.truncate(0)
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002338 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
2339 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
2340 ' Host\tUser\t Which file',
2341 '============================\t====\t===========',
2342 'host-review.googlesource.com\tuser\t.gitcookies',
2343 ' host.googlesource.com\tuser\t.gitcookies',
2344 ])
2345
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002346 def _common_creds_check_mocks(self):
2347 def exists_mock(path):
2348 dirname = os.path.dirname(path)
2349 if dirname == os.path.expanduser('~'):
2350 dirname = '~'
2351 base = os.path.basename(path)
2352 if base in ('.netrc', '.gitcookies'):
2353 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
2354 # git cl also checks for existence other files not relevant to this test.
2355 return None
Edward Lemurda4b6c62020-02-13 00:28:40 +00002356 mock.patch('os.path.exists', exists_mock).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002357
2358 def test_creds_check_gitcookies_not_configured(self):
2359 self._common_creds_check_mocks()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002360 mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
2361 lambda _, include_netrc=False: []).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002362 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08002363 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002364 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
2365 (('os.path.exists', '~/.netrc'), True),
2366 (('ask_for_data', 'Press Enter to setup .gitcookies, '
2367 'or Ctrl+C to abort'), ''),
2368 ((['git', 'config', '--global', 'http.cookiefile',
2369 os.path.expanduser('~/.gitcookies')], ), ''),
2370 ]
2371 self.assertEqual(0, git_cl.main(['creds-check']))
Edward Lemur73c76702020-02-06 23:57:18 +00002372 self.assertTrue(
2373 sys.stdout.getvalue().startswith(
2374 'You seem to be using outdated .netrc for git credentials:'))
2375 self.assertIn(
2376 '\nConfigured git to use .gitcookies from',
2377 sys.stdout.getvalue())
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002378
2379 def test_creds_check_gitcookies_configured_custom_broken(self):
2380 self._common_creds_check_mocks()
Edward Lemurda4b6c62020-02-13 00:28:40 +00002381 mock.patch('git_cl._GitCookiesChecker.get_hosts_with_creds',
2382 lambda _, include_netrc=False: []).start()
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002383 self.calls = [
Aaron Gable8797cab2018-03-06 13:55:00 -08002384 ((['git', 'config', '--path', 'http.cookiefile'],), CERR1),
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002385 ((['git', 'config', '--global', 'http.cookiefile'],),
2386 '/custom/.gitcookies'),
2387 (('os.path.exists', '/custom/.gitcookies'), False),
2388 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
2389 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
2390 ((['git', 'config', '--global', 'http.cookiefile',
2391 os.path.expanduser('~/.gitcookies')], ), ''),
2392 ]
2393 self.assertEqual(0, git_cl.main(['creds-check']))
Edward Lemur73c76702020-02-06 23:57:18 +00002394 self.assertIn(
2395 'WARNING: You have configured custom path to .gitcookies: ',
2396 sys.stdout.getvalue())
2397 self.assertIn(
2398 'However, your configured .gitcookies file is missing.',
2399 sys.stdout.getvalue())
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01002400
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002401 def test_git_cl_comment_add_gerrit(self):
Edward Lemur85153282020-02-14 22:06:29 +00002402 self.mockGit.branchref = None
Edward Lemur26964072020-02-19 19:18:51 +00002403 self.mockGit.config['remote.origin.url'] = (
2404 'https://chromium.googlesource.com/infra/infra')
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002405 self.calls = [
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002406 (('SetReview', 'chromium-review.googlesource.com', 'infra%2Finfra~10',
Edward Lemurda4b6c62020-02-13 00:28:40 +00002407 'msg', None, None, None),
Aaron Gable636b13f2017-07-14 10:42:48 -07002408 None),
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002409 ]
Edward Lemur52969c92020-02-06 18:15:28 +00002410 self.assertEqual(0, git_cl.main(['comment', '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01002411
Edward Lemurda4b6c62020-02-13 00:28:40 +00002412 @mock.patch('git_cl.Changelist.GetBranch', return_value='foo')
2413 def test_git_cl_comments_fetch_gerrit(self, *_mocks):
Edward Lemur26964072020-02-19 19:18:51 +00002414 self.mockGit.config['remote.origin.url'] = (
2415 'https://chromium.googlesource.com/infra/infra')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002416 gerrit_util.GetChangeDetail.return_value = {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002417 'owner': {'email': 'owner@example.com'},
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002418 'current_revision': 'ba5eba11',
2419 'revisions': {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002420 'deadbeaf': {
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002421 '_number': 1,
2422 },
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002423 'ba5eba11': {
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002424 '_number': 2,
2425 },
2426 },
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002427 'messages': [
2428 {
2429 u'_revision_number': 1,
2430 u'author': {
2431 u'_account_id': 1111084,
2432 u'email': u'commit-bot@chromium.org',
2433 u'name': u'Commit Bot'
2434 },
2435 u'date': u'2017-03-15 20:08:45.000000000',
2436 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
Dirk Prankef6a58802017-10-17 12:49:42 -07002437 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002438 u'tag': u'autogenerated:cq:dry-run'
2439 },
2440 {
2441 u'_revision_number': 2,
2442 u'author': {
2443 u'_account_id': 11151243,
2444 u'email': u'owner@example.com',
2445 u'name': u'owner'
2446 },
2447 u'date': u'2017-03-16 20:00:41.000000000',
2448 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2449 u'message': u'PTAL',
2450 },
2451 {
2452 u'_revision_number': 2,
2453 u'author': {
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002454 u'_account_id': 148512,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002455 u'email': u'reviewer@example.com',
2456 u'name': u'reviewer'
2457 },
2458 u'date': u'2017-03-17 05:19:37.500000000',
2459 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2460 u'message': u'Patch Set 2: Code-Review+1',
2461 },
2462 ]
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002463 }
2464 self.calls = [
Andrii Shyshkalov889677c2018-08-28 20:43:06 +00002465 (('GetChangeComments', 'chromium-review.googlesource.com',
2466 'infra%2Finfra~1'), {
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002467 '/COMMIT_MSG': [
2468 {
2469 'author': {'email': u'reviewer@example.com'},
2470 'updated': u'2017-03-17 05:19:37.500000000',
2471 'patch_set': 2,
2472 'side': 'REVISION',
2473 'message': 'Please include a bug link',
2474 },
2475 ],
2476 'codereview.settings': [
2477 {
2478 'author': {'email': u'owner@example.com'},
2479 'updated': u'2017-03-16 20:00:41.000000000',
2480 'patch_set': 2,
2481 'side': 'PARENT',
2482 'line': 42,
2483 'message': 'I removed this because it is bad',
2484 },
2485 ]
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002486 }),
2487 (('GetChangeRobotComments', 'chromium-review.googlesource.com',
2488 'infra%2Finfra~1'), {}),
Leszek Swirski45b20c42018-09-17 17:05:26 +00002489 ] * 2 + [
2490 (('write_json', 'output.json', [
2491 {
2492 u'date': u'2017-03-16 20:00:41.000000',
2493 u'message': (
2494 u'PTAL\n' +
2495 u'\n' +
2496 u'codereview.settings\n' +
2497 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2498 u'c/1/2/codereview.settings#b42\n' +
2499 u' I removed this because it is bad\n'),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002500 u'autogenerated': False,
Leszek Swirski45b20c42018-09-17 17:05:26 +00002501 u'approval': False,
2502 u'disapproval': False,
2503 u'sender': u'owner@example.com'
2504 }, {
2505 u'date': u'2017-03-17 05:19:37.500000',
2506 u'message': (
2507 u'Patch Set 2: Code-Review+1\n' +
2508 u'\n' +
2509 u'/COMMIT_MSG\n' +
2510 u' PS2, File comment: https://chromium-review.googlesource' +
2511 u'.com/c/1/2//COMMIT_MSG#\n' +
2512 u' Please include a bug link\n'),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002513 u'autogenerated': False,
Leszek Swirski45b20c42018-09-17 17:05:26 +00002514 u'approval': False,
2515 u'disapproval': False,
2516 u'sender': u'reviewer@example.com'
2517 }
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002518 ]), '')
Leszek Swirski45b20c42018-09-17 17:05:26 +00002519 ]
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002520 expected_comments_summary = [
2521 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002522 message=(
2523 u'PTAL\n' +
2524 u'\n' +
2525 u'codereview.settings\n' +
2526 u' Base, Line 42: https://chromium-review.googlesource.com/' +
2527 u'c/1/2/codereview.settings#b42\n' +
2528 u' I removed this because it is bad\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002529 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002530 autogenerated=False,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002531 disapproval=False, approval=False, sender=u'owner@example.com'),
2532 git_cl._CommentSummary(
Aaron Gable0ffdf2d2017-06-05 13:01:17 -07002533 message=(
2534 u'Patch Set 2: Code-Review+1\n' +
2535 u'\n' +
2536 u'/COMMIT_MSG\n' +
2537 u' PS2, File comment: https://chromium-review.googlesource.com/' +
2538 u'c/1/2//COMMIT_MSG#\n' +
2539 u' Please include a bug link\n'),
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002540 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002541 autogenerated=False,
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002542 disapproval=False, approval=False, sender=u'reviewer@example.com'),
2543 ]
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002544 cl = git_cl.Changelist(
Edward Lemurf38bc172019-09-03 21:02:13 +00002545 issue=1, branchref='refs/heads/foo')
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01002546 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002547 self.assertEqual(
2548 0, git_cl.main(['comments', '-i', '1', '-j', 'output.json']))
2549
2550 def test_git_cl_comments_robot_comments(self):
2551 # git cl comments also fetches robot comments (which are considered a type
2552 # of autogenerated comment), and unlike other types of comments, only robot
2553 # comments from the latest patchset are shown.
Edward Lemur26964072020-02-19 19:18:51 +00002554 self.mockGit.config['remote.origin.url'] = (
2555 'https://chromium.googlesource.com/infra/infra')
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002556 gerrit_util.GetChangeDetail.return_value = {
2557 'owner': {'email': 'owner@example.com'},
2558 'current_revision': 'ba5eba11',
2559 'revisions': {
2560 'deadbeaf': {
2561 '_number': 1,
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002562 },
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002563 'ba5eba11': {
2564 '_number': 2,
2565 },
2566 },
2567 'messages': [
2568 {
2569 u'_revision_number': 1,
2570 u'author': {
2571 u'_account_id': 1111084,
2572 u'email': u'commit-bot@chromium.org',
2573 u'name': u'Commit Bot'
2574 },
2575 u'date': u'2017-03-15 20:08:45.000000000',
2576 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
2577 u'message': u'Patch Set 1:\n\nDry run: CQ is trying the patch...',
2578 u'tag': u'autogenerated:cq:dry-run'
2579 },
2580 {
2581 u'_revision_number': 1,
2582 u'author': {
2583 u'_account_id': 123,
2584 u'email': u'tricium@serviceaccount.com',
2585 u'name': u'Tricium'
2586 },
2587 u'date': u'2017-03-16 20:00:41.000000000',
2588 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2589 u'message': u'(1 comment)',
2590 u'tag': u'autogenerated:tricium',
2591 },
2592 {
2593 u'_revision_number': 1,
2594 u'author': {
2595 u'_account_id': 123,
2596 u'email': u'tricium@serviceaccount.com',
2597 u'name': u'Tricium'
2598 },
2599 u'date': u'2017-03-16 20:00:41.000000000',
2600 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
2601 u'message': u'(1 comment)',
2602 u'tag': u'autogenerated:tricium',
2603 },
2604 {
2605 u'_revision_number': 2,
2606 u'author': {
2607 u'_account_id': 123,
2608 u'email': u'tricium@serviceaccount.com',
2609 u'name': u'reviewer'
2610 },
2611 u'date': u'2017-03-17 05:30:37.000000000',
2612 u'tag': u'autogenerated:tricium',
2613 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
2614 u'message': u'(1 comment)',
2615 },
2616 ]
2617 }
2618 self.calls = [
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002619 (('GetChangeComments', 'chromium-review.googlesource.com',
2620 'infra%2Finfra~1'), {}),
2621 (('GetChangeRobotComments', 'chromium-review.googlesource.com',
2622 'infra%2Finfra~1'), {
2623 'codereview.settings': [
2624 {
2625 u'author': {u'email': u'tricium@serviceaccount.com'},
2626 u'updated': u'2017-03-17 05:30:37.000000000',
2627 u'robot_run_id': u'5565031076855808',
2628 u'robot_id': u'Linter/Category',
2629 u'tag': u'autogenerated:tricium',
2630 u'patch_set': 2,
2631 u'side': u'REVISION',
2632 u'message': u'Linter warning message text',
2633 u'line': 32,
2634 },
2635 ],
2636 }),
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002637 ]
2638 expected_comments_summary = [
2639 git_cl._CommentSummary(date=datetime.datetime(2017, 3, 17, 5, 30, 37),
2640 message=(
2641 u'(1 comment)\n\ncodereview.settings\n'
2642 u' PS2, Line 32: https://chromium-review.googlesource.com/'
2643 u'c/1/2/codereview.settings#32\n'
2644 u' Linter warning message text\n'),
2645 sender=u'tricium@serviceaccount.com',
2646 autogenerated=True, approval=False, disapproval=False)
2647 ]
2648 cl = git_cl.Changelist(
Edward Lemurf38bc172019-09-03 21:02:13 +00002649 issue=1, branchref='refs/heads/foo')
Quinten Yearsley0e617c02019-02-20 00:37:03 +00002650 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01002651
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002652 def test_get_remote_url_with_mirror(self):
2653 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002654
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002655 def selective_os_path_isdir_mock(path):
2656 if path == '/cache/this-dir-exists':
2657 return self._mocked_call('os.path.isdir', path)
2658 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002659
Edward Lemurda4b6c62020-02-13 00:28:40 +00002660 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002661
2662 url = 'https://chromium.googlesource.com/my/repo'
Edward Lemur26964072020-02-19 19:18:51 +00002663 self.mockGit.config['remote.origin.url'] = (
2664 '/cache/this-dir-exists')
2665 self.mockGit.config['/cache/this-dir-exists:remote.origin.url'] = (
2666 url)
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002667 self.calls = [
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002668 (('os.path.isdir', '/cache/this-dir-exists'),
2669 True),
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002670 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002671 cl = git_cl.Changelist(issue=1)
Andrii Shyshkalov81db1d52018-08-23 02:17:41 +00002672 self.assertEqual(cl.GetRemoteUrl(), url)
2673 self.assertEqual(cl.GetRemoteUrl(), url) # Must be cached.
2674
Edward Lemur298f2cf2019-02-22 21:40:39 +00002675 def test_get_remote_url_non_existing_mirror(self):
2676 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002677
Edward Lemur298f2cf2019-02-22 21:40:39 +00002678 def selective_os_path_isdir_mock(path):
2679 if path == '/cache/this-dir-doesnt-exist':
2680 return self._mocked_call('os.path.isdir', path)
2681 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002682
Edward Lemurda4b6c62020-02-13 00:28:40 +00002683 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
2684 mock.patch('logging.error',
2685 lambda *a: self._mocked_call('logging.error', *a)).start()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002686
Edward Lemur26964072020-02-19 19:18:51 +00002687 self.mockGit.config['remote.origin.url'] = (
2688 '/cache/this-dir-doesnt-exist')
Edward Lemur298f2cf2019-02-22 21:40:39 +00002689 self.calls = [
Edward Lemur298f2cf2019-02-22 21:40:39 +00002690 (('os.path.isdir', '/cache/this-dir-doesnt-exist'),
2691 False),
2692 (('logging.error',
Josip906bfde2020-01-31 22:38:49 +00002693 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2694 'but it doesn\'t exist.', {
2695 'remote': 'origin',
2696 'branch': 'master',
2697 'url': '/cache/this-dir-doesnt-exist'}
2698 ), None),
Edward Lemur298f2cf2019-02-22 21:40:39 +00002699 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002700 cl = git_cl.Changelist(issue=1)
Edward Lemur298f2cf2019-02-22 21:40:39 +00002701 self.assertIsNone(cl.GetRemoteUrl())
2702
2703 def test_get_remote_url_misconfigured_mirror(self):
2704 original_os_path_isdir = os.path.isdir
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002705
Edward Lemur298f2cf2019-02-22 21:40:39 +00002706 def selective_os_path_isdir_mock(path):
2707 if path == '/cache/this-dir-exists':
2708 return self._mocked_call('os.path.isdir', path)
2709 return original_os_path_isdir(path)
Quinten Yearsleyd9cbe7a2019-09-03 16:49:11 +00002710
Edward Lemurda4b6c62020-02-13 00:28:40 +00002711 mock.patch('os.path.isdir', selective_os_path_isdir_mock).start()
2712 mock.patch('logging.error',
2713 lambda *a: self._mocked_call('logging.error', *a)).start()
Edward Lemur298f2cf2019-02-22 21:40:39 +00002714
Edward Lemur26964072020-02-19 19:18:51 +00002715 self.mockGit.config['remote.origin.url'] = (
2716 '/cache/this-dir-exists')
Edward Lemur298f2cf2019-02-22 21:40:39 +00002717 self.calls = [
Edward Lemur298f2cf2019-02-22 21:40:39 +00002718 (('os.path.isdir', '/cache/this-dir-exists'), True),
Edward Lemur298f2cf2019-02-22 21:40:39 +00002719 (('logging.error',
2720 'Remote "%(remote)s" for branch "%(branch)s" points to '
2721 '"%(cache_path)s", but it is misconfigured.\n'
2722 '"%(cache_path)s" must be a git repo and must have a remote named '
2723 '"%(remote)s" pointing to the git host.', {
2724 'remote': 'origin',
2725 'cache_path': '/cache/this-dir-exists',
2726 'branch': 'master'}
2727 ), None),
2728 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002729 cl = git_cl.Changelist(issue=1)
Edward Lemur298f2cf2019-02-22 21:40:39 +00002730 self.assertIsNone(cl.GetRemoteUrl())
2731
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002732 def test_gerrit_change_identifier_with_project(self):
Edward Lemur26964072020-02-19 19:18:51 +00002733 self.mockGit.config['remote.origin.url'] = (
2734 'https://chromium.googlesource.com/a/my/repo.git/')
Edward Lemurf38bc172019-09-03 21:02:13 +00002735 cl = git_cl.Changelist(issue=123456)
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002736 self.assertEqual(cl._GerritChangeIdentifier(), 'my%2Frepo~123456')
2737
2738 def test_gerrit_change_identifier_without_project(self):
Edward Lemurda4b6c62020-02-13 00:28:40 +00002739 mock.patch('logging.error',
2740 lambda *a: self._mocked_call('logging.error', *a)).start()
Josip906bfde2020-01-31 22:38:49 +00002741
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002742 self.calls = [
Josip906bfde2020-01-31 22:38:49 +00002743 (('logging.error',
2744 'Remote "%(remote)s" for branch "%(branch)s" points to "%(url)s", '
2745 'but it doesn\'t exist.', {
2746 'remote': 'origin',
2747 'branch': 'master',
2748 'url': ''}
2749 ), None),
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002750 ]
Edward Lemurf38bc172019-09-03 21:02:13 +00002751 cl = git_cl.Changelist(issue=123456)
Andrii Shyshkalov2d0e03c2018-08-25 04:18:09 +00002752 self.assertEqual(cl._GerritChangeIdentifier(), '123456')
Andrii Shyshkalov1e828672018-08-23 22:34:37 +00002753
Quinten Yearsley0c62da92017-05-31 13:39:42 -07002754
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002755class CMDTestCaseBase(unittest.TestCase):
2756 _STATUSES = [
2757 'STATUS_UNSPECIFIED', 'SCHEDULED', 'STARTED', 'SUCCESS', 'FAILURE',
2758 'INFRA_FAILURE', 'CANCELED',
2759 ]
2760 _CHANGE_DETAIL = {
2761 'project': 'depot_tools',
2762 'status': 'OPEN',
2763 'owner': {'email': 'owner@e.mail'},
2764 'current_revision': 'beeeeeef',
2765 'revisions': {
2766 'deadbeaf': {'_number': 6},
2767 'beeeeeef': {
2768 '_number': 7,
2769 'fetch': {'http': {
2770 'url': 'https://chromium.googlesource.com/depot_tools',
2771 'ref': 'refs/changes/56/123456/7'
2772 }},
2773 },
2774 },
2775 }
2776 _DEFAULT_RESPONSE = {
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00002777 'builds': [{
2778 'id': str(100 + idx),
2779 'builder': {
2780 'project': 'chromium',
2781 'bucket': 'try',
2782 'builder': 'bot_' + status.lower(),
2783 },
2784 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
2785 'tags': [],
2786 'status': status,
2787 } for idx, status in enumerate(_STATUSES)]
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002788 }
2789
Edward Lemur4c707a22019-09-24 21:13:43 +00002790 def setUp(self):
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002791 super(CMDTestCaseBase, self).setUp()
Edward Lemur79d4f992019-11-11 23:49:02 +00002792 mock.patch('git_cl.sys.stdout', StringIO()).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002793 mock.patch('git_cl.uuid.uuid4', return_value='uuid4').start()
2794 mock.patch('git_cl.Changelist.GetIssue', return_value=123456).start()
Edward Lesmes7677e5c2020-02-19 20:39:03 +00002795 mock.patch(
2796 'git_cl.Changelist.GetCodereviewServer',
2797 return_value='https://chromium-review.googlesource.com').start()
2798 mock.patch(
2799 'git_cl.Changelist._GetGerritHost',
2800 return_value='chromium-review.googlesource.com').start()
2801 mock.patch(
2802 'git_cl.Changelist.GetMostRecentPatchset',
2803 return_value=7).start()
2804 mock.patch(
2805 'git_cl.Changelist.GetRemoteUrl',
2806 return_value='https://chromium.googlesource.com/depot_tools').start()
2807 mock.patch(
2808 'auth.Authenticator',
2809 return_value=AuthenticatorMock()).start()
2810 mock.patch(
2811 'gerrit_util.GetChangeDetail',
2812 return_value=self._CHANGE_DETAIL).start()
2813 mock.patch(
2814 'git_cl._call_buildbucket',
2815 return_value = self._DEFAULT_RESPONSE).start()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002816 mock.patch('git_common.is_dirty_git_tree', return_value=False).start()
Edward Lemur4c707a22019-09-24 21:13:43 +00002817 self.addCleanup(mock.patch.stopall)
2818
Edward Lemur4c707a22019-09-24 21:13:43 +00002819
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002820class CMDTryResultsTestCase(CMDTestCaseBase):
2821 _DEFAULT_REQUEST = {
2822 'predicate': {
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00002823 "gerritChanges": [{
2824 "project": "depot_tools",
2825 "host": "chromium-review.googlesource.com",
2826 "patchset": 7,
2827 "change": 123456,
2828 }],
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002829 },
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00002830 'fields': ('builds.*.id,builds.*.builder,builds.*.status' +
2831 ',builds.*.createTime,builds.*.tags'),
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002832 }
2833
2834 def testNoJobs(self):
2835 git_cl._call_buildbucket.return_value = {}
2836
2837 self.assertEqual(0, git_cl.main(['try-results']))
2838 self.assertEqual('No tryjobs scheduled.\n', sys.stdout.getvalue())
2839 git_cl._call_buildbucket.assert_called_once_with(
2840 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
2841 self._DEFAULT_REQUEST)
2842
2843 def testPrintToStdout(self):
2844 self.assertEqual(0, git_cl.main(['try-results']))
2845 self.assertEqual([
2846 'Successes:',
2847 ' bot_success https://ci.chromium.org/b/103',
2848 'Infra Failures:',
2849 ' bot_infra_failure https://ci.chromium.org/b/105',
2850 'Failures:',
2851 ' bot_failure https://ci.chromium.org/b/104',
2852 'Canceled:',
2853 ' bot_canceled ',
2854 'Started:',
2855 ' bot_started https://ci.chromium.org/b/102',
2856 'Scheduled:',
2857 ' bot_scheduled id=101',
2858 'Other:',
2859 ' bot_status_unspecified id=100',
2860 'Total: 7 tryjobs',
2861 ], sys.stdout.getvalue().splitlines())
2862 git_cl._call_buildbucket.assert_called_once_with(
2863 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
2864 self._DEFAULT_REQUEST)
2865
2866 def testPrintToStdoutWithMasters(self):
2867 self.assertEqual(0, git_cl.main(['try-results', '--print-master']))
2868 self.assertEqual([
2869 'Successes:',
2870 ' try bot_success https://ci.chromium.org/b/103',
2871 'Infra Failures:',
2872 ' try bot_infra_failure https://ci.chromium.org/b/105',
2873 'Failures:',
2874 ' try bot_failure https://ci.chromium.org/b/104',
2875 'Canceled:',
2876 ' try bot_canceled ',
2877 'Started:',
2878 ' try bot_started https://ci.chromium.org/b/102',
2879 'Scheduled:',
2880 ' try bot_scheduled id=101',
2881 'Other:',
2882 ' try bot_status_unspecified id=100',
2883 'Total: 7 tryjobs',
2884 ], sys.stdout.getvalue().splitlines())
2885 git_cl._call_buildbucket.assert_called_once_with(
2886 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
2887 self._DEFAULT_REQUEST)
2888
2889 @mock.patch('git_cl.write_json')
2890 def testWriteToJson(self, mockJsonDump):
2891 self.assertEqual(0, git_cl.main(['try-results', '--json', 'file.json']))
2892 git_cl._call_buildbucket.assert_called_once_with(
2893 mock.ANY, 'cr-buildbucket.appspot.com', 'SearchBuilds',
2894 self._DEFAULT_REQUEST)
2895 mockJsonDump.assert_called_once_with(
2896 'file.json', self._DEFAULT_RESPONSE['builds'])
2897
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00002898 def test_filter_failed_for_one_simple(self):
2899 self.assertEqual({}, git_cl._filter_failed_for_retry([]))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002900 self.assertEqual({
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00002901 'chromium/try': {
2902 'bot_failure': [],
2903 'bot_infra_failure': []
2904 },
2905 }, git_cl._filter_failed_for_retry(self._DEFAULT_RESPONSE['builds']))
2906
2907 def test_filter_failed_for_retry_many_builds(self):
2908
2909 def _build(name, created_sec, status, experimental=False):
2910 assert 0 <= created_sec < 100, created_sec
2911 b = {
2912 'id': 112112,
2913 'builder': {
2914 'project': 'chromium',
2915 'bucket': 'try',
2916 'builder': name,
2917 },
2918 'createTime': '2019-10-09T08:00:%02d.854286Z' % created_sec,
2919 'status': status,
2920 'tags': [],
2921 }
2922 if experimental:
2923 b['tags'].append({'key': 'cq_experimental', 'value': 'true'})
2924 return b
2925
2926 builds = [
2927 _build('flaky-last-green', 1, 'FAILURE'),
2928 _build('flaky-last-green', 2, 'SUCCESS'),
2929 _build('flaky', 1, 'SUCCESS'),
2930 _build('flaky', 2, 'FAILURE'),
2931 _build('running', 1, 'FAILED'),
2932 _build('running', 2, 'SCHEDULED'),
2933 _build('yep-still-running', 1, 'STARTED'),
2934 _build('yep-still-running', 2, 'FAILURE'),
2935 _build('cq-experimental', 1, 'SUCCESS', experimental=True),
2936 _build('cq-experimental', 2, 'FAILURE', experimental=True),
2937
2938 # Simulate experimental in CQ builder, which developer decided
2939 # to retry manually which resulted in 2nd build non-experimental.
2940 _build('sometimes-experimental', 1, 'FAILURE', experimental=True),
2941 _build('sometimes-experimental', 2, 'FAILURE', experimental=False),
2942 ]
2943 builds.sort(key=lambda b: b['status']) # ~deterministic shuffle.
2944 self.assertEqual({
2945 'chromium/try': {
2946 'flaky': [],
2947 'sometimes-experimental': []
2948 },
2949 }, git_cl._filter_failed_for_retry(builds))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002950
2951
2952class CMDTryTestCase(CMDTestCaseBase):
2953
2954 @mock.patch('git_cl.Changelist.SetCQState')
2955 @mock.patch('git_cl._get_bucket_map', return_value={})
2956 def testSetCQDryRunByDefault(self, _mockGetBucketMap, mockSetCQState):
2957 mockSetCQState.return_value = 0
Edward Lemur4c707a22019-09-24 21:13:43 +00002958 self.assertEqual(0, git_cl.main(['try']))
2959 git_cl.Changelist.SetCQState.assert_called_with(git_cl._CQState.DRY_RUN)
2960 self.assertEqual(
2961 sys.stdout.getvalue(),
2962 'Scheduling CQ dry run on: '
2963 'https://chromium-review.googlesource.com/123456\n')
2964
Edward Lemur4c707a22019-09-24 21:13:43 +00002965 @mock.patch('git_cl._call_buildbucket')
Edward Lemurbaaf6be2019-10-09 18:00:44 +00002966 def testScheduleOnBuildbucket(self, mockCallBuildbucket):
Edward Lemur4c707a22019-09-24 21:13:43 +00002967 mockCallBuildbucket.return_value = {}
Edward Lemur4c707a22019-09-24 21:13:43 +00002968
2969 self.assertEqual(0, git_cl.main([
2970 'try', '-B', 'luci.chromium.try', '-b', 'win',
2971 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2972 self.assertIn(
2973 'Scheduling jobs on:\nBucket: luci.chromium.try',
2974 git_cl.sys.stdout.getvalue())
2975
2976 expected_request = {
2977 "requests": [{
2978 "scheduleBuild": {
2979 "requestId": "uuid4",
2980 "builder": {
2981 "project": "chromium",
2982 "builder": "win",
2983 "bucket": "try",
2984 },
2985 "gerritChanges": [{
2986 "project": "depot_tools",
2987 "host": "chromium-review.googlesource.com",
2988 "patchset": 7,
2989 "change": 123456,
2990 }],
2991 "properties": {
2992 "category": "git_cl_try",
2993 "json": [{"a": 1}, None],
2994 "key": "val",
2995 },
2996 "tags": [
2997 {"value": "win", "key": "builder"},
2998 {"value": "git_cl_try", "key": "user_agent"},
2999 ],
3000 },
3001 }],
3002 }
3003 mockCallBuildbucket.assert_called_with(
3004 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3005
Anthony Polito1a5fe232020-01-24 23:17:52 +00003006 @mock.patch('git_cl._call_buildbucket')
3007 def testScheduleOnBuildbucketWithRevision(self, mockCallBuildbucket):
3008 mockCallBuildbucket.return_value = {}
3009
3010 self.assertEqual(0, git_cl.main([
3011 'try', '-B', 'luci.chromium.try', '-b', 'win', '-b', 'linux',
3012 '-p', 'key=val', '-p', 'json=[{"a":1}, null]',
3013 '-r', 'beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef']))
3014 self.assertIn(
3015 'Scheduling jobs on:\nBucket: luci.chromium.try',
3016 git_cl.sys.stdout.getvalue())
3017
3018 expected_request = {
3019 "requests": [{
3020 "scheduleBuild": {
3021 "requestId": "uuid4",
3022 "builder": {
3023 "project": "chromium",
3024 "builder": "linux",
3025 "bucket": "try",
3026 },
3027 "gerritChanges": [{
3028 "project": "depot_tools",
3029 "host": "chromium-review.googlesource.com",
3030 "patchset": 7,
3031 "change": 123456,
3032 }],
3033 "properties": {
3034 "category": "git_cl_try",
3035 "json": [{"a": 1}, None],
3036 "key": "val",
3037 },
3038 "tags": [
3039 {"value": "linux", "key": "builder"},
3040 {"value": "git_cl_try", "key": "user_agent"},
3041 ],
3042 "gitilesCommit": {
3043 "host": "chromium-review.googlesource.com",
3044 "project": "depot_tools",
3045 "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
3046 }
3047 },
3048 },
3049 {
3050 "scheduleBuild": {
3051 "requestId": "uuid4",
3052 "builder": {
3053 "project": "chromium",
3054 "builder": "win",
3055 "bucket": "try",
3056 },
3057 "gerritChanges": [{
3058 "project": "depot_tools",
3059 "host": "chromium-review.googlesource.com",
3060 "patchset": 7,
3061 "change": 123456,
3062 }],
3063 "properties": {
3064 "category": "git_cl_try",
3065 "json": [{"a": 1}, None],
3066 "key": "val",
3067 },
3068 "tags": [
3069 {"value": "win", "key": "builder"},
3070 {"value": "git_cl_try", "key": "user_agent"},
3071 ],
3072 "gitilesCommit": {
3073 "host": "chromium-review.googlesource.com",
3074 "project": "depot_tools",
3075 "id": "beeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeef",
3076 }
3077 },
3078 }],
3079 }
3080 mockCallBuildbucket.assert_called_with(
3081 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3082
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003083 def testScheduleOnBuildbucket_WrongBucket(self):
Edward Lemur4c707a22019-09-24 21:13:43 +00003084 self.assertEqual(0, git_cl.main([
3085 'try', '-B', 'not-a-bucket', '-b', 'win',
3086 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
3087 self.assertIn(
3088 'WARNING Could not parse bucket "not-a-bucket". Skipping.',
3089 git_cl.sys.stdout.getvalue())
3090
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003091 @mock.patch('git_cl._call_buildbucket')
3092 @mock.patch('git_cl.fetch_try_jobs')
3093 def testScheduleOnBuildbucketRetryFailed(
3094 self, mockFetchTryJobs, mockCallBuildbucket):
3095
3096 git_cl.fetch_try_jobs.side_effect = lambda *_, **kw: {
3097 7: [],
3098 6: [{
3099 'id': 112112,
3100 'builder': {
3101 'project': 'chromium',
3102 'bucket': 'try',
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003103 'builder': 'linux',},
3104 'createTime': '2019-10-09T08:00:01.854286Z',
3105 'tags': [],
3106 'status': 'FAILURE',}],}[kw['patchset']]
Andrii Shyshkalovaeee6a82019-10-09 21:56:25 +00003107 mockCallBuildbucket.return_value = {}
3108
3109 self.assertEqual(0, git_cl.main(['try', '--retry-failed']))
3110 self.assertIn(
3111 'Scheduling jobs on:\nBucket: chromium/try',
3112 git_cl.sys.stdout.getvalue())
3113
3114 expected_request = {
3115 "requests": [{
3116 "scheduleBuild": {
3117 "requestId": "uuid4",
3118 "builder": {
3119 "project": "chromium",
3120 "bucket": "try",
3121 "builder": "linux",
3122 },
3123 "gerritChanges": [{
3124 "project": "depot_tools",
3125 "host": "chromium-review.googlesource.com",
3126 "patchset": 7,
3127 "change": 123456,
3128 }],
3129 "properties": {
3130 "category": "git_cl_try",
3131 },
3132 "tags": [
3133 {"value": "linux", "key": "builder"},
3134 {"value": "git_cl_try", "key": "user_agent"},
3135 {"value": "1", "key": "retry_failed"},
3136 ],
3137 },
3138 }],
3139 }
3140 mockCallBuildbucket.assert_called_with(
3141 mock.ANY, 'cr-buildbucket.appspot.com', 'Batch', expected_request)
3142
Edward Lemur4c707a22019-09-24 21:13:43 +00003143 def test_parse_bucket(self):
3144 test_cases = [
3145 {
3146 'bucket': 'chromium/try',
3147 'result': ('chromium', 'try'),
3148 },
3149 {
3150 'bucket': 'luci.chromium.try',
3151 'result': ('chromium', 'try'),
3152 'has_warning': True,
3153 },
3154 {
3155 'bucket': 'skia.primary',
3156 'result': ('skia', 'skia.primary'),
3157 'has_warning': True,
3158 },
3159 {
3160 'bucket': 'not-a-bucket',
3161 'result': (None, None),
3162 },
3163 ]
3164
3165 for test_case in test_cases:
3166 git_cl.sys.stdout.truncate(0)
3167 self.assertEqual(
3168 test_case['result'], git_cl._parse_bucket(test_case['bucket']))
3169 if test_case.get('has_warning'):
Edward Lemur6215c792019-10-03 21:59:05 +00003170 expected_warning = 'WARNING Please use %s/%s to specify the bucket' % (
3171 test_case['result'])
3172 self.assertIn(expected_warning, git_cl.sys.stdout.getvalue())
Edward Lemur4c707a22019-09-24 21:13:43 +00003173
3174
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003175class CMDUploadTestCase(CMDTestCaseBase):
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003176 def setUp(self):
3177 super(CMDUploadTestCase, self).setUp()
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003178 mock.patch('git_cl.fetch_try_jobs').start()
3179 mock.patch('git_cl._trigger_try_jobs', return_value={}).start()
3180 mock.patch('git_cl.Changelist.CMDUpload', return_value=0).start()
Anthony Polito46689b02019-11-15 20:56:41 +00003181 mock.patch('git_cl.Settings.GetIsGerrit', return_value=True).start()
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003182 self.addCleanup(mock.patch.stopall)
3183
Edward Lesmes7677e5c2020-02-19 20:39:03 +00003184 def testWarmUpChangeDetailCache(self):
3185 self.assertEqual(0, git_cl.main(['upload']))
3186 gerrit_util.GetChangeDetail.assert_called_once_with(
3187 'chromium-review.googlesource.com', 'depot_tools~123456',
3188 frozenset([
3189 'LABELS', 'CURRENT_REVISION', 'DETAILED_ACCOUNTS',
3190 'CURRENT_COMMIT']))
3191
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003192 def testUploadRetryFailed(self):
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003193 # This test mocks out the actual upload part, and just asserts that after
3194 # upload, if --retry-failed is added, then the tool will fetch try jobs
3195 # from the previous patchset and trigger the right builders on the latest
3196 # patchset.
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003197 git_cl.fetch_try_jobs.side_effect = [
3198 # Latest patchset: No builds.
3199 [],
3200 # Patchset before latest: Some builds.
Andrii Shyshkalov2cbae8a2019-10-11 21:30:27 +00003201 [{
3202 'id': str(100 + idx),
3203 'builder': {
3204 'project': 'chromium',
3205 'bucket': 'try',
3206 'builder': 'bot_' + status.lower(),
3207 },
3208 'createTime': '2019-10-09T08:00:0%d.854286Z' % (idx % 10),
3209 'tags': [],
3210 'status': status,
3211 } for idx, status in enumerate(self._STATUSES)],
Andrii Shyshkalov1ad58112019-10-08 01:46:14 +00003212 ]
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003213
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003214 self.assertEqual(0, git_cl.main(['upload', '--retry-failed']))
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003215 self.assertEqual([
Edward Lemur5b929a42019-10-21 17:57:39 +00003216 mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
3217 mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
Edward Lemurbaaf6be2019-10-09 18:00:44 +00003218 ], git_cl.fetch_try_jobs.mock_calls)
3219 expected_buckets = {
3220 'chromium/try': {'bot_failure': [], 'bot_infra_failure': []},
3221 }
3222 git_cl._trigger_try_jobs.assert_called_once_with(
Edward Lemur5b929a42019-10-21 17:57:39 +00003223 mock.ANY, expected_buckets, mock.ANY, 8)
Quinten Yearsleya19d3532019-09-30 21:54:39 +00003224
Brian Sheedy59b06a82019-10-14 17:03:29 +00003225
Edward Lemurda4b6c62020-02-13 00:28:40 +00003226class CMDFormatTestCase(unittest.TestCase):
Brian Sheedy59b06a82019-10-14 17:03:29 +00003227
3228 def setUp(self):
3229 super(CMDFormatTestCase, self).setUp()
Jamie Madill5e96ad12020-01-13 16:08:35 +00003230 mock.patch('git_cl.RunCommand').start()
3231 mock.patch('clang_format.FindClangFormatToolInChromiumTree').start()
3232 mock.patch('clang_format.FindClangFormatScriptInChromiumTree').start()
3233 mock.patch('git_cl.settings').start()
Brian Sheedy59b06a82019-10-14 17:03:29 +00003234 self._top_dir = tempfile.mkdtemp()
Jamie Madill5e96ad12020-01-13 16:08:35 +00003235 self.addCleanup(mock.patch.stopall)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003236
3237 def tearDown(self):
3238 shutil.rmtree(self._top_dir)
3239 super(CMDFormatTestCase, self).tearDown()
3240
Jamie Madill5e96ad12020-01-13 16:08:35 +00003241 def _make_temp_file(self, fname, contents):
3242 with open(os.path.join(self._top_dir, fname), 'w') as tf:
3243 tf.write('\n'.join(contents))
3244
Brian Sheedy59b06a82019-10-14 17:03:29 +00003245 def _make_yapfignore(self, contents):
Jamie Madill5e96ad12020-01-13 16:08:35 +00003246 self._make_temp_file('.yapfignore', contents)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003247
Brian Sheedyb4307d52019-12-02 19:18:17 +00003248 def _check_yapf_filtering(self, files, expected):
3249 self.assertEqual(expected, git_cl._FilterYapfIgnoredFiles(
3250 files, git_cl._GetYapfIgnorePatterns(self._top_dir)))
Brian Sheedy59b06a82019-10-14 17:03:29 +00003251
Jamie Madill5e96ad12020-01-13 16:08:35 +00003252 def testClangFormatDiffFull(self):
3253 self._make_temp_file('test.cc', ['// test'])
3254 git_cl.settings.GetFormatFullByDefault.return_value = False
3255 diff_file = [os.path.join(self._top_dir, 'test.cc')]
3256 mock_opts = mock.Mock(full=True, dry_run=True, diff=False)
3257
3258 # Diff
3259 git_cl.RunCommand.return_value = ' // test'
3260 return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
3261 self._top_dir, 'HEAD')
3262 self.assertEqual(2, return_value)
3263
3264 # No diff
3265 git_cl.RunCommand.return_value = '// test'
3266 return_value = git_cl._RunClangFormatDiff(mock_opts, diff_file,
3267 self._top_dir, 'HEAD')
3268 self.assertEqual(0, return_value)
3269
3270 def testClangFormatDiff(self):
3271 git_cl.settings.GetFormatFullByDefault.return_value = False
3272 mock_opts = mock.Mock(full=False, dry_run=True, diff=False)
3273
3274 # Diff
3275 git_cl.RunCommand.return_value = 'error'
3276 return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir,
3277 'HEAD')
3278 self.assertEqual(2, return_value)
3279
3280 # No diff
3281 git_cl.RunCommand.return_value = ''
3282 return_value = git_cl._RunClangFormatDiff(mock_opts, ['.'], self._top_dir,
3283 'HEAD')
3284 self.assertEqual(0, return_value)
3285
Brian Sheedyb4307d52019-12-02 19:18:17 +00003286 def testYapfignoreExplicit(self):
3287 self._make_yapfignore(['foo/bar.py', 'foo/bar/baz.py'])
3288 files = [
3289 'bar.py',
3290 'foo/bar.py',
3291 'foo/baz.py',
3292 'foo/bar/baz.py',
3293 'foo/bar/foobar.py',
3294 ]
3295 expected = [
3296 'bar.py',
3297 'foo/baz.py',
3298 'foo/bar/foobar.py',
3299 ]
3300 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003301
Brian Sheedyb4307d52019-12-02 19:18:17 +00003302 def testYapfignoreSingleWildcards(self):
3303 self._make_yapfignore(['*bar.py', 'foo*', 'baz*.py'])
3304 files = [
3305 'bar.py', # Matched by *bar.py.
3306 'bar.txt',
3307 'foobar.py', # Matched by *bar.py, foo*.
3308 'foobar.txt', # Matched by foo*.
3309 'bazbar.py', # Matched by *bar.py, baz*.py.
3310 'bazbar.txt',
3311 'foo/baz.txt', # Matched by foo*.
3312 'bar/bar.py', # Matched by *bar.py.
3313 'baz/foo.py', # Matched by baz*.py, foo*.
3314 'baz/foo.txt',
3315 ]
3316 expected = [
3317 'bar.txt',
3318 'bazbar.txt',
3319 'baz/foo.txt',
3320 ]
3321 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003322
Brian Sheedyb4307d52019-12-02 19:18:17 +00003323 def testYapfignoreMultiplewildcards(self):
3324 self._make_yapfignore(['*bar*', '*foo*baz.txt'])
3325 files = [
3326 'bar.py', # Matched by *bar*.
3327 'bar.txt', # Matched by *bar*.
3328 'abar.py', # Matched by *bar*.
3329 'foobaz.txt', # Matched by *foo*baz.txt.
3330 'foobaz.py',
3331 'afoobaz.txt', # Matched by *foo*baz.txt.
3332 ]
3333 expected = [
3334 'foobaz.py',
3335 ]
3336 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003337
3338 def testYapfignoreComments(self):
3339 self._make_yapfignore(['test.py', '#test2.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003340 files = [
3341 'test.py',
3342 'test2.py',
3343 ]
3344 expected = [
3345 'test2.py',
3346 ]
3347 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003348
3349 def testYapfignoreBlankLines(self):
3350 self._make_yapfignore(['test.py', '', '', 'test2.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003351 files = [
3352 'test.py',
3353 'test2.py',
3354 'test3.py',
3355 ]
3356 expected = [
3357 'test3.py',
3358 ]
3359 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003360
3361 def testYapfignoreWhitespace(self):
3362 self._make_yapfignore([' test.py '])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003363 files = [
3364 'test.py',
3365 'test2.py',
3366 ]
3367 expected = [
3368 'test2.py',
3369 ]
3370 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003371
Brian Sheedyb4307d52019-12-02 19:18:17 +00003372 def testYapfignoreNoFiles(self):
Brian Sheedy59b06a82019-10-14 17:03:29 +00003373 self._make_yapfignore(['test.py'])
Brian Sheedyb4307d52019-12-02 19:18:17 +00003374 self._check_yapf_filtering([], [])
3375
3376 def testYapfignoreMissingYapfignore(self):
3377 files = [
3378 'test.py',
3379 ]
3380 expected = [
3381 'test.py',
3382 ]
3383 self._check_yapf_filtering(files, expected)
Brian Sheedy59b06a82019-10-14 17:03:29 +00003384
3385
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003386if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003387 logging.basicConfig(
3388 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003389 unittest.main()