maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 2 | # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 3 | # Use of this source code is governed by a BSD-style license that can be |
| 4 | # found in the LICENSE file. |
| 5 | |
| 6 | """Unit tests for git_cl.py.""" |
| 7 | |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 8 | import contextlib |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 9 | import datetime |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 10 | import json |
Andrii Shyshkalov | 18df0cd | 2017-01-25 15:22:20 +0100 | [diff] [blame] | 11 | import logging |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 12 | import os |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 13 | import StringIO |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 14 | import sys |
| 15 | import unittest |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 16 | import urlparse |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 17 | |
| 18 | sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) |
| 19 | |
| 20 | from testing_support.auto_stub import TestCase |
| 21 | |
| 22 | import git_cl |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 23 | import git_common |
tandrii@chromium.org | 57d8654 | 2016-03-04 16:11:32 +0000 | [diff] [blame] | 24 | import git_footers |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 25 | import subprocess2 |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 26 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 27 | def callError(code=1, cmd='', cwd='', stdout='', stderr=''): |
| 28 | return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr) |
| 29 | |
| 30 | |
| 31 | CERR1 = callError(1) |
| 32 | |
| 33 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 34 | class ChangelistMock(object): |
| 35 | # A class variable so we can access it when we don't have access to the |
| 36 | # instance that's being set. |
| 37 | desc = "" |
| 38 | def __init__(self, **kwargs): |
| 39 | pass |
| 40 | def GetIssue(self): |
| 41 | return 1 |
Kenneth Russell | 61e2ed4 | 2017-02-15 11:47:13 -0800 | [diff] [blame] | 42 | def GetDescription(self, force=False): |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 43 | return ChangelistMock.desc |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 44 | def UpdateDescription(self, desc, force=False): |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 45 | ChangelistMock.desc = desc |
| 46 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 47 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 48 | class PresubmitMock(object): |
| 49 | def __init__(self, *args, **kwargs): |
| 50 | self.reviewers = [] |
| 51 | @staticmethod |
| 52 | def should_continue(): |
| 53 | return True |
| 54 | |
| 55 | |
| 56 | class RietveldMock(object): |
| 57 | def __init__(self, *args, **kwargs): |
| 58 | pass |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 59 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 60 | @staticmethod |
Kenneth Russell | 61e2ed4 | 2017-02-15 11:47:13 -0800 | [diff] [blame] | 61 | def get_description(issue, force=False): |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 62 | return 'Issue: %d' % issue |
| 63 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 64 | @staticmethod |
| 65 | def get_issue_properties(_issue, _messages): |
| 66 | return { |
| 67 | 'reviewers': ['joe@chromium.org', 'john@chromium.org'], |
| 68 | 'messages': [ |
| 69 | { |
| 70 | 'approval': True, |
Aaron Gable | a1bab27 | 2017-04-11 16:38:18 -0700 | [diff] [blame] | 71 | 'disapproval': False, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 72 | 'sender': 'john@chromium.org', |
| 73 | }, |
| 74 | ], |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 75 | 'patchsets': [1, 20001], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 76 | } |
| 77 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 78 | @staticmethod |
| 79 | def close_issue(_issue): |
| 80 | return 'Closed' |
| 81 | |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 82 | @staticmethod |
| 83 | def get_patch(issue, patchset): |
| 84 | return 'patch set from issue %s patchset %s' % (issue, patchset) |
| 85 | |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 86 | @staticmethod |
| 87 | def update_description(_issue, _description): |
| 88 | return 'Updated' |
| 89 | |
| 90 | @staticmethod |
| 91 | def add_comment(_issue, _comment): |
| 92 | return 'Commented' |
| 93 | |
| 94 | |
| 95 | |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 96 | |
| 97 | class GitCheckoutMock(object): |
| 98 | def __init__(self, *args, **kwargs): |
| 99 | pass |
| 100 | |
| 101 | @staticmethod |
| 102 | def reset(): |
| 103 | GitCheckoutMock.conflict = False |
| 104 | |
| 105 | def apply_patch(self, p): |
| 106 | if GitCheckoutMock.conflict: |
| 107 | raise Exception('failed') |
| 108 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 109 | |
| 110 | class WatchlistsMock(object): |
| 111 | def __init__(self, _): |
| 112 | pass |
| 113 | @staticmethod |
| 114 | def GetWatchersForPaths(_): |
| 115 | return ['joe@example.com'] |
| 116 | |
| 117 | |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 118 | class CodereviewSettingsFileMock(object): |
| 119 | def __init__(self): |
| 120 | pass |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 121 | # pylint: disable=no-self-use |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 122 | def read(self): |
| 123 | return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" + |
andybons@chromium.org | 11f46eb | 2016-02-02 19:26:51 +0000 | [diff] [blame] | 124 | "GERRIT_HOST: True\n") |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 125 | |
| 126 | |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 127 | class AuthenticatorMock(object): |
| 128 | def __init__(self, *_args): |
| 129 | pass |
| 130 | def has_cached_credentials(self): |
| 131 | return True |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 132 | def authorize(self, http): |
| 133 | return http |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 134 | |
| 135 | |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 136 | def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False): |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 137 | """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies. |
| 138 | |
| 139 | Usage: |
| 140 | >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator", |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 141 | CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')}) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 142 | |
| 143 | OR |
| 144 | >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator", |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 145 | CookiesAuthenticatorMockFactory( |
| 146 | same_auth=('user', '', 'pass')) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 147 | """ |
| 148 | class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator): |
Quinten Yearsley | b2cc4a9 | 2016-12-15 13:53:26 -0800 | [diff] [blame] | 149 | def __init__(self): # pylint: disable=super-init-not-called |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 150 | # Intentionally not calling super() because it reads actual cookie files. |
| 151 | pass |
| 152 | @classmethod |
| 153 | def get_gitcookies_path(cls): |
| 154 | return '~/.gitcookies' |
| 155 | @classmethod |
| 156 | def get_netrc_path(cls): |
| 157 | return '~/.netrc' |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 158 | def _get_auth_for_host(self, host): |
| 159 | if same_auth: |
| 160 | return same_auth |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 161 | return (hosts_with_creds or {}).get(host) |
| 162 | return CookiesAuthenticatorMock |
| 163 | |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 164 | class MockChangelistWithBranchAndIssue(): |
| 165 | def __init__(self, branch, issue): |
| 166 | self.branch = branch |
| 167 | self.issue = issue |
| 168 | def GetBranch(self): |
| 169 | return self.branch |
| 170 | def GetIssue(self): |
| 171 | return self.issue |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 172 | |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 173 | |
| 174 | class SystemExitMock(Exception): |
| 175 | pass |
| 176 | |
| 177 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 178 | class TestGitClBasic(unittest.TestCase): |
Andrii Shyshkalov | 3186301 | 2017-02-08 11:35:12 +0100 | [diff] [blame] | 179 | def test_get_description(self): |
| 180 | cl = git_cl.Changelist(issue=1, codereview='rietveld', |
| 181 | codereview_host='host') |
| 182 | cl.description = 'x' |
| 183 | cl.has_description = True |
Kenneth Russell | 61e2ed4 | 2017-02-15 11:47:13 -0800 | [diff] [blame] | 184 | cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y' |
Andrii Shyshkalov | 3186301 | 2017-02-08 11:35:12 +0100 | [diff] [blame] | 185 | self.assertEquals(cl.GetDescription(), 'x') |
| 186 | self.assertEquals(cl.GetDescription(force=True), 'y') |
| 187 | self.assertEquals(cl.GetDescription(), 'y') |
| 188 | |
Robert Iannucci | 09f1f3d | 2017-03-28 16:54:32 -0700 | [diff] [blame] | 189 | def test_description_footers(self): |
| 190 | cl = git_cl.Changelist(issue=1, codereview='gerrit', |
| 191 | codereview_host='host') |
| 192 | cl.description = '\n'.join([ |
| 193 | 'This is some message', |
| 194 | '', |
| 195 | 'It has some lines', |
| 196 | 'and, also', |
| 197 | '', |
| 198 | 'Some: Really', |
| 199 | 'Awesome: Footers', |
| 200 | ]) |
| 201 | cl.has_description = True |
| 202 | cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y' |
| 203 | msg, footers = cl.GetDescriptionFooters() |
| 204 | self.assertEquals( |
| 205 | msg, ['This is some message', '', 'It has some lines', 'and, also']) |
| 206 | self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')]) |
| 207 | |
| 208 | msg.append('wut') |
| 209 | footers.append(('gnarly-dude', 'beans')) |
| 210 | cl.UpdateDescriptionFooters(msg, footers) |
| 211 | self.assertEquals(cl.GetDescription().splitlines(), [ |
| 212 | 'This is some message', |
| 213 | '', |
| 214 | 'It has some lines', |
| 215 | 'and, also', |
| 216 | 'wut' |
| 217 | '', |
| 218 | 'Some: Really', |
| 219 | 'Awesome: Footers', |
| 220 | 'Gnarly-Dude: beans', |
| 221 | ]) |
| 222 | |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 223 | def test_get_bug_line_values(self): |
| 224 | f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs)) |
| 225 | self.assertEqual(f('', ''), []) |
| 226 | self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456']) |
| 227 | self.assertEqual(f('v8', '456'), ['v8:456']) |
| 228 | self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123']) |
| 229 | # Not nice, but not worth carying. |
| 230 | self.assertEqual(f('v8', 'chromium:123,456,v8:123'), |
| 231 | ['v8:456', 'chromium:123', 'v8:123']) |
| 232 | |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 233 | def _test_git_number(self, parent_msg, dest_ref, child_msg, |
| 234 | parent_hash='parenthash'): |
| 235 | desc = git_cl.ChangeDescription(child_msg) |
| 236 | desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref) |
| 237 | return desc.description |
| 238 | |
| 239 | def assertEqualByLine(self, actual, expected): |
| 240 | self.assertEqual(actual.splitlines(), expected.splitlines()) |
| 241 | |
| 242 | def test_git_number_bad_parent(self): |
| 243 | with self.assertRaises(ValueError): |
| 244 | self._test_git_number('Parent', 'refs/heads/master', 'Child') |
| 245 | |
| 246 | def test_git_number_bad_parent_footer(self): |
| 247 | with self.assertRaises(AssertionError): |
| 248 | self._test_git_number( |
| 249 | 'Parent\n' |
| 250 | '\n' |
| 251 | 'Cr-Commit-Position: wrong', |
| 252 | 'refs/heads/master', 'Child') |
| 253 | |
| 254 | def test_git_number_bad_lineage_ignored(self): |
| 255 | actual = self._test_git_number( |
| 256 | 'Parent\n' |
| 257 | '\n' |
| 258 | 'Cr-Commit-Position: refs/heads/master@{#1}\n' |
| 259 | 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}', |
| 260 | 'refs/heads/master', 'Child') |
| 261 | self.assertEqualByLine( |
| 262 | actual, |
| 263 | 'Child\n' |
| 264 | '\n' |
| 265 | 'Cr-Commit-Position: refs/heads/master@{#2}\n' |
| 266 | 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}') |
| 267 | |
| 268 | def test_git_number_same_branch(self): |
| 269 | actual = self._test_git_number( |
| 270 | 'Parent\n' |
| 271 | '\n' |
| 272 | 'Cr-Commit-Position: refs/heads/master@{#12}', |
| 273 | dest_ref='refs/heads/master', |
| 274 | child_msg='Child') |
| 275 | self.assertEqualByLine( |
| 276 | actual, |
| 277 | 'Child\n' |
| 278 | '\n' |
| 279 | 'Cr-Commit-Position: refs/heads/master@{#13}') |
| 280 | |
| 281 | def test_git_number_same_branch_with_originals(self): |
| 282 | actual = self._test_git_number( |
| 283 | 'Parent\n' |
| 284 | '\n' |
| 285 | 'Cr-Commit-Position: refs/heads/master@{#12}', |
| 286 | dest_ref='refs/heads/master', |
| 287 | child_msg='Child\n' |
| 288 | '\n' |
| 289 | 'Some users are smart and insert their own footers\n' |
| 290 | '\n' |
| 291 | 'Cr-Whatever: value\n' |
| 292 | 'Cr-Commit-Position: refs/copy/paste@{#22}') |
| 293 | self.assertEqualByLine( |
| 294 | actual, |
| 295 | 'Child\n' |
| 296 | '\n' |
| 297 | 'Some users are smart and insert their own footers\n' |
| 298 | '\n' |
| 299 | 'Cr-Original-Whatever: value\n' |
| 300 | 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n' |
| 301 | 'Cr-Commit-Position: refs/heads/master@{#13}') |
| 302 | |
| 303 | def test_git_number_new_branch(self): |
| 304 | actual = self._test_git_number( |
| 305 | 'Parent\n' |
| 306 | '\n' |
| 307 | 'Cr-Commit-Position: refs/heads/master@{#12}', |
| 308 | dest_ref='refs/heads/branch', |
| 309 | child_msg='Child') |
| 310 | self.assertEqualByLine( |
| 311 | actual, |
| 312 | 'Child\n' |
| 313 | '\n' |
| 314 | 'Cr-Commit-Position: refs/heads/branch@{#1}\n' |
| 315 | 'Cr-Branched-From: parenthash-refs/heads/master@{#12}') |
| 316 | |
| 317 | def test_git_number_lineage(self): |
| 318 | actual = self._test_git_number( |
| 319 | 'Parent\n' |
| 320 | '\n' |
| 321 | 'Cr-Commit-Position: refs/heads/branch@{#1}\n' |
| 322 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}', |
| 323 | dest_ref='refs/heads/branch', |
| 324 | child_msg='Child') |
| 325 | self.assertEqualByLine( |
| 326 | actual, |
| 327 | 'Child\n' |
| 328 | '\n' |
| 329 | 'Cr-Commit-Position: refs/heads/branch@{#2}\n' |
| 330 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}') |
| 331 | |
| 332 | def test_git_number_moooooooore_lineage(self): |
| 333 | actual = self._test_git_number( |
| 334 | 'Parent\n' |
| 335 | '\n' |
| 336 | 'Cr-Commit-Position: refs/heads/branch@{#5}\n' |
| 337 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}', |
| 338 | dest_ref='refs/heads/mooore', |
| 339 | child_msg='Child') |
| 340 | self.assertEqualByLine( |
| 341 | actual, |
| 342 | 'Child\n' |
| 343 | '\n' |
| 344 | 'Cr-Commit-Position: refs/heads/mooore@{#1}\n' |
| 345 | 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n' |
| 346 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}') |
| 347 | |
Andrii Shyshkalov | b5effa1 | 2016-12-14 19:35:12 +0100 | [diff] [blame] | 348 | def test_git_number_ever_moooooooore_lineage(self): |
| 349 | self.maxDiff = 10000 |
| 350 | actual = self._test_git_number( |
| 351 | 'CQ commit on fresh new branch + numbering.\n' |
| 352 | '\n' |
| 353 | 'NOTRY=True\n' |
| 354 | 'NOPRESUBMIT=True\n' |
| 355 | 'BUG=\n' |
| 356 | '\n' |
| 357 | 'Review-Url: https://codereview.chromium.org/2577703003\n' |
| 358 | 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n' |
| 359 | 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n' |
| 360 | 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}', |
| 361 | dest_ref='refs/heads/gnumb-test/cl', |
| 362 | child_msg='git cl on fresh new branch + numbering.\n' |
| 363 | '\n' |
| 364 | 'Review-Url: https://codereview.chromium.org/2575043003 .\n') |
| 365 | self.assertEqualByLine( |
| 366 | actual, |
| 367 | 'git cl on fresh new branch + numbering.\n' |
| 368 | '\n' |
| 369 | 'Review-Url: https://codereview.chromium.org/2575043003 .\n' |
| 370 | 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n' |
| 371 | 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n' |
| 372 | 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n' |
| 373 | 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}') |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 374 | |
| 375 | def test_git_number_cherry_pick(self): |
| 376 | actual = self._test_git_number( |
| 377 | 'Parent\n' |
| 378 | '\n' |
| 379 | 'Cr-Commit-Position: refs/heads/branch@{#1}\n' |
| 380 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}', |
| 381 | dest_ref='refs/heads/branch', |
| 382 | child_msg='Child, which is cherry-pick from master\n' |
| 383 | '\n' |
| 384 | 'Cr-Commit-Position: refs/heads/master@{#100}\n' |
| 385 | '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)') |
| 386 | self.assertEqualByLine( |
| 387 | actual, |
| 388 | 'Child, which is cherry-pick from master\n' |
| 389 | '\n' |
| 390 | '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n' |
| 391 | '\n' |
| 392 | 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n' |
| 393 | 'Cr-Commit-Position: refs/heads/branch@{#2}\n' |
| 394 | 'Cr-Branched-From: somehash-refs/heads/master@{#12}') |
| 395 | |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 396 | |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 397 | class TestParseIssueURL(unittest.TestCase): |
| 398 | def _validate(self, parsed, issue=None, patchset=None, hostname=None, |
| 399 | codereview=None, fail=False): |
| 400 | self.assertIsNotNone(parsed) |
| 401 | if fail: |
| 402 | self.assertFalse(parsed.valid) |
| 403 | return |
| 404 | self.assertTrue(parsed.valid) |
| 405 | self.assertEqual(parsed.issue, issue) |
| 406 | self.assertEqual(parsed.patchset, patchset) |
| 407 | self.assertEqual(parsed.hostname, hostname) |
| 408 | self.assertEqual(parsed.codereview, codereview) |
| 409 | |
| 410 | def _run_and_validate(self, func, url, *args, **kwargs): |
| 411 | result = func(urlparse.urlparse(url)) |
| 412 | if kwargs.pop('fail', False): |
| 413 | self.assertIsNone(result) |
| 414 | return None |
| 415 | self._validate(result, *args, fail=False, **kwargs) |
| 416 | |
| 417 | def test_rietveld(self): |
| 418 | def test(url, *args, **kwargs): |
| 419 | self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url, |
| 420 | *args, codereview='rietveld', **kwargs) |
| 421 | |
| 422 | test('http://codereview.chromium.org/123', |
| 423 | 123, None, 'codereview.chromium.org') |
| 424 | test('https://codereview.chromium.org/123', |
| 425 | 123, None, 'codereview.chromium.org') |
| 426 | test('https://codereview.chromium.org/123/', |
| 427 | 123, None, 'codereview.chromium.org') |
| 428 | test('https://codereview.chromium.org/123/whatever', |
| 429 | 123, None, 'codereview.chromium.org') |
| 430 | test('https://codereview.chromium.org/123/#ps20001', |
| 431 | 123, 20001, 'codereview.chromium.org') |
| 432 | test('http://codereview.chromium.org/download/issue123_4.diff', |
| 433 | 123, 4, 'codereview.chromium.org') |
| 434 | # This looks like bad Gerrit, but is actually valid Rietveld, too. |
| 435 | test('https://chrome-review.source.com/123/4/', |
| 436 | 123, None, 'chrome-review.source.com') |
| 437 | |
| 438 | test('https://codereview.chromium.org/deadbeaf', fail=True) |
| 439 | test('https://codereview.chromium.org/api/123', fail=True) |
| 440 | test('bad://codereview.chromium.org/123', fail=True) |
| 441 | test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True) |
| 442 | |
| 443 | def test_gerrit(self): |
| 444 | def test(url, issue=None, patchset=None, hostname=None, fail=None): |
| 445 | self._test_ParseIssueUrl( |
| 446 | git_cl._GerritChangelistImpl.ParseIssueURL, |
| 447 | url, issue, patchset, hostname, fail) |
| 448 | def test(url, *args, **kwargs): |
| 449 | self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url, |
| 450 | *args, codereview='gerrit', **kwargs) |
| 451 | |
| 452 | test('http://chrome-review.source.com/c/123', |
| 453 | 123, None, 'chrome-review.source.com') |
| 454 | test('https://chrome-review.source.com/c/123/', |
| 455 | 123, None, 'chrome-review.source.com') |
| 456 | test('https://chrome-review.source.com/c/123/4', |
| 457 | 123, 4, 'chrome-review.source.com') |
| 458 | test('https://chrome-review.source.com/#/c/123/4', |
| 459 | 123, 4, 'chrome-review.source.com') |
| 460 | test('https://chrome-review.source.com/c/123/4', |
| 461 | 123, 4, 'chrome-review.source.com') |
| 462 | test('https://chrome-review.source.com/123', |
| 463 | 123, None, 'chrome-review.source.com') |
| 464 | test('https://chrome-review.source.com/123/4', |
| 465 | 123, 4, 'chrome-review.source.com') |
| 466 | |
| 467 | test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True) |
| 468 | test('https://chrome-review.source.com/c/abc/', fail=True) |
| 469 | test('ssh://chrome-review.source.com/c/123/1/', fail=True) |
| 470 | |
| 471 | def test_ParseIssueNumberArgument(self): |
| 472 | def test(arg, *args, **kwargs): |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 473 | codereview_hint = kwargs.pop('hint', None) |
| 474 | self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint), |
| 475 | *args, **kwargs) |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 476 | |
| 477 | test('123', 123) |
| 478 | test('', fail=True) |
| 479 | test('abc', fail=True) |
| 480 | test('123/1', fail=True) |
| 481 | test('123a', fail=True) |
| 482 | test('ssh://chrome-review.source.com/#/c/123/4/', fail=True) |
| 483 | # Rietveld. |
| 484 | test('https://codereview.source.com/www123', fail=True) |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 485 | # Matches both, but we take Rietveld now by default. |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 486 | test('https://codereview.source.com/123', |
| 487 | 123, None, 'codereview.source.com', 'rietveld') |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 488 | # Matches both, but we take Gerrit if specifically requested. |
| 489 | test('https://codereview.source.com/123', |
| 490 | 123, None, 'codereview.source.com', 'gerrit', |
| 491 | hint='gerrit') |
Andrii Shyshkalov | 90f3192 | 2017-04-10 16:10:21 +0200 | [diff] [blame] | 492 | # Gerrrit. |
| 493 | test('https://chrome-review.source.com/c/123/4', |
| 494 | 123, 4, 'chrome-review.source.com', 'gerrit') |
| 495 | test('https://chrome-review.source.com/bad/123/4', fail=True) |
| 496 | |
| 497 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 498 | class GitCookiesCheckerTest(TestCase): |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 499 | def setUp(self): |
| 500 | super(GitCookiesCheckerTest, self).setUp() |
| 501 | self.c = git_cl._GitCookiesChecker() |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 502 | self.c._all_hosts = [] |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 503 | |
| 504 | def mock_hosts_creds(self, subhost_identity_pairs): |
| 505 | def ensure_googlesource(h): |
| 506 | if not h.endswith(self.c._GOOGLESOURCE): |
| 507 | assert not h.endswith('.') |
| 508 | return h + '.' + self.c._GOOGLESOURCE |
| 509 | return h |
| 510 | self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies') |
| 511 | for h, i in subhost_identity_pairs] |
| 512 | |
| 513 | def test_analysis_nothing(self): |
| 514 | self.c._all_hosts = [] |
| 515 | self.assertFalse(self.c.has_generic_host()) |
| 516 | self.assertEqual(set(), self.c.get_conflicting_hosts()) |
| 517 | self.assertEqual(set(), self.c.get_duplicated_hosts()) |
| 518 | self.assertEqual(set(), self.c.get_partially_configured_hosts()) |
| 519 | self.assertEqual(set(), self.c.get_hosts_with_wrong_identities()) |
| 520 | |
| 521 | def test_analysis(self): |
| 522 | self.mock_hosts_creds([ |
| 523 | ('.googlesource.com', 'git-example.chromium.org'), |
| 524 | |
| 525 | ('chromium', 'git-example.google.com'), |
| 526 | ('chromium-review', 'git-example.google.com'), |
| 527 | ('chrome-internal', 'git-example.chromium.org'), |
| 528 | ('chrome-internal-review', 'git-example.chromium.org'), |
| 529 | ('conflict', 'git-example.google.com'), |
| 530 | ('conflict-review', 'git-example.chromium.org'), |
| 531 | ('dup', 'git-example.google.com'), |
| 532 | ('dup', 'git-example.google.com'), |
| 533 | ('dup-review', 'git-example.google.com'), |
| 534 | ('partial', 'git-example.google.com'), |
| 535 | ]) |
| 536 | self.assertTrue(self.c.has_generic_host()) |
| 537 | self.assertEqual(set(['conflict.googlesource.com']), |
| 538 | self.c.get_conflicting_hosts()) |
| 539 | self.assertEqual(set(['dup.googlesource.com']), |
| 540 | self.c.get_duplicated_hosts()) |
| 541 | self.assertEqual(set(['partial.googlesource.com']), |
| 542 | self.c.get_partially_configured_hosts()) |
| 543 | self.assertEqual(set(['chromium.googlesource.com', |
| 544 | 'chrome-internal.googlesource.com']), |
| 545 | self.c.get_hosts_with_wrong_identities()) |
| 546 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 547 | def test_report_no_problems(self): |
| 548 | self.test_analysis_nothing() |
| 549 | self.mock(sys, 'stdout', StringIO.StringIO()) |
| 550 | self.assertFalse(self.c.find_and_report_problems()) |
| 551 | self.assertEqual(sys.stdout.getvalue(), '') |
| 552 | |
| 553 | def test_report(self): |
| 554 | self.test_analysis() |
| 555 | self.mock(sys, 'stdout', StringIO.StringIO()) |
| 556 | self.assertTrue(self.c.find_and_report_problems()) |
| 557 | with open(os.path.join(os.path.dirname(__file__), |
| 558 | 'git_cl_creds_check_report.txt')) as f: |
| 559 | expected = f.read() |
| 560 | def by_line(text): |
| 561 | return [l.rstrip() for l in text.rstrip().splitlines()] |
Andrii Shyshkalov | 4812e61 | 2017-03-27 17:22:57 +0200 | [diff] [blame] | 562 | self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected)) |
Andrii Shyshkalov | 9780050 | 2017-03-16 16:04:32 +0100 | [diff] [blame] | 563 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 564 | class TestGitCl(TestCase): |
| 565 | def setUp(self): |
| 566 | super(TestGitCl, self).setUp() |
| 567 | self.calls = [] |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 568 | self._calls_done = [] |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 569 | self.mock(subprocess2, 'call', self._mocked_call) |
| 570 | self.mock(subprocess2, 'check_call', self._mocked_call) |
| 571 | self.mock(subprocess2, 'check_output', self._mocked_call) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 572 | self.mock(subprocess2, 'communicate', |
| 573 | lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0)) |
tandrii@chromium.org | a342c92 | 2016-03-16 07:08:25 +0000 | [diff] [blame] | 574 | self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call) |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 575 | self.mock(git_common, 'is_dirty_git_tree', lambda x: False) |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 576 | self.mock(git_common, 'get_or_create_merge_base', |
| 577 | lambda *a: ( |
| 578 | self._mocked_call(['get_or_create_merge_base']+list(a)))) |
pgervais@chromium.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 579 | self.mock(git_cl, 'BranchExists', lambda _: True) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 580 | self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '') |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 581 | self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call( |
| 582 | *(['ask_for_data'] + list(a)), **k)) |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 583 | self.mock(git_cl, 'write_json', lambda path, contents: |
| 584 | self._mocked_call('write_json', path, contents)) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 585 | self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 586 | self.mock(git_cl.rietveld, 'Rietveld', RietveldMock) |
maruel@chromium.org | 4bac4b5 | 2012-11-27 20:33:52 +0000 | [diff] [blame] | 587 | self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock) |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 588 | self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock) |
| 589 | GitCheckoutMock.reset() |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 590 | self.mock(git_cl.upload, 'RealMain', self.fail) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 591 | self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock) |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 592 | self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock) |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 593 | self.mock(git_cl.gerrit_util, 'GetChangeDetail', |
| 594 | lambda *args, **kwargs: self._mocked_call( |
| 595 | 'GetChangeDetail', *args, **kwargs)) |
| 596 | self.mock(git_cl.gerrit_util, 'AddReviewers', |
| 597 | lambda h, i, add, is_reviewer, notify: self._mocked_call( |
| 598 | 'AddReviewers', h, i, add, is_reviewer, notify)) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 599 | self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce', |
| 600 | classmethod(lambda _: False)) |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 601 | self.mock(git_cl, 'DieWithError', |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 602 | lambda msg, change=None: self._mocked_call(['DieWithError', msg])) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 603 | # It's important to reset settings to not have inter-tests interference. |
| 604 | git_cl.settings = None |
| 605 | |
| 606 | def tearDown(self): |
wychen@chromium.org | 445c896 | 2015-04-28 23:30:05 +0000 | [diff] [blame] | 607 | try: |
Andrii Shyshkalov | 18df0cd | 2017-01-25 15:22:20 +0100 | [diff] [blame] | 608 | self.assertEquals([], self.calls) |
| 609 | except AssertionError: |
wychen@chromium.org | 445c896 | 2015-04-28 23:30:05 +0000 | [diff] [blame] | 610 | if not self.has_failed(): |
Andrii Shyshkalov | 18df0cd | 2017-01-25 15:22:20 +0100 | [diff] [blame] | 611 | raise |
| 612 | # Sadly, has_failed() returns True if this OR any other tests before this |
| 613 | # one have failed. |
| 614 | git_cl.logging.exception( |
| 615 | '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n' |
| 616 | 'There are un-consumed self.calls after this test has finished.\n' |
| 617 | 'If you don\'t know which test this is, run:\n' |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 618 | ' tests/git_cl_tests.py -v\n' |
Andrii Shyshkalov | 18df0cd | 2017-01-25 15:22:20 +0100 | [diff] [blame] | 619 | '\n' |
| 620 | 'If you are already running just this single test, then **first** ' |
| 621 | 'fix the problem whose exception is emitted below by unittest ' |
| 622 | 'runner.\n' |
| 623 | '\n' |
| 624 | 'Else, to be sure what\'s going on, run this test **alone** with \n' |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 625 | ' tests/git_cl_tests.py TestGitCl.<name>\n' |
Andrii Shyshkalov | 18df0cd | 2017-01-25 15:22:20 +0100 | [diff] [blame] | 626 | 'and follow instructions above.\n' + |
| 627 | '=' * 80) |
wychen@chromium.org | 445c896 | 2015-04-28 23:30:05 +0000 | [diff] [blame] | 628 | finally: |
| 629 | super(TestGitCl, self).tearDown() |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 630 | |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 631 | def _mocked_call(self, *args, **_kwargs): |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 632 | self.assertTrue( |
| 633 | self.calls, |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 634 | '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args)) |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 635 | top = self.calls.pop(0) |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 636 | expected_args, result = top |
| 637 | |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 638 | # Also logs otherwise it could get caught in a try/finally and be hard to |
| 639 | # diagnose. |
| 640 | if expected_args != args: |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 641 | N = 5 |
| 642 | prior_calls = '\n '.join( |
| 643 | '@%d: %r' % (len(self._calls_done) - N + i, c[0]) |
| 644 | for i, c in enumerate(self._calls_done[-N:])) |
| 645 | following_calls = '\n '.join( |
| 646 | '@%d: %r' % (len(self._calls_done) + i + 1, c[0]) |
| 647 | for i, c in enumerate(self.calls[:N])) |
| 648 | extended_msg = ( |
| 649 | 'A few prior calls:\n %s\n\n' |
| 650 | 'This (expected):\n @%d: %r\n' |
| 651 | 'This (actual):\n @%d: %r\n\n' |
| 652 | 'A few following expected calls:\n %s' % |
| 653 | (prior_calls, len(self._calls_done), expected_args, |
| 654 | len(self._calls_done), args, following_calls)) |
| 655 | git_cl.logging.error(extended_msg) |
| 656 | |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 657 | self.fail('@%d\n' |
| 658 | ' Expected: %r\n' |
| 659 | ' Actual: %r' % ( |
tandrii | 9d20675 | 2016-06-20 11:32:47 -0700 | [diff] [blame] | 660 | len(self._calls_done), expected_args, args)) |
| 661 | |
| 662 | self._calls_done.append(top) |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 663 | if isinstance(result, Exception): |
| 664 | raise result |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 665 | return result |
| 666 | |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 667 | def test_ask_for_explicit_yes_true(self): |
| 668 | self.calls = [ |
| 669 | (('ask_for_data', 'prompt [Yes/No]: '), 'blah'), |
| 670 | (('ask_for_data', 'Please, type yes or no: '), 'ye'), |
| 671 | ] |
| 672 | self.assertTrue(git_cl.ask_for_explicit_yes('prompt')) |
| 673 | |
| 674 | def test_ask_for_explicit_yes_true(self): |
| 675 | self.calls = [ |
| 676 | (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'), |
| 677 | (('ask_for_data', 'Please, type yes or no: '), 'nO'), |
| 678 | ] |
| 679 | self.assertFalse(git_cl.ask_for_explicit_yes('prompt')) |
| 680 | |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 681 | def test_LoadCodereviewSettingsFromFile_gerrit(self): |
| 682 | codereview_file = StringIO.StringIO('GERRIT_HOST: true') |
| 683 | self.calls = [ |
| 684 | ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1), |
| 685 | ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1), |
| 686 | ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1), |
| 687 | ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1), |
| 688 | ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1), |
| 689 | ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1), |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 690 | ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],), |
| 691 | CERR1), |
| 692 | ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1), |
tandrii | 48df581 | 2016-10-17 03:55:37 -0700 | [diff] [blame] | 693 | ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],), |
| 694 | CERR1), |
| 695 | ((['git', 'config', 'gerrit.host', 'true'],), ''), |
| 696 | ] |
| 697 | self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file)) |
| 698 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 699 | @classmethod |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 700 | def _is_gerrit_calls(cls, gerrit=False): |
| 701 | return [((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 702 | ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')] |
| 703 | |
| 704 | @classmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 705 | def _upload_calls(cls, similarity, find_copies, private): |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 706 | return (cls._git_base_calls(similarity, find_copies) + |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 707 | cls._git_upload_calls(private)) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 708 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 709 | @classmethod |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 710 | def _upload_no_rev_calls(cls, similarity, find_copies): |
| 711 | return (cls._git_base_calls(similarity, find_copies) + |
| 712 | cls._git_upload_no_rev_calls()) |
| 713 | |
| 714 | @classmethod |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 715 | def _git_base_calls(cls, similarity, find_copies): |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 716 | if similarity is None: |
| 717 | similarity = '50' |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 718 | similarity_call = ((['git', 'config', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 719 | 'branch.master.git-cl-similarity'],), CERR1) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 720 | else: |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 721 | similarity_call = ((['git', 'config', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 722 | 'branch.master.git-cl-similarity', similarity],), '') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 723 | |
| 724 | if find_copies is None: |
| 725 | find_copies = True |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 726 | find_copies_call = ((['git', 'config', '--bool', |
| 727 | 'branch.master.git-find-copies'],), CERR1) |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 728 | else: |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 729 | val = str(find_copies).lower() |
| 730 | find_copies_call = ((['git', 'config', '--bool', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 731 | 'branch.master.git-find-copies', val],), '') |
| 732 | |
| 733 | if find_copies: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 734 | stat_call = ((['git', 'diff', '--no-ext-diff', '--stat', |
scottmg | b84b5e3 | 2016-11-10 09:25:33 -0800 | [diff] [blame] | 735 | '-l100000', '-C'+similarity, |
| 736 | 'fake_ancestor_sha', 'HEAD'],), '+dat') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 737 | else: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 738 | stat_call = ((['git', 'diff', '--no-ext-diff', '--stat', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 739 | '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 740 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 741 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 742 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 743 | similarity_call, |
| 744 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 745 | find_copies_call, |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 746 | ] + cls._is_gerrit_calls() + [ |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 747 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 748 | ((['git', 'config', 'branch.master.rietveldissue'],), CERR1), |
| 749 | ((['git', 'config', 'branch.master.gerritissue'],), CERR1), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 750 | ((['git', 'config', 'rietveld.server'],), |
| 751 | 'codereview.example.com'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 752 | ((['git', 'config', 'branch.master.merge'],), 'master'), |
| 753 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 754 | ((['get_or_create_merge_base', 'master', 'master'],), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 755 | 'fake_ancestor_sha'), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 756 | ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 757 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 758 | ((['git', 'rev-parse', 'HEAD'],), '12345'), |
| 759 | ((['git', 'diff', '--name-status', '--no-renames', '-r', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 760 | 'fake_ancestor_sha...', '.'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 761 | 'M\t.gitignore\n'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 762 | ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 763 | ((['git', 'log', '--pretty=format:%s%n%n%b', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 764 | 'fake_ancestor_sha...'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 765 | 'foo'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 766 | ((['git', 'config', 'user.email'],), 'me@example.com'), |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 767 | stat_call, |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 768 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 769 | 'fake_ancestor_sha..HEAD'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 770 | 'desc\n'), |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 771 | ((['git', 'config', 'rietveld.bug-prefix'],), ''), |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 772 | ] |
| 773 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 774 | @classmethod |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 775 | def _git_upload_no_rev_calls(cls): |
| 776 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 777 | ((['git', 'config', 'core.editor'],), ''), |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 778 | ] |
| 779 | |
| 780 | @classmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 781 | def _git_upload_calls(cls, private): |
| 782 | if private: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 783 | cc_call = [] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 784 | private_call = [] |
| 785 | else: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 786 | cc_call = [((['git', 'config', 'rietveld.cc'],), '')] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 787 | private_call = [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 788 | ((['git', 'config', 'rietveld.private'],), '')] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 789 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 790 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 791 | ((['git', 'config', 'core.editor'],), ''), |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 792 | ] + cc_call + private_call + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 793 | ((['git', 'config', 'branch.master.base-url'],), ''), |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 794 | ((['git', 'config', 'remote.origin.url'],), ''), |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 795 | ((['git', 'config', 'rietveld.project'],), ''), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 796 | ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 797 | ((['git', 'config', 'branch.master.rietveldserver', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 798 | 'https://codereview.example.com'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 799 | ((['git', |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 800 | 'config', 'branch.master.rietveldpatchset', '2'],), ''), |
tandrii@chromium.org | 1e67bb7 | 2016-02-11 12:15:49 +0000 | [diff] [blame] | 801 | ] + cls._git_post_upload_calls() |
| 802 | |
| 803 | @classmethod |
| 804 | def _git_post_upload_calls(cls): |
| 805 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 806 | ((['git', 'rev-parse', 'HEAD'],), 'hash'), |
| 807 | ((['git', 'symbolic-ref', 'HEAD'],), 'hash'), |
| 808 | ((['git', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 809 | 'config', 'branch.hash.last-upload-hash', 'hash'],), ''), |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 810 | ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''), |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 811 | ] |
| 812 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 813 | @staticmethod |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 814 | def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True): |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 815 | fake_ancestor = 'fake_ancestor' |
| 816 | fake_cl = 'fake_cl_for_patch' |
| 817 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 818 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 819 | 'rev-parse', '--verify', diff_base],), fake_ancestor), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 820 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 821 | 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 822 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 823 | 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 824 | # Mock a config miss (error code 1) |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 825 | ((['git', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 826 | 'config', 'gitcl.remotebranch'],), CERR1), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 827 | ] + ([ |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 828 | # Call to GetRemoteBranch() |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 829 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 830 | 'config', 'branch.%s.merge' % working_branch],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 831 | 'refs/heads/master'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 832 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 833 | 'config', 'branch.%s.remote' % working_branch],), 'origin'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 834 | ] if get_remote_branch else []) + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 835 | ((['git', 'rev-list', '^' + fake_ancestor, |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 836 | 'refs/remotes/origin/master'],), ''), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 837 | ] |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 838 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 839 | @staticmethod |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 840 | def _cmd_line(description, args, similarity, find_copies, private, cc): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 841 | """Returns the upload command line passed to upload.RealMain().""" |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 842 | return [ |
| 843 | 'upload', '--assume_yes', '--server', |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 844 | 'https://codereview.example.com', |
maruel@chromium.org | 71e12a9 | 2012-02-14 02:34:15 +0000 | [diff] [blame] | 845 | '--message', description |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 846 | ] + args + [ |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 847 | '--cc', ','.join(['joe@example.com'] + cc), |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 848 | ] + (['--private'] if private else []) + [ |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 849 | '--git_similarity', similarity or '50' |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 850 | ] + (['--git_no_find_copies'] if find_copies is False else []) + [ |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 851 | 'fake_ancestor_sha', 'HEAD' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 852 | ] |
| 853 | |
| 854 | def _run_reviewer_test( |
| 855 | self, |
| 856 | upload_args, |
| 857 | expected_description, |
| 858 | returned_description, |
| 859 | final_description, |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 860 | reviewers, |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 861 | private=False, |
| 862 | cc=None): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 863 | """Generic reviewer test framework.""" |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 864 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 865 | try: |
| 866 | similarity = upload_args[upload_args.index('--similarity')+1] |
| 867 | except ValueError: |
| 868 | similarity = None |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 869 | |
| 870 | if '--find-copies' in upload_args: |
| 871 | find_copies = True |
| 872 | elif '--no-find-copies' in upload_args: |
| 873 | find_copies = False |
| 874 | else: |
| 875 | find_copies = None |
| 876 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 877 | private = '--private' in upload_args |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 878 | cc = cc or [] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 879 | |
| 880 | self.calls = self._upload_calls(similarity, find_copies, private) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 881 | |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 882 | def RunEditor(desc, _, **kwargs): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 883 | self.assertEquals( |
| 884 | '# Enter a description of the change.\n' |
janx@chromium.org | 104b2db | 2013-04-18 12:58:40 +0000 | [diff] [blame] | 885 | '# This will be displayed on the codereview site.\n' |
alancutter@chromium.org | 63a4d7f | 2013-05-31 02:22:45 +0000 | [diff] [blame] | 886 | '# The first line will also be used as the subject of the review.\n' |
alancutter@chromium.org | bd1073e | 2013-06-01 00:34:38 +0000 | [diff] [blame] | 887 | '#--------------------This line is 72 characters long' |
| 888 | '--------------------\n' + |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 889 | expected_description, |
| 890 | desc) |
| 891 | return returned_description |
| 892 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 893 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 894 | def check_upload(args): |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 895 | cmd_line = self._cmd_line(final_description, reviewers, similarity, |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 896 | find_copies, private, cc) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 897 | self.assertEquals(cmd_line, args) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 898 | return 1, 2 |
| 899 | self.mock(git_cl.upload, 'RealMain', check_upload) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 900 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 901 | git_cl.main(['upload'] + upload_args) |
| 902 | |
| 903 | def test_no_reviewer(self): |
| 904 | self._run_reviewer_test( |
| 905 | [], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 906 | 'desc\n\nBUG=', |
| 907 | '# Blah blah comment.\ndesc\n\nBUG=', |
| 908 | 'desc\n\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 909 | []) |
| 910 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 911 | def test_keep_similarity(self): |
| 912 | self._run_reviewer_test( |
| 913 | ['--similarity', '70'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 914 | 'desc\n\nBUG=', |
| 915 | '# Blah blah comment.\ndesc\n\nBUG=', |
| 916 | 'desc\n\nBUG=', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 917 | []) |
| 918 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 919 | def test_keep_find_copies(self): |
| 920 | self._run_reviewer_test( |
| 921 | ['--no-find-copies'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 922 | 'desc\n\nBUG=', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 923 | '# Blah blah comment.\ndesc\n\nBUG=\n', |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 924 | 'desc\n\nBUG=', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 925 | []) |
| 926 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 927 | def test_private(self): |
| 928 | self._run_reviewer_test( |
| 929 | ['--private'], |
| 930 | 'desc\n\nBUG=', |
| 931 | '# Blah blah comment.\ndesc\n\nBUG=\n', |
| 932 | 'desc\n\nBUG=', |
| 933 | []) |
| 934 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 935 | def test_reviewers_cmd_line(self): |
| 936 | # Reviewer is passed as-is |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 937 | description = 'desc\n\nR=foo@example.com\nBUG=' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 938 | self._run_reviewer_test( |
| 939 | ['-r' 'foo@example.com'], |
| 940 | description, |
| 941 | '\n%s\n' % description, |
| 942 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 943 | ['--reviewers=foo@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 944 | |
| 945 | def test_reviewer_tbr_overriden(self): |
| 946 | # Reviewer is overriden with TBR |
| 947 | # Also verifies the regexp work without a trailing LF |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 948 | description = 'Foo Bar\n\nTBR=reviewer@example.com' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 949 | self._run_reviewer_test( |
| 950 | ['-r' 'foo@example.com'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 951 | 'desc\n\nR=foo@example.com\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 952 | description.strip('\n'), |
| 953 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 954 | ['--reviewers=reviewer@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 955 | |
| 956 | def test_reviewer_multiple(self): |
| 957 | # Handles multiple R= or TBR= lines. |
| 958 | description = ( |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 959 | 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n' |
| 960 | 'CC=more@example.com,people@example.com') |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 961 | self._run_reviewer_test( |
| 962 | [], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 963 | 'desc\n\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 964 | description, |
| 965 | description, |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 966 | ['--reviewers=another@example.com,reviewer@example.com'], |
| 967 | cc=['more@example.com', 'people@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 968 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 969 | def test_reviewer_send_mail(self): |
| 970 | # --send-mail can be used without -r if R= is used |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 971 | description = 'Foo Bar\nR=reviewer@example.com' |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 972 | self._run_reviewer_test( |
| 973 | ['--send-mail'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 974 | 'desc\n\nBUG=', |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 975 | description.strip('\n'), |
| 976 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 977 | ['--reviewers=reviewer@example.com', '--send_mail']) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 978 | |
| 979 | def test_reviewer_send_mail_no_rev(self): |
| 980 | # Fails without a reviewer. |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 981 | stdout = StringIO.StringIO() |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 982 | self.calls = self._upload_no_rev_calls(None, None) + [ |
| 983 | ((['DieWithError', 'Must specify reviewers to send email.'],), |
| 984 | SystemExitMock()) |
| 985 | ] |
| 986 | |
| 987 | def RunEditor(desc, _, **kwargs): |
| 988 | return desc |
| 989 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
| 990 | self.mock(sys, 'stdout', stdout) |
| 991 | with self.assertRaises(SystemExitMock): |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 992 | git_cl.main(['upload', '--send-mail']) |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 993 | self.assertEqual( |
| 994 | 'Using 50% similarity for rename/copy detection. Override with ' |
| 995 | '--similarity.\n', |
| 996 | stdout.getvalue()) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 997 | |
tandrii | f9aefb7 | 2016-07-01 09:06:51 -0700 | [diff] [blame] | 998 | def test_bug_on_cmd(self): |
| 999 | self._run_reviewer_test( |
| 1000 | ['--bug=500658,proj:123'], |
| 1001 | 'desc\n\nBUG=500658\nBUG=proj:123', |
| 1002 | '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234', |
| 1003 | 'desc\n\nBUG=500658\nBUG=proj:1234', |
| 1004 | []) |
| 1005 | |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1006 | def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False, |
| 1007 | parent_msg=None, |
| 1008 | new_msg=None, |
| 1009 | fail_after_parent_msg=False, |
| 1010 | fail_cherry_pick=False, |
| 1011 | fail_push_count=0, |
| 1012 | debug=False): |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 1013 | if debug: |
| 1014 | # Very useful due to finally clause in git cl land raising exceptions and |
| 1015 | # shadowing real cause of failure. |
| 1016 | self.mock(git_cl, '_IS_BEING_TESTED', True) |
| 1017 | else: |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1018 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
Andrii Shyshkalov | 768f1d8 | 2016-12-08 15:10:13 +0100 | [diff] [blame] | 1019 | |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1020 | if git_numberer_enabled: |
| 1021 | # Special mocks to check validity of timestamp. |
| 1022 | original_git_amend_head = git_cl._git_amend_head |
| 1023 | def _git_amend_head_mock(msg, tstamp): |
| 1024 | self._mocked_call(['git_amend_head committer timestamp', tstamp]) |
| 1025 | return original_git_amend_head(msg, tstamp) |
| 1026 | self.mock(git_cl, '_git_amend_head', _git_amend_head_mock) |
| 1027 | |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1028 | self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref: |
| 1029 | self._mocked_call('_is_git_numberer_enabled', url, ref)) |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1030 | self.mock(RietveldMock, 'update_description', staticmethod( |
| 1031 | lambda i, d: self._mocked_call(['update_description', i, d]))) |
| 1032 | self.mock(RietveldMock, 'add_comment', staticmethod( |
| 1033 | lambda i, c: self._mocked_call(['add_comment', i, c]))) |
| 1034 | self.calls = [ |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1035 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 1036 | ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1), |
| 1037 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 1038 | ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],), |
| 1039 | CERR1), |
| 1040 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 1041 | ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
Aaron Gable | 1bc7bfe | 2016-12-19 10:08:14 -0800 | [diff] [blame] | 1042 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1043 | ((['git', 'config', 'rietveld.server'],), |
| 1044 | 'https://codereview.chromium.org'), |
| 1045 | ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'), |
| 1046 | ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
| 1047 | ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'), |
| 1048 | ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1049 | ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],), |
| 1050 | ''), # No commits to rebase, according to local view of origin. |
| 1051 | ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],), |
| 1052 | 'fake_ancestor_sha'), |
| 1053 | ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [ |
| 1054 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 1055 | ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'), |
| 1056 | ((['git', 'diff', '--name-status', '--no-renames', '-r', |
| 1057 | 'fake_ancestor_sha...', '.'],), |
| 1058 | 'M\tfile1.cpp'), |
| 1059 | ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'), |
| 1060 | ((['git', 'config', 'branch.feature.rietveldserver'],), |
| 1061 | 'https://codereview.chromium.org'), |
| 1062 | ((['git', 'config', 'user.email'],), 'user@e.mail'), |
| 1063 | ((['git', 'config', 'rietveld.tree-status-url'],), CERR1), |
| 1064 | ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50', |
| 1065 | 'fake_ancestor_sha', 'feature'],), |
| 1066 | # This command just prints smth like this: |
| 1067 | # file1.cpp | 53 ++++++-- |
| 1068 | # 1 file changed, 33 insertions(+), 20 deletions(-)\n |
| 1069 | ''), |
| 1070 | ((['git', 'show-ref', '--quiet', '--verify', |
| 1071 | 'refs/heads/git-cl-commit'],), |
| 1072 | ''), # 0 return code means branch exists. |
| 1073 | ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
| 1074 | ((['git', 'show-ref', '--quiet', '--verify', |
| 1075 | 'refs/heads/git-cl-cherry-pick'],), |
| 1076 | CERR1), # This means git-cl-cherry-pick branch does not exist. |
| 1077 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 1078 | ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''), |
| 1079 | ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''), |
| 1080 | ((['git', 'commit', '-m', |
| 1081 | 'Issue: 123\n\nR=john@chromium.org\n\n' |
Andrii Shyshkalov | f01be22 | 2016-12-08 19:21:13 +0100 | [diff] [blame] | 1082 | 'Review-Url: https://codereview.chromium.org/123 .'],), ''), |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1083 | ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'), |
| 1084 | ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
| 1085 | ((['git', 'config', '--get', 'remote.origin.url'],), |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1086 | repo_url), |
| 1087 | |
| 1088 | ((['git', 'config', 'remote.origin.url'],), repo_url), |
| 1089 | (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'), |
| 1090 | git_numberer_enabled), |
| 1091 | |
| 1092 | # Auto-rebase init. |
| 1093 | ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'), |
| 1094 | ] |
| 1095 | # Auto-rebase loops. |
| 1096 | for attempt in xrange(fail_push_count + 1): |
| 1097 | self.calls += [ |
| 1098 | # Auto-rebase loop start. |
| 1099 | ((['git', 'retry', 'fetch', 'origin', |
| 1100 | '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''), |
| 1101 | ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''), |
| 1102 | # NOTE: if fail_push_count>0, this sha1_of_parent should probably be |
| 1103 | # different in each loop iteration for truly realistic test. |
| 1104 | ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'), |
| 1105 | ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],), |
| 1106 | callError(1, 'failed to cherry pick') if fail_cherry_pick |
| 1107 | else ''), |
| 1108 | ] |
| 1109 | if fail_cherry_pick: |
| 1110 | return |
| 1111 | |
| 1112 | if git_numberer_enabled: |
| 1113 | assert parent_msg |
| 1114 | self.calls += [ |
| 1115 | ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],), |
| 1116 | parent_msg), |
| 1117 | ] |
| 1118 | if fail_after_parent_msg: |
| 1119 | return |
| 1120 | assert new_msg |
| 1121 | self.calls += [ |
| 1122 | ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],), |
| 1123 | '1480022355'), # Committer's unix timestamp. |
| 1124 | ((['git', 'show', '-s', '--format=%ct', 'HEAD'],), |
| 1125 | '1480024000'), |
| 1126 | ((['git_amend_head committer timestamp', 1480024000],), ''), |
| 1127 | ((['git', 'commit', '--amend', '-m', new_msg],), ''), |
| 1128 | ] |
| 1129 | self.calls += [ |
| 1130 | ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],), |
| 1131 | CERR1 if attempt < fail_push_count else ''), |
| 1132 | ] |
| 1133 | # End of autorebase + push. |
| 1134 | |
| 1135 | self.calls += [ |
| 1136 | ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'), |
| 1137 | ] |
| 1138 | if git_numberer_enabled: |
| 1139 | self.calls += [ |
| 1140 | ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg), |
| 1141 | ] |
| 1142 | |
| 1143 | # Cleanup calls. |
| 1144 | self.calls += [ |
| 1145 | ((['git', 'checkout', '-q', 'feature'],), ''), |
| 1146 | ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
| 1147 | ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''), |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1148 | ] |
| 1149 | |
| 1150 | def test_land_rietveld(self): |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1151 | self._land_rietveld_calls( |
| 1152 | repo_url='https://chromium.googlesource.com/infra/infra', |
| 1153 | git_numberer_enabled=False, |
| 1154 | debug=False) |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1155 | self.calls += [ |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1156 | ((['git', 'config', 'rietveld.viewvc-url'],), |
| 1157 | 'https://chromium.googlesource.com/infra/infra/+/'), |
| 1158 | ((['update_description', 123, |
| 1159 | 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: ' |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1160 | 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],), |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1161 | ''), |
| 1162 | ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as ' |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1163 | 'sha1_committed (presubmit successful).'],), ''), |
Andrii Shyshkalov | 06a2502 | 2016-11-24 16:47:00 +0100 | [diff] [blame] | 1164 | ] |
| 1165 | git_cl.main(['land']) |
| 1166 | |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1167 | def test_land_rietveld_fail_cherry_pick(self): |
| 1168 | self._land_rietveld_calls( |
| 1169 | repo_url='https://chromium.googlesource.com/infra/infra', |
| 1170 | git_numberer_enabled=False, |
| 1171 | fail_cherry_pick=True, |
| 1172 | debug=False) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 1173 | self.calls += [ |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1174 | ((['git', 'diff', '--name-status', '--diff-filter=U'],), |
| 1175 | 'U path/file1\n' |
| 1176 | 'U file2.cpp\n'), |
| 1177 | ((['git', 'cherry-pick', '--abort'],), ''), |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 1178 | ((['git', 'checkout', '-q', 'feature'],), ''), |
| 1179 | ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1180 | ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''), |
| 1181 | ] |
| 1182 | git_cl.main(['land']) |
| 1183 | |
| 1184 | def test_land_rietveld_git_numberer_fail_1_push(self): |
| 1185 | return self.test_land_rietveld_git_numberer(fail_push_count=1) |
| 1186 | |
| 1187 | def test_land_rietveld_git_numberer(self, fail_push_count=0): |
| 1188 | self._land_rietveld_calls( |
| 1189 | repo_url='https://chromium.googlesource.com/chromium/src', |
| 1190 | git_numberer_enabled=True, |
| 1191 | parent_msg=('This is parent commit.\n' |
| 1192 | '\n' |
| 1193 | 'Cr-Commit-Position: refs/heads/master@{#543}\n' |
| 1194 | 'Cr-Branched-From: refs/svn/2014@{#2208}'), |
| 1195 | new_msg=('Issue: 123\n\nR=john@chromium.org\n' |
| 1196 | '\n' |
| 1197 | 'Review-Url: https://codereview.chromium.org/123 .\n' |
| 1198 | 'Cr-Commit-Position: refs/heads/master@{#544}\n' |
| 1199 | 'Cr-Branched-From: refs/svn/2014@{#2208}'), |
| 1200 | fail_push_count=fail_push_count, |
| 1201 | debug=False) |
| 1202 | |
| 1203 | self.calls += [ |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 1204 | ((['git', 'config', 'rietveld.viewvc-url'],), |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1205 | 'https://chromium.googlesource.com/chromium/src/+/'), |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 1206 | ((['update_description', 123, |
| 1207 | 'Issue: 123\n\nR=john@chromium.org\n' |
| 1208 | '\n' |
Andrii Shyshkalov | f01be22 | 2016-12-08 19:21:13 +0100 | [diff] [blame] | 1209 | 'Review-Url: https://codereview.chromium.org/123 .\n' |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 1210 | 'Cr-Commit-Position: refs/heads/master@{#544}\n' |
| 1211 | 'Cr-Branched-From: refs/svn/2014@{#2208}\n' |
| 1212 | 'Committed: ' |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1213 | 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],), |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 1214 | ''), |
| 1215 | ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as ' |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1216 | 'sha1_committed (presubmit successful).'],), ''), |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 1217 | ] |
| 1218 | git_cl.main(['land']) |
| 1219 | |
| 1220 | def test_land_rietveld_git_numberer_bad_parent(self): |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1221 | self._land_rietveld_calls( |
| 1222 | repo_url='https://chromium.googlesource.com/v8/v8', |
| 1223 | git_numberer_enabled=True, |
| 1224 | parent_msg='This is parent commit with no footer.', |
| 1225 | fail_after_parent_msg=True, |
| 1226 | debug=False) |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 1227 | self.calls += [ |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1228 | # Cleanup calls to restore original state. |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 1229 | ((['git', 'checkout', '-q', 'feature'],), ''), |
| 1230 | ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
Andrii Shyshkalov | aa31b97 | 2017-03-24 16:16:33 +0100 | [diff] [blame] | 1231 | ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''), |
Andrii Shyshkalov | 15e50cc | 2016-12-02 14:34:08 +0100 | [diff] [blame] | 1232 | ] |
| 1233 | with self.assertRaises(ValueError) as cm: |
| 1234 | git_cl.main(['land']) |
| 1235 | self.assertEqual(cm.exception.message, |
| 1236 | 'Unable to infer commit position from footers') |
| 1237 | |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1238 | def test_git_numberer_not_whitelisted_repo(self): |
| 1239 | self.calls = [] |
| 1240 | res = git_cl._is_git_numberer_enabled( |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1241 | remote_url='https://chromium.googlesource.com/chromium/tools/build', |
| 1242 | remote_ref='refs/whatever') |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1243 | self.assertEqual(res, False) |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1244 | |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1245 | def test_git_numberer_fail_fetch(self): |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1246 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 1247 | self.calls = [ |
| 1248 | ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1249 | '+refs/meta/config:refs/git_cl/meta/config'],), CERR1), |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1250 | ] |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1251 | res = git_cl._is_git_numberer_enabled( |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1252 | remote_url='https://chromium.googlesource.com/chromium/src', |
| 1253 | remote_ref='refs/whatever') |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1254 | self.assertEqual(res, False) |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1255 | |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1256 | def test_git_numberer_valid_configs(self): |
Andrii Shyshkalov | 351c61d | 2017-01-21 20:40:16 +0000 | [diff] [blame] | 1257 | with git_cl.gclient_utils.temporary_directory() as tempdir: |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1258 | @contextlib.contextmanager |
Andrii Shyshkalov | 351c61d | 2017-01-21 20:40:16 +0000 | [diff] [blame] | 1259 | def fake_temporary_directory(**kwargs): |
| 1260 | yield tempdir |
| 1261 | self.mock(git_cl.gclient_utils, 'temporary_directory', |
| 1262 | fake_temporary_directory) |
| 1263 | self._test_GitNumbererState_valid_configs_inner(tempdir) |
| 1264 | |
| 1265 | def _test_GitNumbererState_valid_configs_inner(self, tempdir): |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1266 | self.calls = [ |
| 1267 | ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1268 | '+refs/meta/config:refs/git_cl/meta/config'],), ''), |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1269 | ((['git', 'show', 'refs/git_cl/meta/config:project.config'],), |
| 1270 | ''' |
| 1271 | [plugin "git-numberer"] |
| 1272 | validate-enabled-refglob = refs/else/* |
| 1273 | validate-enabled-refglob = refs/heads/* |
| 1274 | validate-disabled-refglob = refs/heads/disabled |
| 1275 | validate-disabled-refglob = refs/branch-heads/* |
| 1276 | '''), |
Andrii Shyshkalov | 351c61d | 2017-01-21 20:40:16 +0000 | [diff] [blame] | 1277 | ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') , |
| 1278 | '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],), |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1279 | 'refs/else/*\n' |
| 1280 | 'refs/heads/*\n'), |
Andrii Shyshkalov | 351c61d | 2017-01-21 20:40:16 +0000 | [diff] [blame] | 1281 | ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') , |
| 1282 | '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],), |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1283 | 'refs/heads/disabled\n' |
| 1284 | 'refs/branch-heads/*\n'), |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1285 | ] * 3 # 3 tests below have exactly the same IO. |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1286 | |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1287 | res = git_cl._is_git_numberer_enabled( |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1288 | remote_url='https://chromium.googlesource.com/chromium/src', |
| 1289 | remote_ref='refs/heads/test') |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1290 | self.assertEqual(res, True) |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1291 | |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1292 | res = git_cl._is_git_numberer_enabled( |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1293 | remote_url='https://chromium.googlesource.com/chromium/src', |
| 1294 | remote_ref='refs/heads/disabled') |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1295 | self.assertEqual(res, False) |
Andrii Shyshkalov | cd6a936 | 2016-12-07 12:04:12 +0100 | [diff] [blame] | 1296 | |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 1297 | # Validator is disabled by default, even if it's not explicitly in disabled |
Andrii Shyshkalov | cbec8ef | 2016-12-09 13:54:51 +0100 | [diff] [blame] | 1298 | # refglobs. |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1299 | res = git_cl._is_git_numberer_enabled( |
Andrii Shyshkalov | cbec8ef | 2016-12-09 13:54:51 +0100 | [diff] [blame] | 1300 | remote_url='https://chromium.googlesource.com/chromium/src', |
| 1301 | remote_ref='refs/arbitrary/ref') |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1302 | self.assertEqual(res, False) |
Andrii Shyshkalov | cbec8ef | 2016-12-09 13:54:51 +0100 | [diff] [blame] | 1303 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1304 | @classmethod |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1305 | def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False): |
shinyak@chromium.org | 00dbccd | 2016-04-15 07:24:43 +0000 | [diff] [blame] | 1306 | cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated'] |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1307 | if skip_auth_check: |
| 1308 | return [((cmd, ), 'true')] |
| 1309 | |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1310 | calls = [((cmd, ), CERR1)] |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1311 | if issue: |
| 1312 | calls.extend([ |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1313 | ((['git', 'config', 'branch.master.gerritserver'],), CERR1), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1314 | ]) |
| 1315 | calls.extend([ |
| 1316 | ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'), |
| 1317 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
| 1318 | ((['git', 'config', 'remote.origin.url'],), |
| 1319 | 'https://chromium.googlesource.com/my/repo'), |
| 1320 | ((['git', 'config', 'remote.origin.url'],), |
| 1321 | 'https://chromium.googlesource.com/my/repo'), |
| 1322 | ]) |
| 1323 | return calls |
| 1324 | |
| 1325 | @classmethod |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1326 | def _gerrit_base_calls(cls, issue=None, fetched_description=None, |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1327 | fetched_status=None, other_cl_owner=None): |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 1328 | calls = [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1329 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 1330 | ((['git', 'config', 'branch.master.git-cl-similarity'],), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1331 | CERR1), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1332 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1333 | ((['git', 'config', '--bool', 'branch.master.git-find-copies'],), |
| 1334 | CERR1), |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 1335 | ] |
| 1336 | calls += cls._is_gerrit_calls(True) |
| 1337 | calls += [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1338 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 1339 | ((['git', 'config', 'branch.master.rietveldissue'],), CERR1), |
| 1340 | ((['git', 'config', 'branch.master.gerritissue'],), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1341 | CERR1 if issue is None else str(issue)), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1342 | ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1343 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1344 | ((['get_or_create_merge_base', 'master', |
| 1345 | 'refs/remotes/origin/master'],), |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 1346 | 'fake_ancestor_sha'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1347 | # Calls to verify branch point is ancestor |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 1348 | ] |
| 1349 | calls += cls._gerrit_ensure_auth_calls(issue=issue) |
| 1350 | |
| 1351 | if issue: |
| 1352 | calls += [ |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1353 | (('GetChangeDetail', 'chromium-review.googlesource.com', |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1354 | '123456', |
| 1355 | ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']), |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1356 | { |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1357 | 'owner': {'email': (other_cl_owner or 'owner@example.com')}, |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1358 | 'change_id': '123456789', |
| 1359 | 'current_revision': 'sha1_of_current_revision', |
| 1360 | 'revisions': { 'sha1_of_current_revision': { |
| 1361 | 'commit': {'message': fetched_description}, |
| 1362 | }}, |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1363 | 'status': fetched_status or 'NEW', |
Andrii Shyshkalov | 3e63142 | 2017-02-16 17:46:44 +0100 | [diff] [blame] | 1364 | }), |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 1365 | ] |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1366 | if fetched_status == 'ABANDONED': |
| 1367 | calls += [ |
| 1368 | (('DieWithError', 'Change https://chromium-review.googlesource.com/' |
| 1369 | '123456 has been abandoned, new uploads are not ' |
| 1370 | 'allowed'), SystemExitMock()), |
| 1371 | ] |
| 1372 | return calls |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1373 | if other_cl_owner: |
| 1374 | calls += [ |
| 1375 | (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''), |
| 1376 | ] |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 1377 | |
| 1378 | calls += cls._git_sanity_checks('fake_ancestor_sha', 'master', |
| 1379 | get_remote_branch=False) |
| 1380 | calls += [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1381 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 1382 | ((['git', 'rev-parse', 'HEAD'],), '12345'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1383 | |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1384 | ((['git', |
mcgrathr@chromium.org | 9249f64 | 2013-06-03 21:36:18 +0000 | [diff] [blame] | 1385 | 'diff', '--name-status', '--no-renames', '-r', |
| 1386 | 'fake_ancestor_sha...', '.'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1387 | 'M\t.gitignore\n'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 1388 | ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1), |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 1389 | ] |
| 1390 | |
| 1391 | if not issue: |
| 1392 | calls += [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1393 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 1394 | 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 1395 | 'foo'), |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 1396 | ] |
| 1397 | |
| 1398 | calls += [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1399 | ((['git', 'config', 'user.email'],), 'me@example.com'), |
| 1400 | ((['git', |
scottmg | b84b5e3 | 2016-11-10 09:25:33 -0800 | [diff] [blame] | 1401 | 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50', |
| 1402 | 'fake_ancestor_sha', 'HEAD'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1403 | '+dat'), |
Andrii Shyshkalov | 0293956 | 2017-02-16 17:47:17 +0100 | [diff] [blame] | 1404 | ] |
| 1405 | return calls |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1406 | |
tandrii@chromium.org | 1e67bb7 | 2016-02-11 12:15:49 +0000 | [diff] [blame] | 1407 | @classmethod |
| 1408 | def _gerrit_upload_calls(cls, description, reviewers, squash, |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1409 | squash_mode='default', |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 1410 | expected_upstream_ref='origin/refs/heads/master', |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1411 | ref_suffix='', title=None, notify=False, |
Andrii Shyshkalov | e9c78ff | 2017-02-06 15:53:13 +0100 | [diff] [blame] | 1412 | post_amend_description=None, issue=None, cc=None, |
| 1413 | git_mirror=None): |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 1414 | if post_amend_description is None: |
| 1415 | post_amend_description = description |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1416 | calls = [] |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 1417 | cc = cc or [] |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1418 | |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1419 | if squash_mode == 'default': |
| 1420 | calls.extend([ |
| 1421 | ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''), |
| 1422 | ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''), |
| 1423 | ]) |
| 1424 | elif squash_mode in ('override_squash', 'override_nosquash'): |
| 1425 | calls.extend([ |
| 1426 | ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), |
| 1427 | 'true' if squash_mode == 'override_squash' else 'false'), |
| 1428 | ]) |
| 1429 | else: |
| 1430 | assert squash_mode in ('squash', 'nosquash') |
| 1431 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1432 | # If issue is given, then description is fetched from Gerrit instead. |
| 1433 | if issue is None: |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1434 | calls += [ |
| 1435 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
| 1436 | 'fake_ancestor_sha..HEAD'],), |
| 1437 | description)] |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 1438 | if squash: |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1439 | title = 'Initial_upload' |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 1440 | else: |
| 1441 | if not title: |
| 1442 | calls += [ |
| 1443 | ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''), |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 1444 | (('ask_for_data', 'Title for patchset []: '), 'User input'), |
Aaron Gable | b56ad33 | 2017-01-06 15:24:31 -0800 | [diff] [blame] | 1445 | ] |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1446 | title = 'User_input' |
tandrii@chromium.org | 57d8654 | 2016-03-04 16:11:32 +0000 | [diff] [blame] | 1447 | if not git_footers.get_footer_change_id(description) and not squash: |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1448 | calls += [ |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 1449 | # DownloadGerritHook(False) |
| 1450 | ((False, ), |
| 1451 | ''), |
| 1452 | # Amending of commit message to get the Change-Id. |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1453 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 1454 | 'fake_ancestor_sha..HEAD'],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1455 | description), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1456 | ((['git', 'commit', '--amend', '-m', description],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1457 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 1458 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 1459 | 'fake_ancestor_sha..HEAD'],), |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 1460 | post_amend_description) |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1461 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1462 | if squash: |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1463 | if not issue: |
| 1464 | # Prompting to edit description on first upload. |
| 1465 | calls += [ |
| 1466 | ((['git', 'config', 'core.editor'],), ''), |
| 1467 | ((['RunEditor'],), description), |
| 1468 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1469 | ref_to_push = 'abcdef0123456789' |
| 1470 | calls += [ |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1471 | ((['git', 'config', 'branch.master.merge'],), |
| 1472 | 'refs/heads/master'), |
| 1473 | ((['git', 'config', 'branch.master.remote'],), |
| 1474 | 'origin'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1475 | ((['get_or_create_merge_base', 'master', |
| 1476 | 'refs/remotes/origin/master'],), |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1477 | 'origin/master'), |
| 1478 | ((['git', 'rev-parse', 'HEAD:'],), |
| 1479 | '0123456789abcdef'), |
| 1480 | ((['git', 'commit-tree', '0123456789abcdef', '-p', |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1481 | 'origin/master', '-m', description],), |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1482 | ref_to_push), |
| 1483 | ] |
| 1484 | else: |
| 1485 | ref_to_push = 'HEAD' |
| 1486 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1487 | calls += [ |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 1488 | ((['git', 'rev-list', |
| 1489 | expected_upstream_ref + '..' + ref_to_push],), ''), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1490 | ] |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1491 | |
Aaron Gable | 9b713dd | 2016-12-14 16:04:21 -0800 | [diff] [blame] | 1492 | if title: |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1493 | if ref_suffix: |
| 1494 | ref_suffix += ',m=' + title |
| 1495 | else: |
| 1496 | ref_suffix = '%m=' + title |
Aaron Gable | 9b713dd | 2016-12-14 16:04:21 -0800 | [diff] [blame] | 1497 | |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1498 | notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE') |
| 1499 | if ref_suffix: |
| 1500 | ref_suffix += ',' + notify_suffix |
| 1501 | else: |
| 1502 | ref_suffix = '%' + notify_suffix |
| 1503 | |
| 1504 | if reviewers: |
| 1505 | ref_suffix += ',' + ','.join('r=%s' % email |
| 1506 | for email in sorted(reviewers)) |
Andrii Shyshkalov | e9c78ff | 2017-02-06 15:53:13 +0100 | [diff] [blame] | 1507 | |
| 1508 | if git_mirror is None: |
| 1509 | calls += [ |
| 1510 | ((['git', 'config', 'remote.origin.url'],), |
| 1511 | 'https://chromium.googlesource.com/yyy/zzz'), |
| 1512 | ] |
| 1513 | else: |
| 1514 | calls += [ |
| 1515 | ((['git', 'config', 'remote.origin.url'],), |
| 1516 | '/cache/this-dir-exists'), |
| 1517 | (('os.path.isdir', '/cache/this-dir-exists'), |
| 1518 | True), |
| 1519 | # Runs in /cache/this-dir-exists. |
| 1520 | ((['git', 'config', 'remote.origin.url'],), |
| 1521 | 'https://chromium.googlesource.com/yyy/zzz'), |
| 1522 | ] |
| 1523 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1524 | calls += [ |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1525 | ((['git', 'push', |
| 1526 | 'https://chromium.googlesource.com/yyy/zzz', |
| 1527 | ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],), |
tandrii@chromium.org | a342c92 | 2016-03-16 07:08:25 +0000 | [diff] [blame] | 1528 | ('remote:\n' |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1529 | 'remote: Processing changes: (\)\n' |
| 1530 | 'remote: Processing changes: (|)\n' |
| 1531 | 'remote: Processing changes: (/)\n' |
| 1532 | 'remote: Processing changes: (-)\n' |
| 1533 | 'remote: Processing changes: new: 1 (/)\n' |
| 1534 | 'remote: Processing changes: new: 1, done\n' |
| 1535 | 'remote:\n' |
| 1536 | 'remote: New Changes:\n' |
| 1537 | 'remote: https://chromium-review.googlesource.com/123456 XXX.\n' |
| 1538 | 'remote:\n' |
| 1539 | 'To https://chromium.googlesource.com/yyy/zzz\n' |
| 1540 | ' * [new branch] hhhh -> refs/for/refs/heads/master\n')), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1541 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1542 | if squash: |
| 1543 | calls += [ |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 1544 | ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1545 | ''), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1546 | ((['git', 'config', 'branch.master.gerritserver', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 1547 | 'https://chromium-review.googlesource.com'],), ''), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1548 | ((['git', 'config', 'branch.master.gerritsquashhash', |
| 1549 | 'abcdef0123456789'],), ''), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 1550 | ] |
tandrii | 8818977 | 2016-09-29 04:29:57 -0700 | [diff] [blame] | 1551 | calls += [ |
| 1552 | ((['git', 'config', 'rietveld.cc'],), ''), |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1553 | (('AddReviewers', 'chromium-review.googlesource.com', |
tandrii | 8818977 | 2016-09-29 04:29:57 -0700 | [diff] [blame] | 1554 | 123456 if squash else None, |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1555 | ['joe@example.com'] + cc, False, notify), ''), |
tandrii | 8818977 | 2016-09-29 04:29:57 -0700 | [diff] [blame] | 1556 | ] |
tandrii@chromium.org | 1e67bb7 | 2016-02-11 12:15:49 +0000 | [diff] [blame] | 1557 | calls += cls._git_post_upload_calls() |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1558 | return calls |
| 1559 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1560 | def _run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1561 | self, |
| 1562 | upload_args, |
| 1563 | description, |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 1564 | reviewers=None, |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1565 | squash=True, |
| 1566 | squash_mode=None, |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 1567 | expected_upstream_ref='origin/refs/heads/master', |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1568 | ref_suffix='', |
Aaron Gable | 9b713dd | 2016-12-14 16:04:21 -0800 | [diff] [blame] | 1569 | title=None, |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1570 | notify=False, |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1571 | post_amend_description=None, |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 1572 | issue=None, |
Andrii Shyshkalov | e9c78ff | 2017-02-06 15:53:13 +0100 | [diff] [blame] | 1573 | cc=None, |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1574 | git_mirror=None, |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1575 | fetched_status=None, |
| 1576 | other_cl_owner=None): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1577 | """Generic gerrit upload test framework.""" |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1578 | if squash_mode is None: |
| 1579 | if '--no-squash' in upload_args: |
| 1580 | squash_mode = 'nosquash' |
| 1581 | elif '--squash' in upload_args: |
| 1582 | squash_mode = 'squash' |
| 1583 | else: |
| 1584 | squash_mode = 'default' |
| 1585 | |
tandrii@chromium.org | bf766ba | 2016-04-13 12:51:23 +0000 | [diff] [blame] | 1586 | reviewers = reviewers or [] |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 1587 | cc = cc or [] |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1588 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 1589 | self.mock(git_cl.gerrit_util, 'CookiesAuthenticator', |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1590 | CookiesAuthenticatorMockFactory( |
| 1591 | same_auth=('git-owner.example.com', '', 'pass'))) |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 1592 | self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck', |
| 1593 | lambda _, offer_removal: None) |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1594 | self.mock(git_cl.gclient_utils, 'RunEditor', |
| 1595 | lambda *_, **__: self._mocked_call(['RunEditor'])) |
| 1596 | self.mock(git_cl, 'DownloadGerritHook', self._mocked_call) |
| 1597 | |
Andrii Shyshkalov | e9c78ff | 2017-02-06 15:53:13 +0100 | [diff] [blame] | 1598 | original_os_path_isdir = os.path.isdir |
| 1599 | def selective_os_path_isdir_mock(path): |
| 1600 | if path == '/cache/this-dir-exists': |
| 1601 | return self._mocked_call('os.path.isdir', path) |
| 1602 | return original_os_path_isdir(path) |
| 1603 | self.mock(os.path, 'isdir', selective_os_path_isdir_mock) |
| 1604 | |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1605 | self.calls = self._gerrit_base_calls( |
| 1606 | issue=issue, |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1607 | fetched_description=description, |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1608 | fetched_status=fetched_status, |
| 1609 | other_cl_owner=other_cl_owner) |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1610 | if fetched_status != 'ABANDONED': |
| 1611 | self.calls += self._gerrit_upload_calls( |
| 1612 | description, reviewers, squash, |
| 1613 | squash_mode=squash_mode, |
| 1614 | expected_upstream_ref=expected_upstream_ref, |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1615 | ref_suffix=ref_suffix, title=title, notify=notify, |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1616 | post_amend_description=post_amend_description, |
| 1617 | issue=issue, cc=cc, git_mirror=git_mirror) |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 1618 | # Uncomment when debugging. |
| 1619 | # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1620 | git_cl.main(['upload'] + upload_args) |
| 1621 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1622 | def test_gerrit_upload_without_change_id(self): |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1623 | self._run_gerrit_upload_test( |
| 1624 | ['--no-squash'], |
| 1625 | 'desc\n\nBUG=\n', |
| 1626 | [], |
| 1627 | squash=False, |
| 1628 | post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx') |
| 1629 | |
| 1630 | def test_gerrit_upload_without_change_id_override_nosquash(self): |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 1631 | self.mock(git_cl, 'DownloadGerritHook', self._mocked_call) |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1632 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1633 | [], |
jamesr@chromium.org | 35d1a84 | 2012-07-27 00:20:43 +0000 | [diff] [blame] | 1634 | 'desc\n\nBUG=\n', |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 1635 | [], |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1636 | squash=False, |
| 1637 | squash_mode='override_nosquash', |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 1638 | post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1639 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1640 | def test_gerrit_no_reviewer(self): |
| 1641 | self._run_gerrit_upload_test( |
| 1642 | [], |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 1643 | 'desc\n\nBUG=\n\nChange-Id: I123456789\n', |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1644 | [], |
| 1645 | squash=False, |
| 1646 | squash_mode='override_nosquash') |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1647 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1648 | def test_gerrit_patchset_title_bad_chars(self): |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1649 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 1650 | self._run_gerrit_upload_test( |
| 1651 | ['-f', '-t', 'Don\'t put bad cha,.rs'], |
| 1652 | 'desc\n\nBUG=\n\nChange-Id: I123456789', |
| 1653 | squash=False, |
| 1654 | squash_mode='override_nosquash', |
| 1655 | title='Dont_put_bad_chars') |
| 1656 | self.assertIn( |
| 1657 | 'WARNING: Patchset title may only contain alphanumeric chars ' |
| 1658 | 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n' |
| 1659 | 'Cleaned up title: Dont put bad chars\n', |
| 1660 | git_cl.sys.stdout.getvalue()) |
| 1661 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1662 | def test_gerrit_reviewers_cmd_line(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1663 | self._run_gerrit_upload_test( |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1664 | ['-r', 'foo@example.com', '--send-mail'], |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 1665 | 'desc\n\nBUG=\n\nChange-Id: I123456789', |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1666 | ['foo@example.com'], |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1667 | squash=False, |
| 1668 | squash_mode='override_nosquash', |
tandrii@chromium.org | 8da4540 | 2016-05-24 23:11:03 +0000 | [diff] [blame] | 1669 | notify=True) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1670 | |
| 1671 | def test_gerrit_reviewer_multiple(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 1672 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1673 | [], |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 1674 | 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n' |
| 1675 | 'CC=more@example.com,people@example.com\n\n' |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 1676 | 'Change-Id: 123456789\n', |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1677 | ['reviewer@example.com', 'another@example.com'], |
| 1678 | squash=False, |
tandrii | 99a72f2 | 2016-08-17 14:33:24 -0700 | [diff] [blame] | 1679 | squash_mode='override_nosquash', |
Andrii Shyshkalov | febbae9 | 2017-04-05 15:05:20 +0000 | [diff] [blame] | 1680 | ref_suffix='%l=Code-Review+1', |
bradnelson | d975b30 | 2016-10-23 12:20:23 -0700 | [diff] [blame] | 1681 | cc=['more@example.com', 'people@example.com']) |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1682 | |
| 1683 | def test_gerrit_upload_squash_first_is_default(self): |
tandrii | a60502f | 2016-06-20 02:01:53 -0700 | [diff] [blame] | 1684 | self._run_gerrit_upload_test( |
| 1685 | [], |
| 1686 | 'desc\nBUG=\n\nChange-Id: 123456789', |
| 1687 | [], |
| 1688 | expected_upstream_ref='origin/master') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1689 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1690 | def test_gerrit_upload_squash_first(self): |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1691 | self._run_gerrit_upload_test( |
| 1692 | ['--squash'], |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1693 | 'desc\nBUG=\n\nChange-Id: 123456789', |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1694 | [], |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 1695 | squash=True, |
| 1696 | expected_upstream_ref='origin/master') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 1697 | |
Andrii Shyshkalov | e9c78ff | 2017-02-06 15:53:13 +0100 | [diff] [blame] | 1698 | def test_gerrit_upload_squash_first_with_mirror(self): |
| 1699 | self._run_gerrit_upload_test( |
| 1700 | ['--squash'], |
| 1701 | 'desc\nBUG=\n\nChange-Id: 123456789', |
| 1702 | [], |
| 1703 | squash=True, |
| 1704 | expected_upstream_ref='origin/master', |
| 1705 | git_mirror='https://chromium.googlesource.com/yyy/zzz') |
| 1706 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1707 | def test_gerrit_upload_squash_reupload(self): |
| 1708 | description = 'desc\nBUG=\n\nChange-Id: 123456789' |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 1709 | self._run_gerrit_upload_test( |
| 1710 | ['--squash'], |
| 1711 | description, |
| 1712 | [], |
| 1713 | squash=True, |
| 1714 | expected_upstream_ref='origin/master', |
| 1715 | issue=123456) |
| 1716 | |
Andrii Shyshkalov | 5c3d0b3 | 2017-02-16 17:47:31 +0100 | [diff] [blame] | 1717 | def test_gerrit_upload_squash_reupload_to_abandoned(self): |
| 1718 | self.mock(git_cl, 'DieWithError', |
| 1719 | lambda msg, change=None: self._mocked_call('DieWithError', msg)) |
| 1720 | description = 'desc\nBUG=\n\nChange-Id: 123456789' |
| 1721 | with self.assertRaises(SystemExitMock): |
| 1722 | self._run_gerrit_upload_test( |
| 1723 | ['--squash'], |
| 1724 | description, |
| 1725 | [], |
| 1726 | squash=True, |
| 1727 | expected_upstream_ref='origin/master', |
| 1728 | issue=123456, |
| 1729 | fetched_status='ABANDONED') |
| 1730 | |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 1731 | def test_gerrit_upload_squash_reupload_to_not_owned(self): |
| 1732 | self.mock(git_cl.gerrit_util, 'GetAccountDetails', |
| 1733 | lambda *_, **__: {'email': 'yet-another@example.com'}) |
| 1734 | description = 'desc\nBUG=\n\nChange-Id: 123456789' |
| 1735 | self._run_gerrit_upload_test( |
| 1736 | ['--squash'], |
| 1737 | description, |
| 1738 | [], |
| 1739 | squash=True, |
| 1740 | expected_upstream_ref='origin/master', |
| 1741 | issue=123456, |
| 1742 | other_cl_owner='other@example.com') |
| 1743 | self.assertIn( |
| 1744 | 'WARNING: change 123456 is owned by other@example.com, but you ' |
| 1745 | 'authenticate to Gerrit as yet-another@example.com.\n' |
| 1746 | 'Uploading may fail due to lack of permissions', |
| 1747 | git_cl.sys.stdout.getvalue()) |
| 1748 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1749 | def test_upload_branch_deps(self): |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1750 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1751 | def mock_run_git(*args, **_kwargs): |
| 1752 | if args[0] == ['for-each-ref', |
| 1753 | '--format=%(refname:short) %(upstream:short)', |
| 1754 | 'refs/heads']: |
| 1755 | # Create a local branch dependency tree that looks like this: |
| 1756 | # test1 -> test2 -> test3 -> test4 -> test5 |
| 1757 | # -> test3.1 |
| 1758 | # test6 -> test0 |
| 1759 | branch_deps = [ |
| 1760 | 'test2 test1', # test1 -> test2 |
| 1761 | 'test3 test2', # test2 -> test3 |
| 1762 | 'test3.1 test2', # test2 -> test3.1 |
| 1763 | 'test4 test3', # test3 -> test4 |
| 1764 | 'test5 test4', # test4 -> test5 |
| 1765 | 'test6 test0', # test0 -> test6 |
| 1766 | 'test7', # test7 |
| 1767 | ] |
| 1768 | return '\n'.join(branch_deps) |
| 1769 | self.mock(git_cl, 'RunGit', mock_run_git) |
| 1770 | |
| 1771 | class RecordCalls: |
| 1772 | times_called = 0 |
| 1773 | record_calls = RecordCalls() |
| 1774 | def mock_CMDupload(*args, **_kwargs): |
| 1775 | record_calls.times_called += 1 |
| 1776 | return 0 |
| 1777 | self.mock(git_cl, 'CMDupload', mock_CMDupload) |
| 1778 | |
| 1779 | self.calls = [ |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 1780 | (('ask_for_data', 'This command will checkout all dependent branches ' |
| 1781 | 'and run "git cl upload". Press Enter to continue, ' |
| 1782 | 'or Ctrl+C to abort'), ''), |
| 1783 | ] |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1784 | |
| 1785 | class MockChangelist(): |
| 1786 | def __init__(self): |
| 1787 | pass |
| 1788 | def GetBranch(self): |
| 1789 | return 'test1' |
| 1790 | def GetIssue(self): |
| 1791 | return '123' |
| 1792 | def GetPatchset(self): |
| 1793 | return '1001' |
tandrii@chromium.org | 4c72b08 | 2016-03-31 22:26:35 +0000 | [diff] [blame] | 1794 | def IsGerrit(self): |
| 1795 | return False |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 1796 | |
| 1797 | ret = git_cl.upload_branch_deps(MockChangelist(), []) |
| 1798 | # CMDupload should have been called 5 times because of 5 dependent branches. |
| 1799 | self.assertEquals(5, record_calls.times_called) |
| 1800 | self.assertEquals(0, ret) |
| 1801 | |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 1802 | def test_gerrit_change_id(self): |
| 1803 | self.calls = [ |
| 1804 | ((['git', 'write-tree'], ), |
| 1805 | 'hashtree'), |
| 1806 | ((['git', 'rev-parse', 'HEAD~0'], ), |
| 1807 | 'branch-parent'), |
| 1808 | ((['git', 'var', 'GIT_AUTHOR_IDENT'], ), |
| 1809 | 'A B <a@b.org> 1456848326 +0100'), |
| 1810 | ((['git', 'var', 'GIT_COMMITTER_IDENT'], ), |
| 1811 | 'C D <c@d.org> 1456858326 +0100'), |
| 1812 | ((['git', 'hash-object', '-t', 'commit', '--stdin'], ), |
| 1813 | 'hashchange'), |
| 1814 | ] |
| 1815 | change_id = git_cl.GenerateGerritChangeId('line1\nline2\n') |
| 1816 | self.assertEqual(change_id, 'Ihashchange') |
| 1817 | |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 1818 | def test_desecription_append_footer(self): |
| 1819 | for init_desc, footer_line, expected_desc in [ |
| 1820 | # Use unique desc first lines for easy test failure identification. |
| 1821 | ('foo', 'R=one', 'foo\n\nR=one'), |
| 1822 | ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='), |
| 1823 | ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'), |
| 1824 | ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'), |
| 1825 | ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two', |
| 1826 | 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'), |
| 1827 | ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz', |
| 1828 | 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'), |
| 1829 | ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz', |
| 1830 | 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'), |
| 1831 | ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'), |
| 1832 | ]: |
| 1833 | desc = git_cl.ChangeDescription(init_desc) |
| 1834 | desc.append_footer(footer_line) |
| 1835 | self.assertEqual(desc.description, expected_desc) |
| 1836 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1837 | def test_update_reviewers(self): |
| 1838 | data = [ |
| 1839 | ('foo', [], 'foo'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1840 | ('foo\nR=xx', [], 'foo\nR=xx'), |
| 1841 | ('foo\nTBR=xx', [], 'foo\nTBR=xx'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1842 | ('foo', ['a@c'], 'foo\n\nR=a@c'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1843 | ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'), |
| 1844 | ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'), |
| 1845 | ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1846 | ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 1847 | ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], 'foo\n\nR=a@c, xx, bar\nTBR=yy'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1848 | ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'), |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1849 | ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='), |
| 1850 | ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='), |
| 1851 | # Same as the line before, but full of whitespaces. |
| 1852 | ( |
| 1853 | 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], |
| 1854 | 'foo\nBar\n\nR=c@c\n BUG =', |
| 1855 | ), |
| 1856 | # Whitespaces aren't interpreted as new lines. |
| 1857 | ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1858 | ] |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1859 | expected = [i[2] for i in data] |
| 1860 | actual = [] |
| 1861 | for orig, reviewers, _expected in data: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1862 | obj = git_cl.ChangeDescription(orig) |
| 1863 | obj.update_reviewers(reviewers) |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 1864 | actual.append(obj.description) |
| 1865 | self.assertEqual(expected, actual) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 1866 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1867 | def test_get_target_ref(self): |
| 1868 | # Check remote or remote branch not present. |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1869 | self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master')) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1870 | self.assertEqual(None, git_cl.GetTargetRef(None, |
| 1871 | 'refs/remotes/origin/master', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1872 | 'master')) |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 1873 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1874 | # Check default target refs for branches. |
| 1875 | self.assertEqual('refs/heads/master', |
| 1876 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/master', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1877 | None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1878 | self.assertEqual('refs/heads/master', |
| 1879 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1880 | None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1881 | self.assertEqual('refs/heads/master', |
| 1882 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1883 | None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1884 | self.assertEqual('refs/branch-heads/123', |
| 1885 | git_cl.GetTargetRef('origin', |
| 1886 | 'refs/remotes/branch-heads/123', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1887 | None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1888 | self.assertEqual('refs/diff/test', |
| 1889 | git_cl.GetTargetRef('origin', |
| 1890 | 'refs/remotes/origin/refs/diff/test', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1891 | None)) |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 1892 | self.assertEqual('refs/heads/chrome/m42', |
| 1893 | git_cl.GetTargetRef('origin', |
| 1894 | 'refs/remotes/origin/chrome/m42', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1895 | None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1896 | |
| 1897 | # Check target refs for user-specified target branch. |
| 1898 | for branch in ('branch-heads/123', 'remotes/branch-heads/123', |
| 1899 | 'refs/remotes/branch-heads/123'): |
| 1900 | self.assertEqual('refs/branch-heads/123', |
| 1901 | git_cl.GetTargetRef('origin', |
| 1902 | 'refs/remotes/origin/master', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1903 | branch)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1904 | for branch in ('origin/master', 'remotes/origin/master', |
| 1905 | 'refs/remotes/origin/master'): |
| 1906 | self.assertEqual('refs/heads/master', |
| 1907 | git_cl.GetTargetRef('origin', |
| 1908 | 'refs/remotes/branch-heads/123', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1909 | branch)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1910 | for branch in ('master', 'heads/master', 'refs/heads/master'): |
| 1911 | self.assertEqual('refs/heads/master', |
| 1912 | git_cl.GetTargetRef('origin', |
| 1913 | 'refs/remotes/branch-heads/123', |
Andrii Shyshkalov | f3a20ae | 2017-01-24 21:23:57 +0100 | [diff] [blame] | 1914 | branch)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 1915 | |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1916 | def test_patch_when_dirty(self): |
| 1917 | # Patch when local tree is dirty |
| 1918 | self.mock(git_common, 'is_dirty_git_tree', lambda x: True) |
| 1919 | self.assertNotEqual(git_cl.main(['patch', '123456']), 0) |
| 1920 | |
| 1921 | def test_diff_when_dirty(self): |
| 1922 | # Do 'git cl diff' when local tree is dirty |
| 1923 | self.mock(git_common, 'is_dirty_git_tree', lambda x: True) |
| 1924 | self.assertNotEqual(git_cl.main(['diff']), 0) |
| 1925 | |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1926 | @staticmethod |
| 1927 | def _get_gerrit_codereview_server_calls(branch, value=None, |
| 1928 | git_short_host='host', |
| 1929 | detect_branch=True): |
| 1930 | """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer. |
| 1931 | |
| 1932 | If value is given, branch.<BRANCH>.gerritcodereview is already set. |
| 1933 | """ |
| 1934 | calls = [] |
| 1935 | if detect_branch: |
| 1936 | calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch)) |
| 1937 | calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],), |
| 1938 | CERR1 if value is None else value)) |
| 1939 | if value is None: |
| 1940 | calls += [ |
| 1941 | ((['git', 'config', 'branch.' + branch + '.merge'],), |
| 1942 | 'refs/heads' + branch), |
| 1943 | ((['git', 'config', 'branch.' + branch + '.remote'],), |
| 1944 | 'origin'), |
| 1945 | ((['git', 'config', 'remote.origin.url'],), |
| 1946 | 'https://%s.googlesource.com/my/repo' % git_short_host), |
| 1947 | ] |
| 1948 | return calls |
| 1949 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1950 | def _patch_common(self, default_codereview=None, force_codereview=False, |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1951 | new_branch=False, git_short_host='host', |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1952 | detect_gerrit_server=True, |
| 1953 | actual_codereview=None): |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 1954 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 1955 | self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset', |
| 1956 | lambda x: '60001') |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1957 | self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription', |
Kenneth Russell | 61e2ed4 | 2017-02-15 11:47:13 -0800 | [diff] [blame] | 1958 | lambda *a, **kw: 'Description') |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 1959 | self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True) |
| 1960 | |
tandrii | df09a46 | 2016-08-18 16:23:55 -0700 | [diff] [blame] | 1961 | if new_branch: |
| 1962 | self.calls = [((['git', 'new-branch', 'master'],), ''),] |
| 1963 | else: |
| 1964 | self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')] |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1965 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1966 | if default_codereview: |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1967 | if not force_codereview: |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1968 | # These calls detect codereview to use. |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1969 | self.calls += [ |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1970 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 1971 | ((['git', 'config', 'branch.master.rietveldissue'],), CERR1), |
| 1972 | ((['git', 'config', 'branch.master.gerritissue'],), CERR1), |
| 1973 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 1974 | ] |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1975 | if default_codereview == 'gerrit': |
| 1976 | if not force_codereview: |
| 1977 | self.calls += [ |
| 1978 | ((['git', 'config', 'gerrit.host'],), 'true'), |
| 1979 | ] |
| 1980 | if detect_gerrit_server: |
| 1981 | self.calls += self._get_gerrit_codereview_server_calls( |
| 1982 | 'master', git_short_host=git_short_host, |
| 1983 | detect_branch=not new_branch and force_codereview) |
| 1984 | actual_codereview = 'gerrit' |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 1985 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 1986 | elif default_codereview == 'rietveld': |
| 1987 | self.calls += [ |
| 1988 | ((['git', 'config', 'gerrit.host'],), CERR1), |
| 1989 | ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 1990 | ((['git', 'config', 'branch.master.rietveldserver',],), CERR1), |
| 1991 | ] |
| 1992 | actual_codereview = 'rietveld' |
| 1993 | |
| 1994 | if actual_codereview == 'rietveld': |
| 1995 | self.calls += [ |
| 1996 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 1997 | ] |
| 1998 | if not default_codereview: |
| 1999 | self.calls += [ |
| 2000 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 2001 | ] |
| 2002 | elif actual_codereview == 'gerrit': |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2003 | self.calls += [ |
| 2004 | (('GetChangeDetail', git_short_host + '-review.googlesource.com', |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 2005 | '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']), |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2006 | { |
| 2007 | 'current_revision': '7777777777', |
| 2008 | 'revisions': { |
| 2009 | '1111111111': { |
| 2010 | '_number': 1, |
| 2011 | 'fetch': {'http': { |
| 2012 | 'url': 'https://%s.googlesource.com/my/repo' % git_short_host, |
| 2013 | 'ref': 'refs/changes/56/123456/1', |
| 2014 | }}, |
| 2015 | }, |
| 2016 | '7777777777': { |
| 2017 | '_number': 7, |
| 2018 | 'fetch': {'http': { |
| 2019 | 'url': 'https://%s.googlesource.com/my/repo' % git_short_host, |
| 2020 | 'ref': 'refs/changes/56/123456/7', |
| 2021 | }}, |
| 2022 | }, |
| 2023 | }, |
| 2024 | }), |
| 2025 | ] |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 2026 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2027 | def _common_patch_rietveld_successful(self, **kwargs): |
| 2028 | self._patch_common(**kwargs) |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 2029 | self.calls += [ |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2030 | ((['git', 'config', 'branch.master.rietveldissue', '123456'],), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2031 | ''), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2032 | ((['git', 'config', 'branch.master.rietveldserver', |
| 2033 | 'https://codereview.example.com'],), ''), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2034 | ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2035 | ''), |
Aaron Gable | d343c63 | 2017-03-15 11:02:26 -0700 | [diff] [blame] | 2036 | ((['git', 'commit', '-m', |
| 2037 | 'Description\n\n' + |
| 2038 | 'patch from issue 123456 at patchset 60001 ' + |
| 2039 | '(http://crrev.com/123456#ps60001)'],), ''), |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 2040 | ] |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 2041 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2042 | def test_patch_rietveld_default(self): |
| 2043 | self._common_patch_rietveld_successful(default_codereview='rietveld') |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 2044 | self.assertEqual(git_cl.main(['patch', '123456']), 0) |
| 2045 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2046 | def test_patch_rietveld_successful_new_branch(self): |
| 2047 | self._common_patch_rietveld_successful(default_codereview='rietveld', |
| 2048 | new_branch=True) |
tandrii@chromium.org | c2786d9 | 2016-05-31 19:53:50 +0000 | [diff] [blame] | 2049 | self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0) |
| 2050 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2051 | def test_patch_rietveld_guess_by_url(self): |
| 2052 | self._common_patch_rietveld_successful( |
| 2053 | default_codereview=None, # It doesn't matter. |
| 2054 | actual_codereview='rietveld') |
| 2055 | self.assertEqual(git_cl.main( |
| 2056 | ['patch', 'https://codereview.example.com/123456']), 0) |
| 2057 | |
| 2058 | def test_patch_rietveld_conflict(self): |
| 2059 | self._patch_common(default_codereview='rietveld') |
skobes | 6468b90 | 2016-10-24 08:45:10 -0700 | [diff] [blame] | 2060 | GitCheckoutMock.conflict = True |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 2061 | self.assertNotEqual(git_cl.main(['patch', '123456']), 0) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 2062 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2063 | def test_patch_gerrit_default(self): |
| 2064 | self._patch_common(default_codereview='gerrit', git_short_host='chromium', |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2065 | detect_gerrit_server=True) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2066 | self.calls += [ |
| 2067 | ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
| 2068 | 'refs/changes/56/123456/7'],), ''), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2069 | ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2070 | ''), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2071 | ((['git', 'config', 'branch.master.gerritserver', |
| 2072 | 'https://chromium-review.googlesource.com'],), ''), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2073 | ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''), |
Aaron Gable | d343c63 | 2017-03-15 11:02:26 -0700 | [diff] [blame] | 2074 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2075 | ] |
| 2076 | self.assertEqual(git_cl.main(['patch', '123456']), 0) |
| 2077 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2078 | def test_patch_gerrit_force(self): |
| 2079 | self._patch_common(default_codereview='gerrit', force_codereview=True, |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2080 | git_short_host='host', detect_gerrit_server=True) |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 2081 | self.calls += [ |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2082 | ((['git', 'fetch', 'https://host.googlesource.com/my/repo', |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 2083 | 'refs/changes/56/123456/7'],), ''), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2084 | ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2085 | ''), |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 2086 | ((['git', 'config', 'branch.master.gerritserver', |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2087 | 'https://host-review.googlesource.com'],), ''), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2088 | ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''), |
Aaron Gable | d343c63 | 2017-03-15 11:02:26 -0700 | [diff] [blame] | 2089 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
tandrii@chromium.org | dde6462 | 2016-04-13 17:11:21 +0000 | [diff] [blame] | 2090 | ] |
| 2091 | self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0) |
| 2092 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2093 | def test_patch_gerrit_guess_by_url(self): |
| 2094 | self._patch_common( |
| 2095 | default_codereview=None, # It doesn't matter what's default. |
| 2096 | actual_codereview='gerrit', |
| 2097 | git_short_host='else', detect_gerrit_server=False) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2098 | self.calls += [ |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2099 | ((['git', 'fetch', 'https://else.googlesource.com/my/repo', |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2100 | 'refs/changes/56/123456/1'],), ''), |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2101 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2102 | ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2103 | ''), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2104 | ((['git', 'config', 'branch.master.gerritserver', |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2105 | 'https://else-review.googlesource.com'],), ''), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2106 | ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''), |
Aaron Gable | d343c63 | 2017-03-15 11:02:26 -0700 | [diff] [blame] | 2107 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2108 | ] |
| 2109 | self.assertEqual(git_cl.main( |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2110 | ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2111 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2112 | def test_patch_gerrit_guess_by_url_like_rietveld(self): |
| 2113 | self._patch_common( |
| 2114 | default_codereview=None, # It doesn't matter what's default. |
| 2115 | actual_codereview='gerrit', |
| 2116 | git_short_host='else', detect_gerrit_server=False) |
| 2117 | self.calls += [ |
| 2118 | ((['git', 'fetch', 'https://else.googlesource.com/my/repo', |
| 2119 | 'refs/changes/56/123456/1'],), ''), |
| 2120 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 2121 | ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
| 2122 | ''), |
| 2123 | ((['git', 'config', 'branch.master.gerritserver', |
| 2124 | 'https://else-review.googlesource.com'],), ''), |
| 2125 | ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''), |
| 2126 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''), |
| 2127 | ] |
| 2128 | self.assertEqual(git_cl.main( |
| 2129 | ['patch', 'https://else-review.googlesource.com/123456/1']), 0) |
| 2130 | |
| 2131 | def test_patch_gerrit_conflict(self): |
| 2132 | self._patch_common(default_codereview='gerrit', detect_gerrit_server=True, |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2133 | git_short_host='chromium') |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2134 | self.calls += [ |
| 2135 | ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo', |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2136 | 'refs/changes/56/123456/7'],), ''), |
Aaron Gable | d343c63 | 2017-03-15 11:02:26 -0700 | [diff] [blame] | 2137 | ((['git', 'config', 'branch.master.gerritissue', '123456'],), |
| 2138 | ''), |
| 2139 | ((['git', 'config', 'branch.master.gerritserver', |
| 2140 | 'https://chromium-review.googlesource.com'],), ''), |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2141 | ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2142 | ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1), |
| 2143 | ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],), |
| 2144 | SystemExitMock()), |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2145 | ] |
| 2146 | with self.assertRaises(SystemExitMock): |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2147 | git_cl.main(['patch', '123456']) |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 2148 | |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2149 | def test_patch_gerrit_not_exists(self): |
Andrii Shyshkalov | c6c8b4c | 2016-11-09 20:51:20 +0100 | [diff] [blame] | 2150 | def notExists(_issue, *_, **kwargs): |
| 2151 | self.assertFalse(kwargs['ignore_404']) |
| 2152 | raise git_cl.gerrit_util.GerritError(404, '') |
| 2153 | self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists) |
| 2154 | |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2155 | self.calls = [ |
| 2156 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 2157 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 2158 | ((['git', 'config', 'branch.master.rietveldissue'],), CERR1), |
| 2159 | ((['git', 'config', 'branch.master.gerritissue'],), CERR1), |
| 2160 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 2161 | ((['git', 'config', 'gerrit.host'],), 'true'), |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2162 | ((['git', 'config', 'branch.master.gerritserver'],), CERR1), |
| 2163 | ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'), |
| 2164 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
| 2165 | ((['git', 'config', 'remote.origin.url'],), |
| 2166 | 'https://chromium.googlesource.com/my/repo'), |
| 2167 | ((['DieWithError', |
| 2168 | 'change 123456 at https://chromium-review.googlesource.com does not ' |
| 2169 | 'exist or you have no access to it'],), SystemExitMock()), |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2170 | ] |
| 2171 | with self.assertRaises(SystemExitMock): |
Andrii Shyshkalov | c971239 | 2017-04-11 13:35:21 +0200 | [diff] [blame] | 2172 | self.assertEqual(1, git_cl.main(['patch', '123456'])) |
tandrii | c2405f5 | 2016-10-10 08:13:15 -0700 | [diff] [blame] | 2173 | |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 2174 | def _checkout_calls(self): |
| 2175 | return [ |
| 2176 | ((['git', 'config', '--local', '--get-regexp', |
| 2177 | 'branch\\..*\\.rietveldissue'], ), |
| 2178 | ('branch.retrying.rietveldissue 1111111111\n' |
| 2179 | 'branch.some-fix.rietveldissue 2222222222\n')), |
| 2180 | ((['git', 'config', '--local', '--get-regexp', |
| 2181 | 'branch\\..*\\.gerritissue'], ), |
| 2182 | ('branch.ger-branch.gerritissue 123456\n' |
| 2183 | 'branch.gbranch654.gerritissue 654321\n')), |
| 2184 | ] |
| 2185 | |
| 2186 | def test_checkout_gerrit(self): |
| 2187 | """Tests git cl checkout <issue>.""" |
| 2188 | self.calls = self._checkout_calls() |
| 2189 | self.calls += [((['git', 'checkout', 'ger-branch'], ), '')] |
| 2190 | self.assertEqual(0, git_cl.main(['checkout', '123456'])) |
| 2191 | |
| 2192 | def test_checkout_rietveld(self): |
| 2193 | """Tests git cl checkout <issue>.""" |
| 2194 | self.calls = self._checkout_calls() |
| 2195 | self.calls += [((['git', 'checkout', 'some-fix'], ), '')] |
| 2196 | self.assertEqual(0, git_cl.main(['checkout', '2222222222'])) |
| 2197 | |
| 2198 | def test_checkout_not_found(self): |
| 2199 | """Tests git cl checkout <issue>.""" |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 2200 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii@chromium.org | 5df290f | 2016-04-11 16:12:29 +0000 | [diff] [blame] | 2201 | self.calls = self._checkout_calls() |
| 2202 | self.assertEqual(1, git_cl.main(['checkout', '99999'])) |
| 2203 | |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 2204 | def test_checkout_no_branch_issues(self): |
| 2205 | """Tests git cl checkout <issue>.""" |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 2206 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 2207 | self.calls = [ |
| 2208 | ((['git', 'config', '--local', '--get-regexp', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2209 | 'branch\\..*\\.rietveldissue'], ), CERR1), |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 2210 | ((['git', 'config', '--local', '--get-regexp', |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2211 | 'branch\\..*\\.gerritissue'], ), CERR1), |
tandrii@chromium.org | 26c8fd2 | 2016-04-11 21:33:21 +0000 | [diff] [blame] | 2212 | ] |
| 2213 | self.assertEqual(1, git_cl.main(['checkout', '99999'])) |
| 2214 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 2215 | def _test_gerrit_ensure_authenticated_common(self, auth, |
| 2216 | skip_auth_check=False): |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2217 | self.mock(git_cl.gerrit_util, 'CookiesAuthenticator', |
| 2218 | CookiesAuthenticatorMockFactory(hosts_with_creds=auth)) |
| 2219 | self.mock(git_cl, 'DieWithError', |
Christopher Lam | f732cd5 | 2017-01-24 12:40:11 +1100 | [diff] [blame] | 2220 | lambda msg, change=None: self._mocked_call(['DieWithError', msg])) |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 2221 | self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2222 | cl = git_cl.Changelist(codereview='gerrit') |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 2223 | cl.branch = 'master' |
| 2224 | cl.branchref = 'refs/heads/master' |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2225 | cl.lookedup_issue = True |
| 2226 | return cl |
| 2227 | |
| 2228 | def test_gerrit_ensure_authenticated_missing(self): |
| 2229 | cl = self._test_gerrit_ensure_authenticated_common(auth={ |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 2230 | 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2231 | }) |
| 2232 | self.calls.append( |
| 2233 | ((['DieWithError', |
| 2234 | 'Credentials for the following hosts are required:\n' |
| 2235 | ' chromium-review.googlesource.com\n' |
| 2236 | 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n' |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 2237 | 'You can (re)generate your credentials by visiting ' |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2238 | 'https://chromium-review.googlesource.com/new-password'],), ''),) |
| 2239 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 2240 | |
| 2241 | def test_gerrit_ensure_authenticated_conflict(self): |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 2242 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2243 | cl = self._test_gerrit_ensure_authenticated_common(auth={ |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 2244 | 'chromium.googlesource.com': |
| 2245 | ('git-one.example.com', None, 'secret1'), |
| 2246 | 'chromium-review.googlesource.com': |
| 2247 | ('git-other.example.com', None, 'secret2'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2248 | }) |
| 2249 | self.calls.append( |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2250 | (('ask_for_data', 'If you know what you are doing ' |
| 2251 | 'press Enter to continue, or Ctrl+C to abort'), '')) |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2252 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 2253 | |
| 2254 | def test_gerrit_ensure_authenticated_ok(self): |
| 2255 | cl = self._test_gerrit_ensure_authenticated_common(auth={ |
Andrii Shyshkalov | bb86fbb | 2017-03-24 14:59:28 +0100 | [diff] [blame] | 2256 | 'chromium.googlesource.com': |
| 2257 | ('git-same.example.com', None, 'secret'), |
| 2258 | 'chromium-review.googlesource.com': |
| 2259 | ('git-same.example.com', None, 'secret'), |
tandrii@chromium.org | fe30f18 | 2016-04-13 12:15:04 +0000 | [diff] [blame] | 2260 | }) |
| 2261 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 2262 | |
tandrii@chromium.org | 2825353 | 2016-04-14 13:46:56 +0000 | [diff] [blame] | 2263 | def test_gerrit_ensure_authenticated_skipped(self): |
| 2264 | cl = self._test_gerrit_ensure_authenticated_common( |
| 2265 | auth={}, skip_auth_check=True) |
| 2266 | self.assertIsNone(cl.EnsureAuthenticated(force=False)) |
| 2267 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2268 | def test_cmd_set_commit_rietveld(self): |
tandrii | 4d84359 | 2016-07-27 08:22:56 -0700 | [diff] [blame] | 2269 | self.mock(git_cl._RietveldChangelistImpl, 'SetFlags', |
| 2270 | lambda _, v: self._mocked_call(['SetFlags', v])) |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2271 | self.calls = [ |
| 2272 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2273 | ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2274 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 2275 | ((['git', 'config', 'rietveld.server'],), ''), |
| 2276 | ((['git', 'config', 'rietveld.server'],), ''), |
| 2277 | ((['git', 'config', 'branch.feature.rietveldserver'],), |
| 2278 | 'https://codereview.chromium.org'), |
tandrii | 4d84359 | 2016-07-27 08:22:56 -0700 | [diff] [blame] | 2279 | ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''), |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2280 | ] |
| 2281 | self.assertEqual(0, git_cl.main(['set-commit'])) |
| 2282 | |
Andrii Shyshkalov | 828701b | 2016-12-09 10:46:47 +0100 | [diff] [blame] | 2283 | def _cmd_set_commit_gerrit_common(self, vote, notify=None): |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2284 | self.mock(git_cl.gerrit_util, 'SetReview', |
Andrii Shyshkalov | 828701b | 2016-12-09 10:46:47 +0100 | [diff] [blame] | 2285 | lambda h, i, labels, notify=None: |
| 2286 | self._mocked_call(['SetReview', h, i, labels, notify])) |
| 2287 | |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2288 | self.calls = [ |
| 2289 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2290 | ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), |
| 2291 | ((['git', 'config', 'branch.feature.gerritissue'],), '123'), |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2292 | ((['git', 'config', 'branch.feature.gerritserver'],), |
| 2293 | 'https://chromium-review.googlesource.com'), |
| 2294 | ((['SetReview', 'chromium-review.googlesource.com', 123, |
Andrii Shyshkalov | 828701b | 2016-12-09 10:46:47 +0100 | [diff] [blame] | 2295 | {'Commit-Queue': vote}, notify],), ''), |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2296 | ] |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 2297 | |
| 2298 | def test_cmd_set_commit_gerrit_clear(self): |
| 2299 | self._cmd_set_commit_gerrit_common(0) |
| 2300 | self.assertEqual(0, git_cl.main(['set-commit', '-c'])) |
| 2301 | |
| 2302 | def test_cmd_set_commit_gerrit_dry(self): |
Andrii Shyshkalov | 828701b | 2016-12-09 10:46:47 +0100 | [diff] [blame] | 2303 | self._cmd_set_commit_gerrit_common(1, notify='NONE') |
tandrii@chromium.org | fa330e8 | 2016-04-13 17:09:52 +0000 | [diff] [blame] | 2304 | self.assertEqual(0, git_cl.main(['set-commit', '-d'])) |
| 2305 | |
tandrii | d9e5ce5 | 2016-07-13 02:32:59 -0700 | [diff] [blame] | 2306 | def test_cmd_set_commit_gerrit(self): |
| 2307 | self._cmd_set_commit_gerrit_common(2) |
| 2308 | self.assertEqual(0, git_cl.main(['set-commit'])) |
| 2309 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 2310 | def test_description_display(self): |
| 2311 | out = StringIO.StringIO() |
| 2312 | self.mock(git_cl.sys, 'stdout', out) |
| 2313 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 2314 | self.mock(git_cl, 'Changelist', ChangelistMock) |
| 2315 | ChangelistMock.desc = 'foo\n' |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 2316 | |
| 2317 | self.assertEqual(0, git_cl.main(['description', '-d'])) |
| 2318 | self.assertEqual('foo\n', out.getvalue()) |
| 2319 | |
| 2320 | def test_description_rietveld(self): |
| 2321 | out = StringIO.StringIO() |
| 2322 | self.mock(git_cl.sys, 'stdout', out) |
martiniss | 6eda05f | 2016-06-30 10:18:35 -0700 | [diff] [blame] | 2323 | self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar') |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 2324 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 2325 | self.assertEqual(0, git_cl.main([ |
Andrii Shyshkalov | 28d840e | 2017-04-10 15:45:09 +0200 | [diff] [blame] | 2326 | 'description', '-d', '--rietveld', 'https://code.review.org/123123'])) |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 2327 | self.assertEqual('foobar\n', out.getvalue()) |
| 2328 | |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 2329 | def test_StatusFieldOverrideIssueMissingArgs(self): |
| 2330 | out = StringIO.StringIO() |
| 2331 | self.mock(git_cl.sys, 'stderr', out) |
| 2332 | |
| 2333 | try: |
| 2334 | self.assertEqual(git_cl.main(['status', '--issue', '1']), 0) |
| 2335 | except SystemExit as ex: |
| 2336 | self.assertEqual(ex.code, 2) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2337 | self.assertRegexpMatches(out.getvalue(), r'--issue must be specified') |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 2338 | |
| 2339 | out = StringIO.StringIO() |
| 2340 | self.mock(git_cl.sys, 'stderr', out) |
| 2341 | |
| 2342 | try: |
| 2343 | self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0) |
| 2344 | except SystemExit as ex: |
| 2345 | self.assertEqual(ex.code, 2) |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2346 | self.assertRegexpMatches(out.getvalue(), r'--field must be specified') |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 2347 | |
| 2348 | def test_StatusFieldOverrideIssue(self): |
| 2349 | out = StringIO.StringIO() |
| 2350 | self.mock(git_cl.sys, 'stdout', out) |
| 2351 | |
| 2352 | def assertIssue(cl_self, *_args): |
| 2353 | self.assertEquals(cl_self.issue, 1) |
| 2354 | return 'foobar' |
| 2355 | |
| 2356 | self.mock(git_cl.Changelist, 'GetDescription', assertIssue) |
| 2357 | self.calls = [ |
| 2358 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 2359 | ((['git', 'config', 'rietveld.server'],), ''), |
| 2360 | ((['git', 'config', 'rietveld.server'],), ''), |
| 2361 | ] |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2362 | self.assertEqual( |
| 2363 | git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']), |
| 2364 | 0) |
iannucci | 3c972b9 | 2016-08-17 13:24:10 -0700 | [diff] [blame] | 2365 | self.assertEqual(out.getvalue(), 'foobar\n') |
| 2366 | |
iannucci | e53c935 | 2016-08-17 14:40:40 -0700 | [diff] [blame] | 2367 | def test_SetCloseOverrideIssue(self): |
| 2368 | def assertIssue(cl_self, *_args): |
| 2369 | self.assertEquals(cl_self.issue, 1) |
| 2370 | return 'foobar' |
| 2371 | |
| 2372 | self.mock(git_cl.Changelist, 'GetDescription', assertIssue) |
| 2373 | self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None) |
| 2374 | self.calls = [ |
| 2375 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 2376 | ((['git', 'config', 'rietveld.server'],), ''), |
| 2377 | ((['git', 'config', 'rietveld.server'],), ''), |
| 2378 | ] |
| 2379 | self.assertEqual( |
| 2380 | git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0) |
| 2381 | |
| 2382 | def test_SetCommitOverrideIssue(self): |
| 2383 | def assertIssue(cl_self, *_args): |
| 2384 | self.assertEquals(cl_self.issue, 1) |
| 2385 | return 'foobar' |
| 2386 | |
| 2387 | self.mock(git_cl.Changelist, 'GetDescription', assertIssue) |
| 2388 | self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None) |
| 2389 | self.calls = [ |
| 2390 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 2391 | ((['git', 'config', 'rietveld.server'],), ''), |
| 2392 | ((['git', 'config', 'rietveld.server'],), ''), |
| 2393 | ((['git', 'symbolic-ref', 'HEAD'],), ''), |
| 2394 | ((['git', 'config', 'rietveld.server'],), ''), |
| 2395 | ((['git', 'config', 'rietveld.server'],), ''), |
| 2396 | ] |
| 2397 | self.assertEqual( |
| 2398 | git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0) |
| 2399 | |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 2400 | def test_description_gerrit(self): |
| 2401 | out = StringIO.StringIO() |
| 2402 | self.mock(git_cl.sys, 'stdout', out) |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2403 | self.calls = [ |
Andrii Shyshkalov | 8039be7 | 2017-01-26 09:38:18 +0100 | [diff] [blame] | 2404 | (('GetChangeDetail', 'code.review.org', |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2405 | '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']), |
| 2406 | { |
| 2407 | 'current_revision': 'sha1', |
| 2408 | 'revisions': {'sha1': { |
| 2409 | 'commit': {'message': 'foobar'}, |
| 2410 | }}, |
| 2411 | }), |
| 2412 | ] |
martiniss@chromium.org | 2b55fe3 | 2016-04-26 20:28:54 +0000 | [diff] [blame] | 2413 | self.assertEqual(0, git_cl.main([ |
| 2414 | 'description', 'https://code.review.org/123123', '-d', '--gerrit'])) |
| 2415 | self.assertEqual('foobar\n', out.getvalue()) |
| 2416 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 2417 | def test_description_set_raw(self): |
| 2418 | out = StringIO.StringIO() |
| 2419 | self.mock(git_cl.sys, 'stdout', out) |
| 2420 | |
| 2421 | self.mock(git_cl, 'Changelist', ChangelistMock) |
| 2422 | self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi')) |
| 2423 | |
| 2424 | self.assertEqual(0, git_cl.main(['description', '-n', 'hihi'])) |
| 2425 | self.assertEqual('hihi', ChangelistMock.desc) |
| 2426 | |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2427 | def test_description_appends_bug_line(self): |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 2428 | current_desc = 'Some.\n\nChange-Id: xxx' |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2429 | |
| 2430 | def RunEditor(desc, _, **kwargs): |
| 2431 | self.assertEquals( |
| 2432 | '# Enter a description of the change.\n' |
| 2433 | '# This will be displayed on the codereview site.\n' |
| 2434 | '# The first line will also be used as the subject of the review.\n' |
| 2435 | '#--------------------This line is 72 characters long' |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 2436 | '--------------------\n' |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 2437 | 'Some.\n\nChange-Id: xxx\nBug: ', |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2438 | desc) |
tandrii@chromium.org | 601e1d1 | 2016-06-03 13:03:54 +0000 | [diff] [blame] | 2439 | # Simulate user changing something. |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 2440 | return 'Some.\n\nChange-Id: xxx\nBug: 123' |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2441 | |
dsansome | e2d6fd9 | 2016-09-08 00:10:47 -0700 | [diff] [blame] | 2442 | def UpdateDescriptionRemote(_, desc, force=False): |
Aaron Gable | 3a16ed1 | 2017-03-23 10:51:55 -0700 | [diff] [blame] | 2443 | self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123') |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2444 | |
| 2445 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 2446 | self.mock(git_cl.Changelist, 'GetDescription', |
| 2447 | lambda *args: current_desc) |
| 2448 | self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote', |
| 2449 | UpdateDescriptionRemote) |
| 2450 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
| 2451 | |
| 2452 | self.calls = [ |
| 2453 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2454 | ((['git', 'config', 'branch.feature.gerritissue'],), '123'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2455 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 2456 | ((['git', 'config', 'rietveld.bug-prefix'],), CERR1), |
tandrii@chromium.org | d605a51 | 2016-06-03 09:55:00 +0000 | [diff] [blame] | 2457 | ((['git', 'config', 'core.editor'],), 'vi'), |
| 2458 | ] |
| 2459 | self.assertEqual(0, git_cl.main(['description', '--gerrit'])) |
| 2460 | |
martiniss@chromium.org | d6648e2 | 2016-04-29 19:22:16 +0000 | [diff] [blame] | 2461 | def test_description_set_stdin(self): |
| 2462 | out = StringIO.StringIO() |
| 2463 | self.mock(git_cl.sys, 'stdout', out) |
| 2464 | |
| 2465 | self.mock(git_cl, 'Changelist', ChangelistMock) |
| 2466 | self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman')) |
| 2467 | |
| 2468 | self.assertEqual(0, git_cl.main(['description', '-n', '-'])) |
| 2469 | self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc) |
| 2470 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2471 | def test_archive(self): |
tandrii | 1c67da6 | 2016-06-10 07:35:53 -0700 | [diff] [blame] | 2472 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 2473 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2474 | self.calls = \ |
| 2475 | [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 2476 | 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2477 | ((['git', 'config', 'branch.master.rietveldissue'],), '1'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2478 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 2479 | ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2480 | ((['git', 'config', 'branch.foo.rietveldissue'],), '456'), |
| 2481 | ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1), |
| 2482 | ((['git', 'config', 'branch.bar.gerritissue'],), '789'), |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2483 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 2484 | ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''), |
| 2485 | ((['git', 'branch', '-D', 'foo'],), '')] |
| 2486 | |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2487 | self.mock(git_cl, 'get_cl_statuses', |
| 2488 | lambda branches, fine_grained, max_processes: |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2489 | [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| 2490 | (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
| 2491 | (MockChangelistWithBranchAndIssue('bar', 789), 'open')]) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2492 | |
| 2493 | self.assertEqual(0, git_cl.main(['archive', '-f'])) |
| 2494 | |
| 2495 | def test_archive_current_branch_fails(self): |
tandrii | 1c67da6 | 2016-06-10 07:35:53 -0700 | [diff] [blame] | 2496 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2497 | self.calls = \ |
| 2498 | [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 2499 | 'refs/heads/master'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2500 | ((['git', 'config', 'branch.master.rietveldissue'],), '1'), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2501 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 2502 | ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2503 | ((['git', 'symbolic-ref', 'HEAD'],), 'master')] |
| 2504 | |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2505 | self.mock(git_cl, 'get_cl_statuses', |
| 2506 | lambda branches, fine_grained, max_processes: |
| 2507 | [(MockChangelistWithBranchAndIssue('master', 1), 'closed')]) |
| 2508 | |
| 2509 | self.assertEqual(1, git_cl.main(['archive', '-f'])) |
| 2510 | |
| 2511 | def test_archive_dry_run(self): |
| 2512 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 2513 | |
| 2514 | self.calls = \ |
| 2515 | [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 2516 | 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
| 2517 | ((['git', 'config', 'branch.master.rietveldissue'],), '1'), |
| 2518 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 2519 | ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 2520 | ((['git', 'config', 'branch.foo.rietveldissue'],), '456'), |
| 2521 | ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1), |
| 2522 | ((['git', 'config', 'branch.bar.gerritissue'],), '789'), |
| 2523 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'),] |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2524 | |
| 2525 | self.mock(git_cl, 'get_cl_statuses', |
| 2526 | lambda branches, fine_grained, max_processes: |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2527 | [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| 2528 | (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
| 2529 | (MockChangelistWithBranchAndIssue('bar', 789), 'open')]) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2530 | |
kmarshall | 9249e01 | 2016-08-23 12:02:16 -0700 | [diff] [blame] | 2531 | self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run'])) |
| 2532 | |
| 2533 | def test_archive_no_tags(self): |
| 2534 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 2535 | |
| 2536 | self.calls = \ |
| 2537 | [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],), |
| 2538 | 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'), |
| 2539 | ((['git', 'config', 'branch.master.rietveldissue'],), '1'), |
| 2540 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 2541 | ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 2542 | ((['git', 'config', 'branch.foo.rietveldissue'],), '456'), |
| 2543 | ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1), |
| 2544 | ((['git', 'config', 'branch.bar.gerritissue'],), '789'), |
| 2545 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 2546 | ((['git', 'branch', '-D', 'foo'],), '')] |
| 2547 | |
| 2548 | self.mock(git_cl, 'get_cl_statuses', |
| 2549 | lambda branches, fine_grained, max_processes: |
| 2550 | [(MockChangelistWithBranchAndIssue('master', 1), 'open'), |
| 2551 | (MockChangelistWithBranchAndIssue('foo', 456), 'closed'), |
| 2552 | (MockChangelistWithBranchAndIssue('bar', 789), 'open')]) |
| 2553 | |
| 2554 | self.assertEqual(0, git_cl.main(['archive', '-f', '--notags'])) |
kmarshall | 3bff56b | 2016-06-06 18:31:47 -0700 | [diff] [blame] | 2555 | |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 2556 | def test_cmd_issue_erase_existing(self): |
| 2557 | out = StringIO.StringIO() |
| 2558 | self.mock(git_cl.sys, 'stdout', out) |
| 2559 | self.calls = [ |
| 2560 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2561 | ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), |
| 2562 | ((['git', 'config', 'branch.feature.gerritissue'],), '123'), |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 2563 | # Let this command raise exception (retcode=1) - it should be ignored. |
| 2564 | ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],), |
tandrii | 5d48c32 | 2016-08-18 16:19:37 -0700 | [diff] [blame] | 2565 | CERR1), |
| 2566 | ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''), |
| 2567 | ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''), |
tandrii@chromium.org | 9b7fd71 | 2016-06-01 13:45:20 +0000 | [diff] [blame] | 2568 | ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''), |
| 2569 | ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],), |
| 2570 | ''), |
| 2571 | ] |
| 2572 | self.assertEqual(0, git_cl.main(['issue', '0'])) |
| 2573 | |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 2574 | def test_cmd_issue_json(self): |
| 2575 | out = StringIO.StringIO() |
| 2576 | self.mock(git_cl.sys, 'stdout', out) |
| 2577 | self.calls = [ |
| 2578 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2579 | ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
phajdan.jr | e328cf9 | 2016-08-22 04:12:17 -0700 | [diff] [blame] | 2580 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 2581 | ((['git', 'config', 'rietveld.server'],), |
| 2582 | 'https://codereview.chromium.org'), |
| 2583 | ((['git', 'config', 'branch.feature.rietveldserver'],), ''), |
| 2584 | (('write_json', 'output.json', |
| 2585 | {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}), |
| 2586 | ''), |
| 2587 | ] |
| 2588 | self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json'])) |
| 2589 | |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2590 | def test_git_cl_try_default_cq_dry_run(self): |
tandrii | 9de9ec6 | 2016-07-13 03:01:59 -0700 | [diff] [blame] | 2591 | self.mock(git_cl.Changelist, 'GetChange', |
| 2592 | lambda _, *a: ( |
| 2593 | self._mocked_call(['GetChange']+list(a)))) |
| 2594 | self.mock(git_cl.presubmit_support, 'DoGetTryMasters', |
| 2595 | lambda *_, **__: ( |
| 2596 | self._mocked_call(['DoGetTryMasters']))) |
tandrii | 9de9ec6 | 2016-07-13 03:01:59 -0700 | [diff] [blame] | 2597 | self.mock(git_cl._RietveldChangelistImpl, 'SetCQState', |
| 2598 | lambda _, s: self._mocked_call(['SetCQState', s])) |
| 2599 | self.calls = [ |
| 2600 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
tandrii | 33a46ff | 2016-08-23 05:53:40 -0700 | [diff] [blame] | 2601 | ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
tandrii | 9de9ec6 | 2016-07-13 03:01:59 -0700 | [diff] [blame] | 2602 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 2603 | ((['git', 'config', 'rietveld.server'],), |
| 2604 | 'https://codereview.chromium.org'), |
| 2605 | ((['git', 'config', 'branch.feature.rietveldserver'],), ''), |
| 2606 | ((['git', 'config', 'branch.feature.merge'],), 'feature'), |
| 2607 | ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
| 2608 | ((['get_or_create_merge_base', 'feature', 'feature'],), |
| 2609 | 'fake_ancestor_sha'), |
| 2610 | ((['GetChange', 'fake_ancestor_sha', None], ), |
| 2611 | git_cl.presubmit_support.GitChange( |
| 2612 | '', '', '', '', '', '', '', '')), |
| 2613 | ((['git', 'rev-parse', '--show-cdup'],), '../'), |
| 2614 | ((['DoGetTryMasters'], ), None), |
tandrii | 9de9ec6 | 2016-07-13 03:01:59 -0700 | [diff] [blame] | 2615 | ((['SetCQState', git_cl._CQState.DRY_RUN], ), None), |
| 2616 | ] |
| 2617 | out = StringIO.StringIO() |
| 2618 | self.mock(git_cl.sys, 'stdout', out) |
| 2619 | self.assertEqual(0, git_cl.main(['try'])) |
| 2620 | self.assertEqual( |
| 2621 | out.getvalue(), |
| 2622 | 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n') |
| 2623 | |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2624 | def test_git_cl_try_default_cq_dry_run_gerrit(self): |
| 2625 | self.mock(git_cl.Changelist, 'GetChange', |
| 2626 | lambda _, *a: ( |
| 2627 | self._mocked_call(['GetChange']+list(a)))) |
| 2628 | self.mock(git_cl.presubmit_support, 'DoGetTryMasters', |
| 2629 | lambda *_, **__: ( |
| 2630 | self._mocked_call(['DoGetTryMasters']))) |
| 2631 | self.mock(git_cl._GerritChangelistImpl, 'SetCQState', |
| 2632 | lambda _, s: self._mocked_call(['SetCQState', s])) |
| 2633 | |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2634 | self.calls = [ |
| 2635 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 2636 | ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), |
| 2637 | ((['git', 'config', 'branch.feature.gerritissue'],), '123456'), |
| 2638 | ((['git', 'config', 'branch.feature.gerritserver'],), |
| 2639 | 'https://chromium-review.googlesource.com'), |
Andrii Shyshkalov | eadad92 | 2017-01-26 09:38:30 +0100 | [diff] [blame] | 2640 | (('GetChangeDetail', 'chromium-review.googlesource.com', '123456', |
| 2641 | ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), { |
| 2642 | 'project': 'depot_tools', |
| 2643 | 'status': 'OPEN', |
| 2644 | 'owner': {'email': 'owner@e.mail'}, |
| 2645 | 'revisions': { |
| 2646 | 'deadbeaf': { |
| 2647 | '_number': 6, |
| 2648 | }, |
| 2649 | 'beeeeeef': { |
| 2650 | '_number': 7, |
| 2651 | 'fetch': {'http': { |
| 2652 | 'url': 'https://chromium.googlesource.com/depot_tools', |
| 2653 | 'ref': 'refs/changes/56/123456/7' |
| 2654 | }}, |
| 2655 | }, |
| 2656 | }, |
| 2657 | }), |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2658 | ((['git', 'config', 'branch.feature.merge'],), 'feature'), |
| 2659 | ((['git', 'config', 'branch.feature.remote'],), 'origin'), |
| 2660 | ((['get_or_create_merge_base', 'feature', 'feature'],), |
| 2661 | 'fake_ancestor_sha'), |
| 2662 | ((['GetChange', 'fake_ancestor_sha', None], ), |
| 2663 | git_cl.presubmit_support.GitChange( |
| 2664 | '', '', '', '', '', '', '', '')), |
| 2665 | ((['git', 'rev-parse', '--show-cdup'],), '../'), |
| 2666 | ((['DoGetTryMasters'], ), None), |
| 2667 | ((['SetCQState', git_cl._CQState.DRY_RUN], ), None), |
| 2668 | ] |
| 2669 | out = StringIO.StringIO() |
| 2670 | self.mock(git_cl.sys, 'stdout', out) |
| 2671 | self.assertEqual(0, git_cl.main(['try'])) |
| 2672 | self.assertEqual( |
| 2673 | out.getvalue(), |
| 2674 | 'scheduled CQ Dry Run on ' |
| 2675 | 'https://chromium-review.googlesource.com/123456\n') |
| 2676 | |
| 2677 | def test_git_cl_try_buildbucket_with_properties_rietveld(self): |
| 2678 | self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', |
| 2679 | lambda _: { |
| 2680 | 'owner_email': 'owner@e.mail', |
| 2681 | 'private': False, |
| 2682 | 'closed': False, |
| 2683 | 'project': 'depot_tools', |
| 2684 | 'patchsets': [20001], |
| 2685 | }) |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2686 | self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4') |
| 2687 | self.calls = [ |
| 2688 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 2689 | ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
| 2690 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 2691 | ((['git', 'config', 'rietveld.server'],), |
| 2692 | 'https://codereview.chromium.org'), |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2693 | ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'), |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2694 | ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1), |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2695 | ] |
| 2696 | |
| 2697 | def _buildbucket_retry(*_, **kw): |
| 2698 | # self.maxDiff = 10000 |
| 2699 | body = json.loads(kw['body']) |
| 2700 | self.assertEqual(len(body['builds']), 1) |
| 2701 | build = body['builds'][0] |
| 2702 | params = json.loads(build.pop('parameters_json')) |
| 2703 | self.assertEqual(params, { |
| 2704 | u'builder_name': u'win', |
| 2705 | u'changes': [{u'author': {u'email': u'owner@e.mail'}, |
| 2706 | u'revision': None}], |
| 2707 | u'properties': { |
| 2708 | u'category': u'git_cl_try', |
| 2709 | u'issue': 123, |
| 2710 | u'key': u'val', |
| 2711 | u'json': [{u'a': 1}, None], |
| 2712 | u'master': u'tryserver.chromium', |
| 2713 | u'patch_project': u'depot_tools', |
| 2714 | u'patch_storage': u'rietveld', |
| 2715 | u'patchset': 20001, |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2716 | u'rietveld': u'https://codereview.chromium.org', |
| 2717 | } |
| 2718 | }) |
| 2719 | self.assertEqual(build, { |
| 2720 | u'bucket': u'master.tryserver.chromium', |
| 2721 | u'client_operation_id': u'uuid4', |
| 2722 | u'tags': [u'builder:win', |
| 2723 | u'buildset:patch/rietveld/codereview.chromium.org/123/20001', |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 2724 | u'user_agent:git_cl_try', |
| 2725 | u'master:tryserver.chromium'], |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2726 | }) |
| 2727 | |
| 2728 | self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry) |
| 2729 | |
| 2730 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 2731 | self.assertEqual(0, git_cl.main([ |
| 2732 | 'try', '-m', 'tryserver.chromium', '-b', 'win', |
| 2733 | '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])) |
| 2734 | self.assertRegexpMatches( |
| 2735 | git_cl.sys.stdout.getvalue(), |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 2736 | 'Tried jobs on:\nBucket: master.tryserver.chromium') |
| 2737 | |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2738 | def test_git_cl_try_buildbucket_with_properties_gerrit(self): |
| 2739 | self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7) |
| 2740 | self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4') |
| 2741 | |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2742 | self.calls = [ |
| 2743 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 2744 | ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), |
| 2745 | ((['git', 'config', 'branch.feature.gerritissue'],), '123456'), |
| 2746 | ((['git', 'config', 'branch.feature.gerritserver'],), |
| 2747 | 'https://chromium-review.googlesource.com'), |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 2748 | (('GetChangeDetail', 'chromium-review.googlesource.com', '123456', |
Andrii Shyshkalov | eadad92 | 2017-01-26 09:38:30 +0100 | [diff] [blame] | 2749 | ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), { |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2750 | 'project': 'depot_tools', |
Andrii Shyshkalov | eadad92 | 2017-01-26 09:38:30 +0100 | [diff] [blame] | 2751 | 'status': 'OPEN', |
| 2752 | 'owner': {'email': 'owner@e.mail'}, |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2753 | 'revisions': { |
| 2754 | 'deadbeaf': { |
| 2755 | '_number': 6, |
| 2756 | }, |
| 2757 | 'beeeeeef': { |
| 2758 | '_number': 7, |
| 2759 | 'fetch': {'http': { |
| 2760 | 'url': 'https://chromium.googlesource.com/depot_tools', |
| 2761 | 'ref': 'refs/changes/56/123456/7' |
| 2762 | }}, |
| 2763 | }, |
| 2764 | }, |
| 2765 | }), |
| 2766 | ] |
| 2767 | |
| 2768 | def _buildbucket_retry(*_, **kw): |
| 2769 | # self.maxDiff = 10000 |
| 2770 | body = json.loads(kw['body']) |
| 2771 | self.assertEqual(len(body['builds']), 1) |
| 2772 | build = body['builds'][0] |
| 2773 | params = json.loads(build.pop('parameters_json')) |
| 2774 | self.assertEqual(params, { |
| 2775 | u'builder_name': u'win', |
| 2776 | u'changes': [{u'author': {u'email': u'owner@e.mail'}, |
| 2777 | u'revision': None}], |
| 2778 | u'properties': { |
| 2779 | u'category': u'git_cl_try', |
| 2780 | u'key': u'val', |
| 2781 | u'json': [{u'a': 1}, None], |
| 2782 | u'master': u'tryserver.chromium', |
| 2783 | |
| 2784 | u'patch_gerrit_url': |
| 2785 | u'https://chromium-review.googlesource.com', |
| 2786 | u'patch_issue': 123456, |
| 2787 | u'patch_project': u'depot_tools', |
| 2788 | u'patch_ref': u'refs/changes/56/123456/7', |
| 2789 | u'patch_repository_url': |
| 2790 | u'https://chromium.googlesource.com/depot_tools', |
| 2791 | u'patch_set': 7, |
| 2792 | u'patch_storage': u'gerrit', |
| 2793 | } |
| 2794 | }) |
| 2795 | self.assertEqual(build, { |
| 2796 | u'bucket': u'master.tryserver.chromium', |
| 2797 | u'client_operation_id': u'uuid4', |
| 2798 | u'tags': [ |
| 2799 | u'builder:win', |
| 2800 | u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7', |
| 2801 | u'user_agent:git_cl_try', |
| 2802 | u'master:tryserver.chromium'], |
| 2803 | }) |
| 2804 | |
| 2805 | self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry) |
| 2806 | |
| 2807 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 2808 | self.assertEqual(0, git_cl.main([ |
| 2809 | 'try', '-m', 'tryserver.chromium', '-b', 'win', |
| 2810 | '-p', 'key=val', '-p', 'json=[{"a":1}, null]'])) |
| 2811 | self.assertRegexpMatches( |
| 2812 | git_cl.sys.stdout.getvalue(), |
| 2813 | 'Tried jobs on:\nBucket: master.tryserver.chromium') |
| 2814 | |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 2815 | def test_git_cl_try_buildbucket_bucket_flag(self): |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2816 | self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', |
| 2817 | lambda _: { |
| 2818 | 'owner_email': 'owner@e.mail', |
| 2819 | 'private': False, |
| 2820 | 'closed': False, |
| 2821 | 'project': 'depot_tools', |
| 2822 | 'patchsets': [20001], |
| 2823 | }) |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 2824 | self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4') |
| 2825 | self.calls = [ |
| 2826 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 2827 | ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
| 2828 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 2829 | ((['git', 'config', 'rietveld.server'],), |
| 2830 | 'https://codereview.chromium.org'), |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 2831 | ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'), |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2832 | ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1), |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 2833 | ] |
| 2834 | |
| 2835 | def _buildbucket_retry(*_, **kw): |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 2836 | body = json.loads(kw['body']) |
| 2837 | self.assertEqual(len(body['builds']), 1) |
| 2838 | build = body['builds'][0] |
| 2839 | params = json.loads(build.pop('parameters_json')) |
| 2840 | self.assertEqual(params, { |
| 2841 | u'builder_name': u'win', |
| 2842 | u'changes': [{u'author': {u'email': u'owner@e.mail'}, |
| 2843 | u'revision': None}], |
| 2844 | u'properties': { |
| 2845 | u'category': u'git_cl_try', |
| 2846 | u'issue': 123, |
| 2847 | u'patch_project': u'depot_tools', |
| 2848 | u'patch_storage': u'rietveld', |
| 2849 | u'patchset': 20001, |
borenet | 6c0efe6 | 2016-10-19 08:13:29 -0700 | [diff] [blame] | 2850 | u'rietveld': u'https://codereview.chromium.org', |
| 2851 | } |
| 2852 | }) |
| 2853 | self.assertEqual(build, { |
| 2854 | u'bucket': u'test.bucket', |
| 2855 | u'client_operation_id': u'uuid4', |
| 2856 | u'tags': [u'builder:win', |
| 2857 | u'buildset:patch/rietveld/codereview.chromium.org/123/20001', |
| 2858 | u'user_agent:git_cl_try'], |
| 2859 | }) |
| 2860 | |
| 2861 | self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry) |
| 2862 | |
| 2863 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 2864 | self.assertEqual(0, git_cl.main([ |
| 2865 | 'try', '-B', 'test.bucket', '-b', 'win'])) |
| 2866 | self.assertRegexpMatches( |
| 2867 | git_cl.sys.stdout.getvalue(), |
| 2868 | 'Tried jobs on:\nBucket: test.bucket') |
tandrii | de281ae | 2016-10-12 06:02:30 -0700 | [diff] [blame] | 2869 | |
qyearsley | 123a468 | 2016-10-26 09:12:17 -0700 | [diff] [blame] | 2870 | def test_git_cl_try_bots_on_multiple_masters(self): |
| 2871 | self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001) |
| 2872 | self.calls = [ |
| 2873 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 2874 | ((['git', 'config', 'branch.feature.rietveldissue'],), '123'), |
| 2875 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 2876 | ((['git', 'config', 'rietveld.server'],), |
tandrii | 8c5a353 | 2016-11-04 07:52:02 -0700 | [diff] [blame] | 2877 | 'https://codereview.chromium.org'), |
qyearsley | 123a468 | 2016-10-26 09:12:17 -0700 | [diff] [blame] | 2878 | ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1), |
| 2879 | ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'), |
| 2880 | ] |
| 2881 | |
| 2882 | def _buildbucket_retry(*_, **kw): |
| 2883 | body = json.loads(kw['body']) |
| 2884 | self.assertEqual(len(body['builds']), 2) |
| 2885 | |
| 2886 | first_build_params = json.loads(body['builds'][0]['parameters_json']) |
| 2887 | self.assertEqual(first_build_params['builder_name'], 'builder1') |
| 2888 | self.assertEqual(first_build_params['properties']['master'], 'master1') |
| 2889 | |
| 2890 | first_build_params = json.loads(body['builds'][1]['parameters_json']) |
| 2891 | self.assertEqual(first_build_params['builder_name'], 'builder2') |
| 2892 | self.assertEqual(first_build_params['properties']['master'], 'master2') |
| 2893 | |
| 2894 | self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry) |
| 2895 | |
| 2896 | self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO( |
| 2897 | json.dumps({'builder1': ['master1'], 'builder2': ['master2']}))) |
| 2898 | |
| 2899 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 2900 | self.assertEqual( |
| 2901 | 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2'])) |
| 2902 | self.assertEqual( |
| 2903 | git_cl.sys.stdout.getvalue(), |
| 2904 | 'Tried jobs on:\n' |
| 2905 | 'Bucket: master.master1\n' |
| 2906 | ' builder1: []\n' |
| 2907 | 'Bucket: master.master2\n' |
| 2908 | ' builder2: []\n' |
| 2909 | 'To see results here, run: git cl try-results\n' |
| 2910 | 'To see results in browser, run: git cl web\n') |
| 2911 | |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2912 | def _common_GerritCommitMsgHookCheck(self): |
| 2913 | self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) |
| 2914 | self.mock(git_cl.os.path, 'abspath', |
| 2915 | lambda path: self._mocked_call(['abspath', path])) |
| 2916 | self.mock(git_cl.os.path, 'exists', |
| 2917 | lambda path: self._mocked_call(['exists', path])) |
| 2918 | self.mock(git_cl.gclient_utils, 'FileRead', |
| 2919 | lambda path: self._mocked_call(['FileRead', path])) |
| 2920 | self.mock(git_cl.gclient_utils, 'rm_file_or_tree', |
| 2921 | lambda path: self._mocked_call(['rm_file_or_tree', path])) |
| 2922 | self.calls = [ |
| 2923 | ((['git', 'rev-parse', '--show-cdup'],), '../'), |
| 2924 | ((['abspath', '../'],), '/abs/git_repo_root'), |
| 2925 | ] |
| 2926 | return git_cl.Changelist(codereview='gerrit', issue=123) |
| 2927 | |
| 2928 | def test_GerritCommitMsgHookCheck_custom_hook(self): |
| 2929 | cl = self._common_GerritCommitMsgHookCheck() |
| 2930 | self.calls += [ |
| 2931 | ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True), |
| 2932 | ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],), |
| 2933 | '#!/bin/sh\necho "custom hook"') |
| 2934 | ] |
| 2935 | cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True) |
| 2936 | |
| 2937 | def test_GerritCommitMsgHookCheck_not_exists(self): |
| 2938 | cl = self._common_GerritCommitMsgHookCheck() |
| 2939 | self.calls += [ |
| 2940 | ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False), |
| 2941 | ] |
| 2942 | cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True) |
| 2943 | |
| 2944 | def test_GerritCommitMsgHookCheck(self): |
| 2945 | cl = self._common_GerritCommitMsgHookCheck() |
| 2946 | self.calls += [ |
| 2947 | ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True), |
| 2948 | ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],), |
| 2949 | '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'), |
Andrii Shyshkalov | abc26ac | 2017-03-14 14:49:38 +0100 | [diff] [blame] | 2950 | (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'), |
tandrii | 16e0b4e | 2016-06-07 10:34:28 -0700 | [diff] [blame] | 2951 | ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],), |
| 2952 | ''), |
| 2953 | ] |
| 2954 | cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True) |
| 2955 | |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2956 | def test_GerritCmdLand(self): |
| 2957 | self.calls += [ |
| 2958 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 2959 | ((['git', 'config', 'branch.feature.gerritsquashhash'],), |
| 2960 | 'deadbeaf'), |
| 2961 | ((['git', 'diff', 'deadbeaf'],), ''), # No diff. |
| 2962 | ((['git', 'config', 'branch.feature.gerritserver'],), |
| 2963 | 'chromium-review.googlesource.com'), |
| 2964 | ] |
| 2965 | cl = git_cl.Changelist(issue=123, codereview='gerrit') |
| 2966 | cl._codereview_impl._GetChangeDetail = lambda _: { |
| 2967 | 'labels': {}, |
| 2968 | 'current_revision': 'deadbeaf', |
| 2969 | } |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2970 | cl._codereview_impl._GetChangeCommit = lambda: { |
| 2971 | 'commit': 'deadbeef', |
Aaron Gable | 02cdbb4 | 2016-12-13 16:24:25 -0800 | [diff] [blame] | 2972 | 'web_links': [{'name': 'gitiles', |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2973 | 'url': 'https://git.googlesource.com/test/+/deadbeef'}], |
| 2974 | } |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2975 | cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None |
tandrii | 8da412c | 2016-09-07 16:01:07 -0700 | [diff] [blame] | 2976 | out = StringIO.StringIO() |
| 2977 | self.mock(sys, 'stdout', out) |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2978 | self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True)) |
tandrii | 8da412c | 2016-09-07 16:01:07 -0700 | [diff] [blame] | 2979 | self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted') |
agable | 32978d9 | 2016-11-01 12:55:02 -0700 | [diff] [blame] | 2980 | self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef') |
tandrii | c4344b5 | 2016-08-29 06:04:54 -0700 | [diff] [blame] | 2981 | |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 2982 | BUILDBUCKET_BUILDS_MAP = { |
| 2983 | '9000': { |
| 2984 | 'id': '9000', |
| 2985 | 'status': 'STARTED', |
| 2986 | 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2', |
| 2987 | 'result_details_json': '{"properties": {}}', |
| 2988 | 'bucket': 'master.x.y', |
| 2989 | 'created_by': 'user:someone@chromium.org', |
| 2990 | 'created_ts': '147200002222000', |
| 2991 | 'parameters_json': '{"builder_name": "my-builder", "category": ""}', |
| 2992 | }, |
| 2993 | '8000': { |
| 2994 | 'id': '8000', |
| 2995 | 'status': 'COMPLETED', |
| 2996 | 'result': 'FAILURE', |
| 2997 | 'failure_reason': 'BUILD_FAILURE', |
| 2998 | 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1', |
| 2999 | 'result_details_json': '{"properties": {}}', |
| 3000 | 'bucket': 'master.x.y', |
| 3001 | 'created_by': 'user:someone@chromium.org', |
| 3002 | 'created_ts': '147200001111000', |
| 3003 | 'parameters_json': '{"builder_name": "my-builder", "category": ""}', |
| 3004 | }, |
| 3005 | } |
| 3006 | |
| 3007 | def test_write_try_results_json(self): |
| 3008 | expected_output = [ |
| 3009 | { |
| 3010 | 'buildbucket_id': '8000', |
| 3011 | 'bucket': 'master.x.y', |
| 3012 | 'builder_name': 'my-builder', |
| 3013 | 'status': 'COMPLETED', |
| 3014 | 'result': 'FAILURE', |
| 3015 | 'failure_reason': 'BUILD_FAILURE', |
| 3016 | 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1', |
| 3017 | }, |
| 3018 | { |
| 3019 | 'buildbucket_id': '9000', |
| 3020 | 'bucket': 'master.x.y', |
| 3021 | 'builder_name': 'my-builder', |
| 3022 | 'status': 'STARTED', |
| 3023 | 'result': None, |
| 3024 | 'failure_reason': None, |
| 3025 | 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2', |
| 3026 | } |
| 3027 | ] |
| 3028 | self.calls = [(('write_json', 'output.json', expected_output), '')] |
| 3029 | git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP) |
| 3030 | |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 3031 | def _setup_fetch_try_jobs(self, most_recent_patchset=20001): |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 3032 | out = StringIO.StringIO() |
| 3033 | self.mock(sys, 'stdout', out) |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 3034 | self.mock(git_cl.Changelist, 'GetMostRecentPatchset', |
| 3035 | lambda *args: most_recent_patchset) |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 3036 | self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg: |
| 3037 | self._mocked_call(['get_authenticator_for_host', host])) |
| 3038 | self.mock(git_cl, '_buildbucket_retry', lambda *_, **__: |
| 3039 | self._mocked_call(['_buildbucket_retry'])) |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 3040 | |
| 3041 | def _setup_fetch_try_jobs_rietveld(self, *request_results): |
| 3042 | self._setup_fetch_try_jobs(most_recent_patchset=20001) |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 3043 | self.calls += [ |
| 3044 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 3045 | ((['git', 'config', 'branch.feature.rietveldissue'],), '1'), |
| 3046 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 3047 | ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 3048 | ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'), |
| 3049 | ((['git', 'config', 'branch.feature.rietveldserver'],), |
| 3050 | 'codereview.example.com'), |
| 3051 | ((['get_authenticator_for_host', 'codereview.example.com'],), |
| 3052 | AuthenticatorMock()), |
| 3053 | ] + [((['_buildbucket_retry'],), r) for r in request_results] |
| 3054 | |
| 3055 | def test_fetch_try_jobs_none_rietveld(self): |
| 3056 | self._setup_fetch_try_jobs_rietveld({}) |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 3057 | # Simulate that user isn't logged in. |
| 3058 | self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False) |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 3059 | self.assertEqual(0, git_cl.main(['try-results'])) |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 3060 | self.assertRegexpMatches(sys.stdout.getvalue(), |
| 3061 | 'Warning: Some results might be missing') |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 3062 | self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs') |
| 3063 | |
| 3064 | def test_fetch_try_jobs_some_rietveld(self): |
| 3065 | self._setup_fetch_try_jobs_rietveld({ |
| 3066 | 'builds': self.BUILDBUCKET_BUILDS_MAP.values(), |
| 3067 | }) |
| 3068 | self.assertEqual(0, git_cl.main(['try-results'])) |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 3069 | self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:') |
| 3070 | self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:') |
| 3071 | self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs') |
| 3072 | |
| 3073 | def _setup_fetch_try_jobs_gerrit(self, *request_results): |
| 3074 | self._setup_fetch_try_jobs(most_recent_patchset=13) |
| 3075 | self.calls += [ |
| 3076 | ((['git', 'symbolic-ref', 'HEAD'],), 'feature'), |
| 3077 | ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1), |
| 3078 | ((['git', 'config', 'branch.feature.gerritissue'],), '1'), |
Ravi Mistry | fda50ca | 2016-11-14 10:19:18 -0500 | [diff] [blame] | 3079 | # TODO(tandrii): Uncomment the below if we decide to support checking |
| 3080 | # patchsets for Gerrit. |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 3081 | # Simulate that Gerrit has more patchsets than local. |
Ravi Mistry | fda50ca | 2016-11-14 10:19:18 -0500 | [diff] [blame] | 3082 | # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'), |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 3083 | ((['git', 'config', 'branch.feature.gerritserver'],), |
| 3084 | 'https://x-review.googlesource.com'), |
| 3085 | ((['get_authenticator_for_host', 'x-review.googlesource.com'],), |
| 3086 | AuthenticatorMock()), |
| 3087 | ] + [((['_buildbucket_retry'],), r) for r in request_results] |
| 3088 | |
| 3089 | def test_fetch_try_jobs_none_gerrit(self): |
| 3090 | self._setup_fetch_try_jobs_gerrit({}) |
| 3091 | self.assertEqual(0, git_cl.main(['try-results'])) |
Ravi Mistry | fda50ca | 2016-11-14 10:19:18 -0500 | [diff] [blame] | 3092 | # TODO(tandrii): Uncomment the below if we decide to support checking |
| 3093 | # patchsets for Gerrit. |
| 3094 | # self.assertRegexpMatches( |
| 3095 | # sys.stdout.getvalue(), |
| 3096 | # r'Warning: Codereview server has newer patchsets \(13\)') |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 3097 | self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs') |
| 3098 | |
| 3099 | def test_fetch_try_jobs_some_gerrit(self): |
| 3100 | self._setup_fetch_try_jobs_gerrit({ |
| 3101 | 'builds': self.BUILDBUCKET_BUILDS_MAP.values(), |
| 3102 | }) |
Ravi Mistry | fda50ca | 2016-11-14 10:19:18 -0500 | [diff] [blame] | 3103 | # TODO(tandrii): Uncomment the below if we decide to support checking |
| 3104 | # patchsets for Gerrit. |
| 3105 | # self.calls.remove( |
| 3106 | # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12')) |
tandrii | 45b2a58 | 2016-10-11 03:14:16 -0700 | [diff] [blame] | 3107 | self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5'])) |
| 3108 | |
| 3109 | # ... and doesn't result in warning. |
| 3110 | self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning') |
| 3111 | self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:') |
tandrii | 221ab25 | 2016-10-06 08:12:04 -0700 | [diff] [blame] | 3112 | self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:') |
| 3113 | self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs') |
| 3114 | |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 3115 | def _mock_gerrit_changes_for_detail_cache(self): |
| 3116 | self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host') |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 3117 | |
| 3118 | def test_gerrit_change_detail_cache_normalize(self): |
| 3119 | self._mock_gerrit_changes_for_detail_cache() |
| 3120 | self.calls = [ |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 3121 | (('GetChangeDetail', 'host', '2', ['CASE']), 'b'), |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 3122 | ] |
| 3123 | cl = git_cl.Changelist(codereview='gerrit') |
| 3124 | self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b') |
| 3125 | self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b') |
| 3126 | self.assertEqual(cl._GetChangeDetail(issue='2'), 'b') |
| 3127 | self.assertEqual(cl._GetChangeDetail(issue=2), 'b') |
| 3128 | |
| 3129 | def test_gerrit_change_detail_cache_simple(self): |
| 3130 | self._mock_gerrit_changes_for_detail_cache() |
| 3131 | self.calls = [ |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 3132 | (('GetChangeDetail', 'host', '1', []), 'a'), |
| 3133 | (('GetChangeDetail', 'host', '2', []), 'b'), |
| 3134 | (('GetChangeDetail', 'host', '2', []), 'b2'), |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 3135 | ] |
| 3136 | cl = git_cl.Changelist(issue=1, codereview='gerrit') |
| 3137 | self.assertEqual(cl._GetChangeDetail(), 'a') # Miss. |
| 3138 | self.assertEqual(cl._GetChangeDetail(), 'a') |
| 3139 | self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss. |
Andrii Shyshkalov | 1897532 | 2017-01-25 16:44:13 +0100 | [diff] [blame] | 3140 | self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss. |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 3141 | self.assertEqual(cl._GetChangeDetail(), 'a') |
| 3142 | self.assertEqual(cl._GetChangeDetail(issue=2), 'b2') |
| 3143 | |
| 3144 | def test_gerrit_change_detail_cache_options(self): |
| 3145 | self._mock_gerrit_changes_for_detail_cache() |
| 3146 | self.calls = [ |
Andrii Shyshkalov | 8fc0c1d | 2017-01-26 09:38:10 +0100 | [diff] [blame] | 3147 | (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'), |
| 3148 | (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'), |
| 3149 | (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True |
| 3150 | (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache. |
Andrii Shyshkalov | 258e0a6 | 2017-01-24 16:50:57 +0100 | [diff] [blame] | 3151 | ] |
| 3152 | cl = git_cl.Changelist(issue=1, codereview='gerrit') |
| 3153 | self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab') |
| 3154 | self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab') |
| 3155 | self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab') |
| 3156 | self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab') |
| 3157 | self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab') |
| 3158 | self.assertEqual(cl._GetChangeDetail(), 'cab') |
| 3159 | |
| 3160 | self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad') |
| 3161 | self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab') |
| 3162 | self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad') |
| 3163 | self.assertEqual(cl._GetChangeDetail(), 'cab') |
| 3164 | |
| 3165 | # Finally, no_cache should invalidate all caches for given change. |
| 3166 | self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a') |
| 3167 | self.assertEqual(cl._GetChangeDetail(options=['B']), 'b') |
| 3168 | |
Andrii Shyshkalov | 21fb824 | 2017-02-15 21:09:27 +0100 | [diff] [blame] | 3169 | def test_gerrit_description_caching(self): |
| 3170 | def gen_detail(rev, desc): |
| 3171 | return { |
| 3172 | 'current_revision': rev, |
| 3173 | 'revisions': {rev: {'commit': {'message': desc}}} |
| 3174 | } |
| 3175 | self.calls = [ |
| 3176 | (('GetChangeDetail', 'host', '1', |
| 3177 | ['CURRENT_REVISION', 'CURRENT_COMMIT']), |
| 3178 | gen_detail('rev1', 'desc1')), |
| 3179 | (('GetChangeDetail', 'host', '1', |
| 3180 | ['CURRENT_REVISION', 'CURRENT_COMMIT']), |
| 3181 | gen_detail('rev2', 'desc2')), |
| 3182 | ] |
| 3183 | |
| 3184 | self._mock_gerrit_changes_for_detail_cache() |
| 3185 | cl = git_cl.Changelist(issue=1, codereview='gerrit') |
| 3186 | self.assertEqual(cl.GetDescription(), 'desc1') |
| 3187 | self.assertEqual(cl.GetDescription(), 'desc1') # cache hit. |
| 3188 | self.assertEqual(cl.GetDescription(force=True), 'desc2') |
tandrii@chromium.org | f86c7d3 | 2016-04-01 19:27:30 +0000 | [diff] [blame] | 3189 | |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3190 | def test_print_current_creds(self): |
| 3191 | class CookiesAuthenticatorMock(object): |
| 3192 | def __init__(self): |
| 3193 | self.gitcookies = { |
| 3194 | 'host.googlesource.com': ('user', 'pass'), |
| 3195 | 'host-review.googlesource.com': ('user', 'pass'), |
| 3196 | } |
| 3197 | self.netrc = self |
| 3198 | self.netrc.hosts = { |
| 3199 | 'github.com': ('user2', None, 'pass2'), |
| 3200 | 'host2.googlesource.com': ('user3', None, 'pass'), |
| 3201 | } |
| 3202 | self.mock(git_cl.gerrit_util, 'CookiesAuthenticator', |
| 3203 | CookiesAuthenticatorMock) |
| 3204 | self.mock(sys, 'stdout', StringIO.StringIO()) |
| 3205 | git_cl._GitCookiesChecker().print_current_creds(include_netrc=True) |
| 3206 | self.assertEqual(list(sys.stdout.getvalue().splitlines()), [ |
| 3207 | ' Host\t User\t Which file', |
| 3208 | '============================\t=====\t===========', |
| 3209 | 'host-review.googlesource.com\t user\t.gitcookies', |
| 3210 | ' host.googlesource.com\t user\t.gitcookies', |
| 3211 | ' host2.googlesource.com\tuser3\t .netrc', |
| 3212 | ]) |
| 3213 | sys.stdout.buf = '' |
| 3214 | git_cl._GitCookiesChecker().print_current_creds(include_netrc=False) |
| 3215 | self.assertEqual(list(sys.stdout.getvalue().splitlines()), [ |
| 3216 | ' Host\tUser\t Which file', |
| 3217 | '============================\t====\t===========', |
| 3218 | 'host-review.googlesource.com\tuser\t.gitcookies', |
| 3219 | ' host.googlesource.com\tuser\t.gitcookies', |
| 3220 | ]) |
| 3221 | |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3222 | def _common_creds_check_mocks(self): |
| 3223 | def exists_mock(path): |
| 3224 | dirname = os.path.dirname(path) |
| 3225 | if dirname == os.path.expanduser('~'): |
| 3226 | dirname = '~' |
| 3227 | base = os.path.basename(path) |
| 3228 | if base in ('.netrc', '.gitcookies'): |
| 3229 | return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base)) |
| 3230 | # git cl also checks for existence other files not relevant to this test. |
| 3231 | return None |
| 3232 | self.mock(os.path, 'exists', exists_mock) |
| 3233 | self.mock(sys, 'stdout', StringIO.StringIO()) |
| 3234 | |
| 3235 | def test_creds_check_gitcookies_not_configured(self): |
| 3236 | self._common_creds_check_mocks() |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3237 | self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds', |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3238 | lambda _, include_netrc=False: []) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3239 | self.calls = [ |
| 3240 | ((['git', 'config', '--global', 'http.cookiefile'],), CERR1), |
| 3241 | (('os.path.exists', '~/.netrc'), True), |
| 3242 | (('ask_for_data', 'Press Enter to setup .gitcookies, ' |
| 3243 | 'or Ctrl+C to abort'), ''), |
| 3244 | ((['git', 'config', '--global', 'http.cookiefile', |
| 3245 | os.path.expanduser('~/.gitcookies')], ), ''), |
| 3246 | ] |
| 3247 | self.assertEqual(0, git_cl.main(['creds-check'])) |
| 3248 | self.assertRegexpMatches( |
| 3249 | sys.stdout.getvalue(), |
| 3250 | '^You seem to be using outdated .netrc for git credentials:') |
| 3251 | self.assertRegexpMatches( |
| 3252 | sys.stdout.getvalue(), |
| 3253 | '\nConfigured git to use .gitcookies from') |
| 3254 | |
| 3255 | def test_creds_check_gitcookies_configured_custom_broken(self): |
| 3256 | self._common_creds_check_mocks() |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3257 | self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds', |
Andrii Shyshkalov | 0a0b067 | 2017-03-16 16:27:48 +0100 | [diff] [blame] | 3258 | lambda _, include_netrc=False: []) |
Andrii Shyshkalov | 353637c | 2017-03-14 16:52:18 +0100 | [diff] [blame] | 3259 | self.calls = [ |
| 3260 | ((['git', 'config', '--global', 'http.cookiefile'],), |
| 3261 | '/custom/.gitcookies'), |
| 3262 | (('os.path.exists', '/custom/.gitcookies'), False), |
| 3263 | (('ask_for_data', 'Reconfigure git to use default .gitcookies? ' |
| 3264 | 'Press Enter to reconfigure, or Ctrl+C to abort'), ''), |
| 3265 | ((['git', 'config', '--global', 'http.cookiefile', |
| 3266 | os.path.expanduser('~/.gitcookies')], ), ''), |
| 3267 | ] |
| 3268 | self.assertEqual(0, git_cl.main(['creds-check'])) |
| 3269 | self.assertRegexpMatches( |
| 3270 | sys.stdout.getvalue(), |
| 3271 | 'WARNING: you have configured custom path to .gitcookies: ') |
| 3272 | self.assertRegexpMatches( |
| 3273 | sys.stdout.getvalue(), |
| 3274 | 'However, your configured .gitcookies file is missing.') |
| 3275 | |
Andrii Shyshkalov | 0d6b46e | 2017-03-17 22:23:22 +0100 | [diff] [blame] | 3276 | def test_git_cl_comment_add_rietveld(self): |
Andrii Shyshkalov | 625986d | 2017-03-16 00:24:37 +0100 | [diff] [blame] | 3277 | self.mock(git_cl._RietveldChangelistImpl, 'AddComment', |
| 3278 | lambda _, message: self._mocked_call('AddComment', message)) |
| 3279 | self.calls = [ |
| 3280 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 3281 | ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'), |
| 3282 | (('AddComment', 'msg'), ''), |
| 3283 | ] |
Andrii Shyshkalov | 0d6b46e | 2017-03-17 22:23:22 +0100 | [diff] [blame] | 3284 | self.assertEqual(0, git_cl.main(['comment', '--rietveld', |
| 3285 | '-i', '10', '-a', 'msg'])) |
Andrii Shyshkalov | 625986d | 2017-03-16 00:24:37 +0100 | [diff] [blame] | 3286 | |
| 3287 | def test_git_cl_comment_add_gerrit(self): |
| 3288 | self.mock(git_cl.gerrit_util, 'SetReview', |
| 3289 | lambda host, change, msg: |
| 3290 | self._mocked_call('SetReview', host, change, msg)) |
| 3291 | self.calls = [ |
| 3292 | ((['git', 'symbolic-ref', 'HEAD'],), CERR1), |
| 3293 | ((['git', 'symbolic-ref', 'HEAD'],), CERR1), |
| 3294 | ((['git', 'config', 'rietveld.upstream-branch'],), CERR1), |
| 3295 | ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n' |
| 3296 | 'origin/master'), |
| 3297 | ((['git', 'config', 'remote.origin.url'],), |
| 3298 | 'https://chromium.googlesource.com/infra/infra'), |
| 3299 | (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None), |
| 3300 | ] |
| 3301 | self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10', |
| 3302 | '-a', 'msg'])) |
| 3303 | |
Andrii Shyshkalov | d8aa49f | 2017-03-17 16:05:49 +0100 | [diff] [blame] | 3304 | def test_git_cl_comments_fetch_rietveld(self): |
| 3305 | self.mock(sys, 'stdout', StringIO.StringIO()) |
| 3306 | self.calls = [ |
| 3307 | ((['git', 'config', 'rietveld.autoupdate'],), CERR1), |
| 3308 | ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'), |
| 3309 | ] * 2 |
| 3310 | self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: { |
| 3311 | 'messages': [ |
| 3312 | {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270', |
| 3313 | 'disapproval': False, 'approval': True, 'sender': 'r@example.com'}, |
| 3314 | {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270', |
| 3315 | 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'}, |
| 3316 | # Intentionally wrong order here. |
| 3317 | {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270', |
| 3318 | 'disapproval': False, 'approval': False, |
| 3319 | 'sender': 'owner@example.com'}, |
| 3320 | ], |
| 3321 | 'owner_email': 'owner@example.com', |
| 3322 | }) |
| 3323 | expected_comments_summary = [ |
| 3324 | git_cl._CommentSummary( |
| 3325 | message='lgtm', |
| 3326 | date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270), |
| 3327 | disapproval=False, approval=True, sender='r@example.com'), |
| 3328 | git_cl._CommentSummary( |
| 3329 | message='not lgtm', |
| 3330 | date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270), |
| 3331 | disapproval=True, approval=False, sender='r2@example.com'), |
| 3332 | # Note: same order as in whatever Rietveld returns. |
| 3333 | git_cl._CommentSummary( |
| 3334 | message='PTAL', |
| 3335 | date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270), |
| 3336 | disapproval=False, approval=False, sender='owner@example.com'), |
| 3337 | ] |
| 3338 | cl = git_cl.Changelist(codereview='rietveld', issue=1) |
| 3339 | self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary) |
| 3340 | |
| 3341 | with git_cl.gclient_utils.temporary_directory() as tempdir: |
| 3342 | out_file = os.path.abspath(os.path.join(tempdir, 'out.json')) |
| 3343 | self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10', |
| 3344 | '-j', out_file])) |
| 3345 | with open(out_file) as f: |
| 3346 | read = json.load(f) |
| 3347 | self.assertEqual(len(read), 3) |
| 3348 | self.assertEqual(read[0], { |
| 3349 | 'date': '2000-03-13 20:49:34.515270', |
| 3350 | 'message': 'PTAL', |
| 3351 | 'approval': False, |
| 3352 | 'disapproval': False, |
| 3353 | 'sender': 'owner@example.com'}) |
| 3354 | self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270') |
| 3355 | self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270') |
| 3356 | |
Andrii Shyshkalov | 5a0cf20 | 2017-03-17 16:14:59 +0100 | [diff] [blame] | 3357 | def test_git_cl_comments_fetch_gerrit(self): |
| 3358 | self.mock(sys, 'stdout', StringIO.StringIO()) |
| 3359 | self.calls = [ |
| 3360 | ((['git', 'symbolic-ref', 'HEAD'],), CERR1), |
| 3361 | ((['git', 'symbolic-ref', 'HEAD'],), CERR1), |
| 3362 | ((['git', 'config', 'rietveld.upstream-branch'],), CERR1), |
| 3363 | ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n' |
| 3364 | 'origin/master'), |
| 3365 | ((['git', 'config', 'remote.origin.url'],), |
| 3366 | 'https://chromium.googlesource.com/infra/infra'), |
| 3367 | (('GetChangeDetail', 'chromium-review.googlesource.com', '1', |
| 3368 | ['MESSAGES', 'DETAILED_ACCOUNTS']), { |
| 3369 | 'owner': {'email': 'owner@example.com'}, |
| 3370 | 'messages': [ |
| 3371 | { |
| 3372 | u'_revision_number': 1, |
| 3373 | u'author': { |
| 3374 | u'_account_id': 1111084, |
| 3375 | u'email': u'commit-bot@chromium.org', |
| 3376 | u'name': u'Commit Bot' |
| 3377 | }, |
| 3378 | u'date': u'2017-03-15 20:08:45.000000000', |
| 3379 | u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b', |
| 3380 | u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...', |
| 3381 | u'tag': u'autogenerated:cq:dry-run' |
| 3382 | }, |
| 3383 | { |
| 3384 | u'_revision_number': 2, |
| 3385 | u'author': { |
| 3386 | u'_account_id': 11151243, |
| 3387 | u'email': u'owner@example.com', |
| 3388 | u'name': u'owner' |
| 3389 | }, |
| 3390 | u'date': u'2017-03-16 20:00:41.000000000', |
| 3391 | u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234', |
| 3392 | u'message': u'PTAL', |
| 3393 | }, |
| 3394 | { |
| 3395 | u'_revision_number': 2, |
| 3396 | u'author': { |
| 3397 | u'_account_id': 148512 , |
| 3398 | u'email': u'reviewer@example.com', |
| 3399 | u'name': u'reviewer' |
| 3400 | }, |
| 3401 | u'date': u'2017-03-17 05:19:37.500000000', |
| 3402 | u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568', |
| 3403 | u'message': u'Patch Set 2: Code-Review+1', |
| 3404 | }, |
| 3405 | ] |
| 3406 | }) |
| 3407 | ] * 2 |
| 3408 | expected_comments_summary = [ |
| 3409 | git_cl._CommentSummary( |
| 3410 | message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...', |
| 3411 | date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0), |
| 3412 | disapproval=False, approval=False, sender=u'commit-bot@chromium.org'), |
| 3413 | git_cl._CommentSummary( |
| 3414 | message=u'PTAL', |
| 3415 | date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0), |
| 3416 | disapproval=False, approval=False, sender=u'owner@example.com'), |
| 3417 | git_cl._CommentSummary( |
| 3418 | message=u'Patch Set 2: Code-Review+1', |
| 3419 | date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000), |
| 3420 | disapproval=False, approval=False, sender=u'reviewer@example.com'), |
| 3421 | ] |
| 3422 | cl = git_cl.Changelist(codereview='gerrit', issue=1) |
| 3423 | self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary) |
| 3424 | |
| 3425 | with git_cl.gclient_utils.temporary_directory() as tempdir: |
| 3426 | out_file = os.path.abspath(os.path.join(tempdir, 'out.json')) |
| 3427 | self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1', |
| 3428 | '-j', out_file])) |
| 3429 | with open(out_file) as f: |
| 3430 | read = json.load(f) |
| 3431 | self.assertEqual(len(read), 3) |
| 3432 | self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000') |
| 3433 | self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000') |
| 3434 | self.assertEqual(read[2], { |
| 3435 | u'date': u'2017-03-17 05:19:37.500000', |
| 3436 | u'message': u'Patch Set 2: Code-Review+1', |
| 3437 | u'approval': False, |
| 3438 | u'disapproval': False, |
| 3439 | u'sender': u'reviewer@example.com'}) |
Andrii Shyshkalov | 34924cd | 2017-03-15 17:08:32 +0100 | [diff] [blame] | 3440 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 3441 | if __name__ == '__main__': |
Andrii Shyshkalov | 18df0cd | 2017-01-25 15:22:20 +0100 | [diff] [blame] | 3442 | logging.basicConfig( |
| 3443 | level=logging.DEBUG if '-v' in sys.argv else logging.ERROR) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 3444 | unittest.main() |