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