blob: 7401195d6548c61cb98e7541723e2ac5bc9e1d1d [file] [log] [blame]
maruel@chromium.orgddd59412011-11-30 14:20:38 +00001#!/usr/bin/env python
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +00002# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003# 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 Shyshkalovcd6a9362016-12-07 12:04:12 +01008import contextlib
tandriide281ae2016-10-12 06:02:30 -07009import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010010import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000011import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000012import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000013import sys
14import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000015import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000016
17sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
18
19from testing_support.auto_stub import TestCase
20
21import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000022import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000023import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000024import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025
tandrii5d48c322016-08-18 16:19:37 -070026def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
27 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
28
29
30CERR1 = callError(1)
31
32
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000033class ChangelistMock(object):
34 # A class variable so we can access it when we don't have access to the
35 # instance that's being set.
36 desc = ""
37 def __init__(self, **kwargs):
38 pass
39 def GetIssue(self):
40 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080041 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000042 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070043 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000044 ChangelistMock.desc = desc
45
tandrii5d48c322016-08-18 16:19:37 -070046
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000047class PresubmitMock(object):
48 def __init__(self, *args, **kwargs):
49 self.reviewers = []
50 @staticmethod
51 def should_continue():
52 return True
53
54
55class RietveldMock(object):
56 def __init__(self, *args, **kwargs):
57 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000058
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000059 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080060 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000061 return 'Issue: %d' % issue
62
maruel@chromium.org78936cb2013-04-11 00:17:52 +000063 @staticmethod
64 def get_issue_properties(_issue, _messages):
65 return {
66 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
67 'messages': [
68 {
69 'approval': True,
70 'sender': 'john@chromium.org',
71 },
72 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010073 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000074 }
75
iannuccie53c9352016-08-17 14:40:40 -070076 @staticmethod
77 def close_issue(_issue):
78 return 'Closed'
79
skobes6468b902016-10-24 08:45:10 -070080 @staticmethod
81 def get_patch(issue, patchset):
82 return 'patch set from issue %s patchset %s' % (issue, patchset)
83
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010084 @staticmethod
85 def update_description(_issue, _description):
86 return 'Updated'
87
88 @staticmethod
89 def add_comment(_issue, _comment):
90 return 'Commented'
91
92
93
skobes6468b902016-10-24 08:45:10 -070094
95class GitCheckoutMock(object):
96 def __init__(self, *args, **kwargs):
97 pass
98
99 @staticmethod
100 def reset():
101 GitCheckoutMock.conflict = False
102
103 def apply_patch(self, p):
104 if GitCheckoutMock.conflict:
105 raise Exception('failed')
106
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000107
108class WatchlistsMock(object):
109 def __init__(self, _):
110 pass
111 @staticmethod
112 def GetWatchersForPaths(_):
113 return ['joe@example.com']
114
115
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000116class CodereviewSettingsFileMock(object):
117 def __init__(self):
118 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800119 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000120 def read(self):
121 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000122 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000123
124
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000125class AuthenticatorMock(object):
126 def __init__(self, *_args):
127 pass
128 def has_cached_credentials(self):
129 return True
tandrii221ab252016-10-06 08:12:04 -0700130 def authorize(self, http):
131 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000132
133
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000134def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_cookie=False):
135 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
136
137 Usage:
138 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
139 CookiesAuthenticatorMockFactory({'host1': 'cookie1'}))
140
141 OR
142 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
143 CookiesAuthenticatorMockFactory(cookie='cookie'))
144 """
145 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800146 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000147 # Intentionally not calling super() because it reads actual cookie files.
148 pass
149 @classmethod
150 def get_gitcookies_path(cls):
151 return '~/.gitcookies'
152 @classmethod
153 def get_netrc_path(cls):
154 return '~/.netrc'
155 def get_auth_header(self, host):
156 if same_cookie:
157 return same_cookie
158 return (hosts_with_creds or {}).get(host)
159 return CookiesAuthenticatorMock
160
kmarshall9249e012016-08-23 12:02:16 -0700161class MockChangelistWithBranchAndIssue():
162 def __init__(self, branch, issue):
163 self.branch = branch
164 self.issue = issue
165 def GetBranch(self):
166 return self.branch
167 def GetIssue(self):
168 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000169
tandriic2405f52016-10-10 08:13:15 -0700170
171class SystemExitMock(Exception):
172 pass
173
174
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000175class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100176 def test_get_description(self):
177 cl = git_cl.Changelist(issue=1, codereview='rietveld',
178 codereview_host='host')
179 cl.description = 'x'
180 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800181 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100182 self.assertEquals(cl.GetDescription(), 'x')
183 self.assertEquals(cl.GetDescription(force=True), 'y')
184 self.assertEquals(cl.GetDescription(), 'y')
185
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000186 def _test_ParseIssueUrl(self, func, url, issue, patchset, hostname, fail):
187 parsed = urlparse.urlparse(url)
188 result = func(parsed)
189 if fail:
190 self.assertIsNone(result)
191 return None
192 self.assertIsNotNone(result)
193 self.assertEqual(result.issue, issue)
194 self.assertEqual(result.patchset, patchset)
195 self.assertEqual(result.hostname, hostname)
196 return result
197
198 def test_ParseIssueURL_rietveld(self):
skobes6468b902016-10-24 08:45:10 -0700199 def test(url, issue=None, patchset=None, hostname=None, fail=None):
200 self._test_ParseIssueUrl(
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000201 git_cl._RietveldChangelistImpl.ParseIssueURL,
202 url, issue, patchset, hostname, fail)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000203
204 test('http://codereview.chromium.org/123',
205 123, None, 'codereview.chromium.org')
206 test('https://codereview.chromium.org/123',
207 123, None, 'codereview.chromium.org')
208 test('https://codereview.chromium.org/123/',
209 123, None, 'codereview.chromium.org')
210 test('https://codereview.chromium.org/123/whatever',
211 123, None, 'codereview.chromium.org')
wychen3c1c1722016-08-04 11:46:36 -0700212 test('https://codereview.chromium.org/123/#ps20001',
213 123, 20001, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000214 test('http://codereview.chromium.org/download/issue123_4.diff',
skobes6468b902016-10-24 08:45:10 -0700215 123, 4, 'codereview.chromium.org')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000216 # This looks like bad Gerrit, but is actually valid Rietveld.
217 test('https://chrome-review.source.com/123/4/',
218 123, None, 'chrome-review.source.com')
219
220 test('https://codereview.chromium.org/deadbeaf', fail=True)
221 test('https://codereview.chromium.org/api/123', fail=True)
222 test('bad://codereview.chromium.org/123', fail=True)
223 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
224
225 def test_ParseIssueURL_gerrit(self):
226 def test(url, issue=None, patchset=None, hostname=None, fail=None):
227 self._test_ParseIssueUrl(
228 git_cl._GerritChangelistImpl.ParseIssueURL,
229 url, issue, patchset, hostname, fail)
230
231 test('http://chrome-review.source.com/c/123',
232 123, None, 'chrome-review.source.com')
233 test('https://chrome-review.source.com/c/123/',
234 123, None, 'chrome-review.source.com')
235 test('https://chrome-review.source.com/c/123/4',
236 123, 4, 'chrome-review.source.com')
237 test('https://chrome-review.source.com/#/c/123/4',
238 123, 4, 'chrome-review.source.com')
239 test('https://chrome-review.source.com/c/123/4',
240 123, 4, 'chrome-review.source.com')
241 test('https://chrome-review.source.com/123',
242 123, None, 'chrome-review.source.com')
243 test('https://chrome-review.source.com/123/4',
244 123, 4, 'chrome-review.source.com')
245
246 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
247 test('https://chrome-review.source.com/c/abc/', fail=True)
248 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
249
250 def test_ParseIssueNumberArgument(self):
251 def test(arg, issue=None, patchset=None, hostname=None, fail=False):
252 result = git_cl.ParseIssueNumberArgument(arg)
253 self.assertIsNotNone(result)
254 if fail:
255 self.assertFalse(result.valid)
256 else:
257 self.assertEqual(result.issue, issue)
258 self.assertEqual(result.patchset, patchset)
259 self.assertEqual(result.hostname, hostname)
260
261 test('123', 123)
262 test('', fail=True)
263 test('abc', fail=True)
264 test('123/1', fail=True)
265 test('123a', fail=True)
266 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
267 # Rietveld.
268 test('https://codereview.source.com/123',
269 123, None, 'codereview.source.com')
270 test('https://codereview.source.com/www123', fail=True)
271 # Gerrrit.
272 test('https://chrome-review.source.com/c/123/4',
273 123, 4, 'chrome-review.source.com')
274 test('https://chrome-review.source.com/bad/123/4', fail=True)
275
tandriif9aefb72016-07-01 09:06:51 -0700276 def test_get_bug_line_values(self):
277 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
278 self.assertEqual(f('', ''), [])
279 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
280 self.assertEqual(f('v8', '456'), ['v8:456'])
281 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
282 # Not nice, but not worth carying.
283 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
284 ['v8:456', 'chromium:123', 'v8:123'])
285
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100286 def _test_git_number(self, parent_msg, dest_ref, child_msg,
287 parent_hash='parenthash'):
288 desc = git_cl.ChangeDescription(child_msg)
289 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
290 return desc.description
291
292 def assertEqualByLine(self, actual, expected):
293 self.assertEqual(actual.splitlines(), expected.splitlines())
294
295 def test_git_number_bad_parent(self):
296 with self.assertRaises(ValueError):
297 self._test_git_number('Parent', 'refs/heads/master', 'Child')
298
299 def test_git_number_bad_parent_footer(self):
300 with self.assertRaises(AssertionError):
301 self._test_git_number(
302 'Parent\n'
303 '\n'
304 'Cr-Commit-Position: wrong',
305 'refs/heads/master', 'Child')
306
307 def test_git_number_bad_lineage_ignored(self):
308 actual = self._test_git_number(
309 'Parent\n'
310 '\n'
311 'Cr-Commit-Position: refs/heads/master@{#1}\n'
312 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
313 'refs/heads/master', 'Child')
314 self.assertEqualByLine(
315 actual,
316 'Child\n'
317 '\n'
318 'Cr-Commit-Position: refs/heads/master@{#2}\n'
319 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
320
321 def test_git_number_same_branch(self):
322 actual = self._test_git_number(
323 'Parent\n'
324 '\n'
325 'Cr-Commit-Position: refs/heads/master@{#12}',
326 dest_ref='refs/heads/master',
327 child_msg='Child')
328 self.assertEqualByLine(
329 actual,
330 'Child\n'
331 '\n'
332 'Cr-Commit-Position: refs/heads/master@{#13}')
333
334 def test_git_number_same_branch_with_originals(self):
335 actual = self._test_git_number(
336 'Parent\n'
337 '\n'
338 'Cr-Commit-Position: refs/heads/master@{#12}',
339 dest_ref='refs/heads/master',
340 child_msg='Child\n'
341 '\n'
342 'Some users are smart and insert their own footers\n'
343 '\n'
344 'Cr-Whatever: value\n'
345 'Cr-Commit-Position: refs/copy/paste@{#22}')
346 self.assertEqualByLine(
347 actual,
348 'Child\n'
349 '\n'
350 'Some users are smart and insert their own footers\n'
351 '\n'
352 'Cr-Original-Whatever: value\n'
353 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
354 'Cr-Commit-Position: refs/heads/master@{#13}')
355
356 def test_git_number_new_branch(self):
357 actual = self._test_git_number(
358 'Parent\n'
359 '\n'
360 'Cr-Commit-Position: refs/heads/master@{#12}',
361 dest_ref='refs/heads/branch',
362 child_msg='Child')
363 self.assertEqualByLine(
364 actual,
365 'Child\n'
366 '\n'
367 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
368 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
369
370 def test_git_number_lineage(self):
371 actual = self._test_git_number(
372 'Parent\n'
373 '\n'
374 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
375 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
376 dest_ref='refs/heads/branch',
377 child_msg='Child')
378 self.assertEqualByLine(
379 actual,
380 'Child\n'
381 '\n'
382 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
383 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
384
385 def test_git_number_moooooooore_lineage(self):
386 actual = self._test_git_number(
387 'Parent\n'
388 '\n'
389 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
390 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
391 dest_ref='refs/heads/mooore',
392 child_msg='Child')
393 self.assertEqualByLine(
394 actual,
395 'Child\n'
396 '\n'
397 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
398 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
399 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
400
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100401 def test_git_number_ever_moooooooore_lineage(self):
402 self.maxDiff = 10000
403 actual = self._test_git_number(
404 'CQ commit on fresh new branch + numbering.\n'
405 '\n'
406 'NOTRY=True\n'
407 'NOPRESUBMIT=True\n'
408 'BUG=\n'
409 '\n'
410 'Review-Url: https://codereview.chromium.org/2577703003\n'
411 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
412 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
413 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
414 dest_ref='refs/heads/gnumb-test/cl',
415 child_msg='git cl on fresh new branch + numbering.\n'
416 '\n'
417 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
418 self.assertEqualByLine(
419 actual,
420 'git cl on fresh new branch + numbering.\n'
421 '\n'
422 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
423 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
424 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
425 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
426 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100427
428 def test_git_number_cherry_pick(self):
429 actual = self._test_git_number(
430 'Parent\n'
431 '\n'
432 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
433 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
434 dest_ref='refs/heads/branch',
435 child_msg='Child, which is cherry-pick from master\n'
436 '\n'
437 'Cr-Commit-Position: refs/heads/master@{#100}\n'
438 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
439 self.assertEqualByLine(
440 actual,
441 'Child, which is cherry-pick from master\n'
442 '\n'
443 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
444 '\n'
445 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
446 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
447 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
448
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000449
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000450class TestGitCl(TestCase):
451 def setUp(self):
452 super(TestGitCl, self).setUp()
453 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700454 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000455 self.mock(subprocess2, 'call', self._mocked_call)
456 self.mock(subprocess2, 'check_call', self._mocked_call)
457 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700458 self.mock(subprocess2, 'communicate',
459 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000460 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000461 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000462 self.mock(git_common, 'get_or_create_merge_base',
463 lambda *a: (
464 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000465 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000466 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000467 self.mock(git_cl, 'ask_for_data', self._mocked_call)
phajdan.jre328cf92016-08-22 04:12:17 -0700468 self.mock(git_cl, 'write_json', lambda path, contents:
469 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000470 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000471 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000472 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700473 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
474 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000475 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000476 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000477 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100478 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
479 lambda *args, **kwargs: self._mocked_call(
480 'GetChangeDetail', *args, **kwargs))
481 self.mock(git_cl.gerrit_util, 'AddReviewers',
482 lambda h, i, add, is_reviewer, notify: self._mocked_call(
483 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000484 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
485 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700486 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100487 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000488 # It's important to reset settings to not have inter-tests interference.
489 git_cl.settings = None
490
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000491
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000492 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000493 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100494 self.assertEquals([], self.calls)
495 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000496 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100497 raise
498 # Sadly, has_failed() returns True if this OR any other tests before this
499 # one have failed.
500 git_cl.logging.exception(
501 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
502 'There are un-consumed self.calls after this test has finished.\n'
503 'If you don\'t know which test this is, run:\n'
Mark Mentovai57c47212017-03-09 11:14:09 -0500504 ' tests/git_cl_test.py -v\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100505 '\n'
506 'If you are already running just this single test, then **first** '
507 'fix the problem whose exception is emitted below by unittest '
508 'runner.\n'
509 '\n'
510 'Else, to be sure what\'s going on, run this test **alone** with \n'
Mark Mentovai57c47212017-03-09 11:14:09 -0500511 ' tests/git_cl_test.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100512 'and follow instructions above.\n' +
513 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000514 finally:
515 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000516
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000517 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000518 self.assertTrue(
519 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700520 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000521 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000522 expected_args, result = top
523
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000524 # Also logs otherwise it could get caught in a try/finally and be hard to
525 # diagnose.
526 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700527 N = 5
528 prior_calls = '\n '.join(
529 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
530 for i, c in enumerate(self._calls_done[-N:]))
531 following_calls = '\n '.join(
532 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
533 for i, c in enumerate(self.calls[:N]))
534 extended_msg = (
535 'A few prior calls:\n %s\n\n'
536 'This (expected):\n @%d: %r\n'
537 'This (actual):\n @%d: %r\n\n'
538 'A few following expected calls:\n %s' %
539 (prior_calls, len(self._calls_done), expected_args,
540 len(self._calls_done), args, following_calls))
541 git_cl.logging.error(extended_msg)
542
tandrii99a72f22016-08-17 14:33:24 -0700543 self.fail('@%d\n'
544 ' Expected: %r\n'
545 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700546 len(self._calls_done), expected_args, args))
547
548 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700549 if isinstance(result, Exception):
550 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000551 return result
552
tandrii48df5812016-10-17 03:55:37 -0700553 def test_LoadCodereviewSettingsFromFile_gerrit(self):
554 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
555 self.calls = [
556 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
557 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
558 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
559 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
Mark Mentovai57c47212017-03-09 11:14:09 -0500560 ((['git', 'config', '--unset-all', 'rietveld.bug-line-format'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700561 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
562 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700563 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
564 CERR1),
565 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700566 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
567 CERR1),
568 ((['git', 'config', 'gerrit.host', 'true'],), ''),
569 ]
570 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
571
maruel@chromium.orga3353652011-11-30 14:26:57 +0000572 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000573 def _is_gerrit_calls(cls, gerrit=False):
574 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
575 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
576
577 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000578 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000579 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000580 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000581
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000582 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000583 def _upload_no_rev_calls(cls, similarity, find_copies):
584 return (cls._git_base_calls(similarity, find_copies) +
585 cls._git_upload_no_rev_calls())
586
587 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000588 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000589 if similarity is None:
590 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700591 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700592 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000593 else:
tandrii33a46ff2016-08-23 05:53:40 -0700594 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700595 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000596
597 if find_copies is None:
598 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700599 find_copies_call = ((['git', 'config', '--bool',
600 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000601 else:
tandrii5d48c322016-08-18 16:19:37 -0700602 val = str(find_copies).lower()
603 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000604 'branch.master.git-find-copies', val],), '')
605
606 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000607 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800608 '-l100000', '-C'+similarity,
609 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000610 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000611 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000612 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000613
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000614 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000615 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000616 similarity_call,
617 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
618 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000619 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000620 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700621 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
622 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000623 ((['git', 'config', 'rietveld.server'],),
624 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000625 ((['git', 'config', 'branch.master.merge'],), 'master'),
626 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000627 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000628 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000629 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000630 ((['git', 'rev-parse', '--show-cdup'],), ''),
631 ((['git', 'rev-parse', 'HEAD'],), '12345'),
632 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000633 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000634 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700635 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000636 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000637 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000638 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000639 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000640 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000641 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000642 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000643 'desc\n'),
Mark Mentovai57c47212017-03-09 11:14:09 -0500644 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
645 ((['git', 'config', 'rietveld.bug-line-format'],), CERR1),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000646 ]
647
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000648 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000649 def _git_upload_no_rev_calls(cls):
650 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000651 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000652 ]
653
654 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000655 def _git_upload_calls(cls, private):
656 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000657 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000658 private_call = []
659 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000660 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000661 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000662 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000663
maruel@chromium.orga3353652011-11-30 14:26:57 +0000664 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000665 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000666 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000667 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800668 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000669 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700670 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000671 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000672 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000673 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700674 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000675 ] + cls._git_post_upload_calls()
676
677 @classmethod
678 def _git_post_upload_calls(cls):
679 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000680 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
681 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
682 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000683 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000684 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000685 ]
686
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000687 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000688 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000689 fake_ancestor = 'fake_ancestor'
690 fake_cl = 'fake_cl_for_patch'
691 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000692 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000693 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000694 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000695 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000696 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000697 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000698 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000699 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700700 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000701 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000702 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000703 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000704 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000705 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000706 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000707 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000708 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000709 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000710 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000711 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000712
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000713 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700714 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000715 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000716 return [
717 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000718 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000719 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000720 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700721 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000722 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000723 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100724 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000725 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000726 ]
727
728 def _run_reviewer_test(
729 self,
730 upload_args,
731 expected_description,
732 returned_description,
733 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000734 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700735 private=False,
736 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000737 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000738 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000739 try:
740 similarity = upload_args[upload_args.index('--similarity')+1]
741 except ValueError:
742 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000743
744 if '--find-copies' in upload_args:
745 find_copies = True
746 elif '--no-find-copies' in upload_args:
747 find_copies = False
748 else:
749 find_copies = None
750
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000751 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700752 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000753
754 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000755
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000756 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000757 self.assertEquals(
758 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000759 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000760 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000761 '#--------------------This line is 72 characters long'
762 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000763 expected_description,
764 desc)
765 return returned_description
766 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000767
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000768 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000769 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700770 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000771 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000772 return 1, 2
773 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000774
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000775 git_cl.main(['upload'] + upload_args)
776
777 def test_no_reviewer(self):
778 self._run_reviewer_test(
779 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000780 'desc\n\nBUG=',
781 '# Blah blah comment.\ndesc\n\nBUG=',
782 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000783 [])
784
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000785 def test_keep_similarity(self):
786 self._run_reviewer_test(
787 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000788 'desc\n\nBUG=',
789 '# Blah blah comment.\ndesc\n\nBUG=',
790 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000791 [])
792
iannucci@chromium.org79540052012-10-19 23:15:26 +0000793 def test_keep_find_copies(self):
794 self._run_reviewer_test(
795 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000796 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000797 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000798 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000799 [])
800
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000801 def test_private(self):
802 self._run_reviewer_test(
803 ['--private'],
804 'desc\n\nBUG=',
805 '# Blah blah comment.\ndesc\n\nBUG=\n',
806 'desc\n\nBUG=',
807 [])
808
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000809 def test_reviewers_cmd_line(self):
810 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000811 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000812 self._run_reviewer_test(
813 ['-r' 'foo@example.com'],
814 description,
815 '\n%s\n' % description,
816 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000817 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000818
819 def test_reviewer_tbr_overriden(self):
820 # Reviewer is overriden with TBR
821 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000822 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000823 self._run_reviewer_test(
824 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000825 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000826 description.strip('\n'),
827 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000828 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000829
830 def test_reviewer_multiple(self):
831 # Handles multiple R= or TBR= lines.
832 description = (
bradnelsond975b302016-10-23 12:20:23 -0700833 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
834 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000835 self._run_reviewer_test(
836 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000837 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000838 description,
839 description,
bradnelsond975b302016-10-23 12:20:23 -0700840 ['--reviewers=another@example.com,reviewer@example.com'],
841 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000842
maruel@chromium.orga3353652011-11-30 14:26:57 +0000843 def test_reviewer_send_mail(self):
844 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000845 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000846 self._run_reviewer_test(
847 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000848 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000849 description.strip('\n'),
850 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000851 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000852
853 def test_reviewer_send_mail_no_rev(self):
854 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000855 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700856 self.calls = self._upload_no_rev_calls(None, None) + [
857 ((['DieWithError', 'Must specify reviewers to send email.'],),
858 SystemExitMock())
859 ]
860
861 def RunEditor(desc, _, **kwargs):
862 return desc
863 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
864 self.mock(sys, 'stdout', stdout)
865 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000866 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700867 self.assertEqual(
868 'Using 50% similarity for rename/copy detection. Override with '
869 '--similarity.\n',
870 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000871
tandriif9aefb72016-07-01 09:06:51 -0700872 def test_bug_on_cmd(self):
873 self._run_reviewer_test(
874 ['--bug=500658,proj:123'],
875 'desc\n\nBUG=500658\nBUG=proj:123',
876 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
877 'desc\n\nBUG=500658\nBUG=proj:1234',
878 [])
879
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100880 def _land_rietveld_common(self, debug=False):
881 if debug:
882 # Very useful due to finally clause in git cl land raising exceptions and
883 # shadowing real cause of failure.
884 self.mock(git_cl, '_IS_BEING_TESTED', True)
885 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100886 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100887
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100888 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
889 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100890 self.mock(RietveldMock, 'update_description', staticmethod(
891 lambda i, d: self._mocked_call(['update_description', i, d])))
892 self.mock(RietveldMock, 'add_comment', staticmethod(
893 lambda i, c: self._mocked_call(['add_comment', i, c])))
894 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100895 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
896 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
897 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
898 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
899 CERR1),
900 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
901 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800902 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100903 ((['git', 'config', 'rietveld.server'],),
904 'https://codereview.chromium.org'),
905 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
906 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
907 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
908 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100909 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
910 ''), # No commits to rebase, according to local view of origin.
911 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
912 'fake_ancestor_sha'),
913 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
914 ((['git', 'rev-parse', '--show-cdup'],), ''),
915 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
916 ((['git', 'diff', '--name-status', '--no-renames', '-r',
917 'fake_ancestor_sha...', '.'],),
918 'M\tfile1.cpp'),
919 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
920 ((['git', 'config', 'branch.feature.rietveldserver'],),
921 'https://codereview.chromium.org'),
922 ((['git', 'config', 'user.email'],), 'user@e.mail'),
923 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
924 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
925 'fake_ancestor_sha', 'feature'],),
926 # This command just prints smth like this:
927 # file1.cpp | 53 ++++++--
928 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
929 ''),
930 ((['git', 'show-ref', '--quiet', '--verify',
931 'refs/heads/git-cl-commit'],),
932 ''), # 0 return code means branch exists.
933 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
934 ((['git', 'show-ref', '--quiet', '--verify',
935 'refs/heads/git-cl-cherry-pick'],),
936 CERR1), # This means git-cl-cherry-pick branch does not exist.
937 ((['git', 'rev-parse', '--show-cdup'],), ''),
938 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
939 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
940 ((['git', 'commit', '-m',
941 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +0100942 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100943 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
944 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
945 ((['git', 'config', '--get', 'remote.origin.url'],),
946 'https://chromium.googlesource.com/infra/infra'),
947 ]
948
949 def test_land_rietveld(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100950 self._land_rietveld_common(debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100951 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100952 ((['git', 'config', 'remote.origin.url'],),
953 'https://chromium.googlesource.com/infra/infra'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100954 (('_is_git_numberer_enabled',
955 'https://chromium.googlesource.com/infra/infra',
956 'refs/heads/master'),
957 False),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +0100958 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
959 ''),
960 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
961 ((['git', 'checkout', '-q', 'feature'],), ''),
962 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
963 ((['git', 'config', 'rietveld.viewvc-url'],),
964 'https://chromium.googlesource.com/infra/infra/+/'),
965 ((['update_description', 123,
966 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
967 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
968 ''),
969 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
970 'fake_sha_rebased (presubmit successful).'],), ''),
971 ]
972 git_cl.main(['land'])
973
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100974 def test_land_rietveld_git_numberer(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100975 self._land_rietveld_common(debug=False)
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100976
977 # Special mocks to check validity of timestamp.
978 original_git_amend_head = git_cl._git_amend_head
979 def _git_amend_head_mock(msg, tstamp):
980 self._mocked_call(['git_amend_head committer timestamp', tstamp])
981 return original_git_amend_head(msg, tstamp)
982 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
983
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100984 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +0100985 ((['git', 'config', 'remote.origin.url'],),
986 'https://chromium.googlesource.com/chromium/src'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +0100987 (('_is_git_numberer_enabled',
988 'https://chromium.googlesource.com/chromium/src',
989 'refs/heads/master'),
990 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100991 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
992 'This is parent commit.\n'
993 '\n'
994 'Cr-Commit-Position: refs/heads/master@{#543}\n'
995 'Cr-Branched-From: refs/svn/2014@{#2208}'),
Andrii Shyshkalova6695812016-12-06 17:47:09 +0100996 ((['git', 'show', '-s', '--format=%ct', 'fake_ancestor_sha'],),
997 '1480022355'), # Committer's unix timestamp.
998 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
999 '1480024000'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001000
Andrii Shyshkalova6695812016-12-06 17:47:09 +01001001 ((['git_amend_head committer timestamp', 1480024000],), None),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001002 ((['git', 'commit', '--amend', '-m',
1003 'Issue: 123\n\nR=john@chromium.org\n'
1004 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001005 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001006 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1007 'Cr-Branched-From: refs/svn/2014@{#2208}'],), ''),
1008
1009 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1010 ''),
1011 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha_rebased'),
1012 ((['git', 'checkout', '-q', 'feature'],), ''),
1013 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1014 ((['git', 'config', 'rietveld.viewvc-url'],),
1015 'https://chromium.googlesource.com/infra/infra/+/'),
1016 ((['update_description', 123,
1017 'Issue: 123\n\nR=john@chromium.org\n'
1018 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001019 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001020 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1021 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1022 'Committed: '
1023 'https://chromium.googlesource.com/infra/infra/+/fake_sha_rebased'],),
1024 ''),
1025 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
1026 'fake_sha_rebased (presubmit successful).'],), ''),
1027 ]
1028 git_cl.main(['land'])
1029
1030 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001031 self._land_rietveld_common(debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001032 self.calls += [
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001033 ((['git', 'config', 'remote.origin.url'],),
1034 'https://chromium.googlesource.com/v8/v8'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001035 (('_is_git_numberer_enabled',
1036 'https://chromium.googlesource.com/v8/v8', 'refs/heads/master'),
1037 True),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001038
1039 ((['git', 'show', '-s', '--format=%B', 'fake_ancestor_sha'],),
1040 'This is parent commit with no footer.'),
1041
1042 ((['git', 'checkout', '-q', 'feature'],), ''),
1043 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1044 ]
1045 with self.assertRaises(ValueError) as cm:
1046 git_cl.main(['land'])
1047 self.assertEqual(cm.exception.message,
1048 'Unable to infer commit position from footers')
1049
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001050 def test_git_numberer_not_whitelisted_repo(self):
1051 self.calls = []
1052 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001053 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1054 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001055 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001056
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001057 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001058 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1059 self.calls = [
1060 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001061 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001062 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001063 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001064 remote_url='https://chromium.googlesource.com/chromium/src',
1065 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001066 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001067
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001068 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001069 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001070 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001071 def fake_temporary_directory(**kwargs):
1072 yield tempdir
1073 self.mock(git_cl.gclient_utils, 'temporary_directory',
1074 fake_temporary_directory)
1075 self._test_GitNumbererState_valid_configs_inner(tempdir)
1076
1077 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001078 self.calls = [
1079 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001080 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001081 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1082 '''
1083 [plugin "git-numberer"]
1084 validate-enabled-refglob = refs/else/*
1085 validate-enabled-refglob = refs/heads/*
1086 validate-disabled-refglob = refs/heads/disabled
1087 validate-disabled-refglob = refs/branch-heads/*
1088 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001089 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1090 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001091 'refs/else/*\n'
1092 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001093 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1094 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001095 'refs/heads/disabled\n'
1096 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001097 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001098
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001099 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001100 remote_url='https://chromium.googlesource.com/chromium/src',
1101 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001102 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001103
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001104 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001105 remote_url='https://chromium.googlesource.com/chromium/src',
1106 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001107 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001108
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001109 # Validator is disabled by default, even if it's not explicitely in disabled
1110 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001111 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001112 remote_url='https://chromium.googlesource.com/chromium/src',
1113 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001114 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001115
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001116 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001117 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001118 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001119 if skip_auth_check:
1120 return [((cmd, ), 'true')]
1121
tandrii5d48c322016-08-18 16:19:37 -07001122 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001123 if issue:
1124 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001125 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001126 ])
1127 calls.extend([
1128 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1129 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1130 ((['git', 'config', 'remote.origin.url'],),
1131 'https://chromium.googlesource.com/my/repo'),
1132 ((['git', 'config', 'remote.origin.url'],),
1133 'https://chromium.googlesource.com/my/repo'),
1134 ])
1135 return calls
1136
1137 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001138 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
1139 fetched_status=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001140 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001141 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001142 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001143 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001144 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001145 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1146 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001147 ]
1148 calls += cls._is_gerrit_calls(True)
1149 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001150 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001151 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1152 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001153 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001154 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001155 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001156 ((['get_or_create_merge_base', 'master',
1157 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001158 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001159 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001160 ]
1161 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1162
1163 if issue:
1164 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001165 (('GetChangeDetail', 'chromium-review.googlesource.com',
1166 '123456', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
1167 {
1168 'change_id': '123456789',
1169 'current_revision': 'sha1_of_current_revision',
1170 'revisions': { 'sha1_of_current_revision': {
1171 'commit': {'message': fetched_description},
1172 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001173 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001174 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001175 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001176 if fetched_status == 'ABANDONED':
1177 calls += [
1178 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1179 '123456 has been abandoned, new uploads are not '
1180 'allowed'), SystemExitMock()),
1181 ]
1182 return calls
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001183
1184 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1185 get_remote_branch=False)
1186 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001187 ((['git', 'rev-parse', '--show-cdup'],), ''),
1188 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001189
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001190 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001191 'diff', '--name-status', '--no-renames', '-r',
1192 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001193 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001194 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001195 ]
1196
1197 if not issue:
1198 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001199 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001200 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001201 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001202 ]
1203
1204 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001205 ((['git', 'config', 'user.email'],), 'me@example.com'),
1206 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001207 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1208 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001209 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001210 ]
1211 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001212
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001213 @classmethod
1214 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001215 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001216 expected_upstream_ref='origin/refs/heads/master',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001217 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001218 post_amend_description=None, issue=None, cc=None,
1219 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001220 if post_amend_description is None:
1221 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001222 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001223 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001224
tandriia60502f2016-06-20 02:01:53 -07001225 if squash_mode == 'default':
1226 calls.extend([
1227 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1228 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1229 ])
1230 elif squash_mode in ('override_squash', 'override_nosquash'):
1231 calls.extend([
1232 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1233 'true' if squash_mode == 'override_squash' else 'false'),
1234 ])
1235 else:
1236 assert squash_mode in ('squash', 'nosquash')
1237
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001238 # If issue is given, then description is fetched from Gerrit instead.
1239 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001240 calls += [
1241 ((['git', 'log', '--pretty=format:%s\n\n%b',
1242 'fake_ancestor_sha..HEAD'],),
1243 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001244 if squash:
1245 title = 'Initial_upload'
1246 else:
1247 if not title:
1248 calls += [
1249 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
1250 (('Title for patchset []: ',), 'User input'),
1251 ]
1252 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001253 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001254 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001255 # DownloadGerritHook(False)
1256 ((False, ),
1257 ''),
1258 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001259 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001260 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001261 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001262 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001263 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001264 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001265 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001266 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001267 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001268 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001269 if not issue:
1270 # Prompting to edit description on first upload.
1271 calls += [
1272 ((['git', 'config', 'core.editor'],), ''),
1273 ((['RunEditor'],), description),
1274 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001275 ref_to_push = 'abcdef0123456789'
1276 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001277 ((['git', 'config', 'branch.master.merge'],),
1278 'refs/heads/master'),
1279 ((['git', 'config', 'branch.master.remote'],),
1280 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001281 ((['get_or_create_merge_base', 'master',
1282 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001283 'origin/master'),
1284 ((['git', 'rev-parse', 'HEAD:'],),
1285 '0123456789abcdef'),
1286 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001287 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001288 ref_to_push),
1289 ]
1290 else:
1291 ref_to_push = 'HEAD'
1292
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001293 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001294 ((['git', 'rev-list',
1295 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001296 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001297
Aaron Gable9b713dd2016-12-14 16:04:21 -08001298 if title:
1299 if ref_suffix:
1300 ref_suffix += ',m=' + title
1301 else:
1302 ref_suffix = '%m=' + title
1303
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001304 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1305 if ref_suffix:
1306 ref_suffix += ',' + notify_suffix
1307 else:
1308 ref_suffix = '%' + notify_suffix
tandrii@chromium.org074c2af2016-06-03 23:18:40 +00001309
ukai@chromium.orge8077812012-02-03 03:41:46 +00001310 if reviewers:
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001311 ref_suffix += ',' + ','.join('r=%s' % email
1312 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001313
1314 if git_mirror is None:
1315 calls += [
1316 ((['git', 'config', 'remote.origin.url'],),
1317 'https://chromium.googlesource.com/yyy/zzz'),
1318 ]
1319 else:
1320 calls += [
1321 ((['git', 'config', 'remote.origin.url'],),
1322 '/cache/this-dir-exists'),
1323 (('os.path.isdir', '/cache/this-dir-exists'),
1324 True),
1325 # Runs in /cache/this-dir-exists.
1326 ((['git', 'config', 'remote.origin.url'],),
1327 'https://chromium.googlesource.com/yyy/zzz'),
1328 ]
1329
ukai@chromium.orge8077812012-02-03 03:41:46 +00001330 calls += [
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001331 ((['git', 'push',
1332 'https://chromium.googlesource.com/yyy/zzz',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001333 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001334 ('remote:\n'
1335 'remote: Processing changes: (\)\n'
1336 'remote: Processing changes: (|)\n'
1337 'remote: Processing changes: (/)\n'
1338 'remote: Processing changes: (-)\n'
1339 'remote: Processing changes: new: 1 (/)\n'
1340 'remote: Processing changes: new: 1, done\n'
1341 'remote:\n'
1342 'remote: New Changes:\n'
1343 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1344 'remote:\n'
1345 'To https://chromium.googlesource.com/yyy/zzz\n'
1346 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001347 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001348 if squash:
1349 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001350 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001351 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001352 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001353 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001354 ((['git', 'config', 'branch.master.gerritsquashhash',
1355 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001356 ]
tandrii88189772016-09-29 04:29:57 -07001357 calls += [
1358 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001359 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001360 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001361 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001362 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001363 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001364 return calls
1365
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001366 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001367 self,
1368 upload_args,
1369 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001370 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001371 squash=True,
1372 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001373 expected_upstream_ref='origin/refs/heads/master',
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001374 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001375 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001376 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001377 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001378 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001379 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001380 git_mirror=None,
1381 fetched_status=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001382 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001383 if squash_mode is None:
1384 if '--no-squash' in upload_args:
1385 squash_mode = 'nosquash'
1386 elif '--squash' in upload_args:
1387 squash_mode = 'squash'
1388 else:
1389 squash_mode = 'default'
1390
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001391 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001392 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001393 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001394 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001395 CookiesAuthenticatorMockFactory(same_cookie='same_cred'))
tandrii16e0b4e2016-06-07 10:34:28 -07001396 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1397 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001398 self.mock(git_cl.gclient_utils, 'RunEditor',
1399 lambda *_, **__: self._mocked_call(['RunEditor']))
1400 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1401
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001402 original_os_path_isdir = os.path.isdir
1403 def selective_os_path_isdir_mock(path):
1404 if path == '/cache/this-dir-exists':
1405 return self._mocked_call('os.path.isdir', path)
1406 return original_os_path_isdir(path)
1407 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1408
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001409 self.calls = self._gerrit_base_calls(
1410 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001411 fetched_description=description,
1412 fetched_status=fetched_status)
1413 if fetched_status != 'ABANDONED':
1414 self.calls += self._gerrit_upload_calls(
1415 description, reviewers, squash,
1416 squash_mode=squash_mode,
1417 expected_upstream_ref=expected_upstream_ref,
1418 ref_suffix=ref_suffix, title=title, notify=notify,
1419 post_amend_description=post_amend_description,
1420 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001421 # Uncomment when debugging.
1422 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001423 git_cl.main(['upload'] + upload_args)
1424
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001425 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001426 self._run_gerrit_upload_test(
1427 ['--no-squash'],
1428 'desc\n\nBUG=\n',
1429 [],
1430 squash=False,
1431 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1432
1433 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001434 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001435 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001436 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001437 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001438 [],
tandriia60502f2016-06-20 02:01:53 -07001439 squash=False,
1440 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001441 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001442
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001443 def test_gerrit_no_reviewer(self):
1444 self._run_gerrit_upload_test(
1445 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001446 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001447 [],
1448 squash=False,
1449 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001450
tandriieefe8322016-08-17 10:12:24 -07001451 def test_gerrit_patch_bad_chars(self):
1452 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001453 self._run_gerrit_upload_test(
tandriieefe8322016-08-17 10:12:24 -07001454 ['-f', '-t', 'Don\'t put bad cha,.rs'],
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001455 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandriia60502f2016-06-20 02:01:53 -07001456 squash=False,
1457 squash_mode='override_nosquash',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001458 title='Dont_put_bad_chars')
tandriieefe8322016-08-17 10:12:24 -07001459 self.assertIn(
1460 'WARNING: Patchset title may only contain alphanumeric chars '
Aaron Gableeb3af712017-02-02 12:42:02 -08001461 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1462 'Cleaned up title: Dont put bad chars\n',
tandriieefe8322016-08-17 10:12:24 -07001463 git_cl.sys.stdout.getvalue())
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001464
ukai@chromium.orge8077812012-02-03 03:41:46 +00001465 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001466 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001467 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001468 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001469 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001470 squash=False,
1471 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001472 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001473
1474 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001475 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001476 [],
bradnelsond975b302016-10-23 12:20:23 -07001477 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1478 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001479 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001480 ['reviewer@example.com', 'another@example.com'],
1481 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001482 squash_mode='override_nosquash',
bradnelsond975b302016-10-23 12:20:23 -07001483 ref_suffix='%l=Code-Review+1',
1484 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001485
1486 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001487 self._run_gerrit_upload_test(
1488 [],
1489 'desc\nBUG=\n\nChange-Id: 123456789',
1490 [],
1491 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001492
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001493 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001494 self._run_gerrit_upload_test(
1495 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001496 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001497 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001498 squash=True,
1499 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001500
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001501 def test_gerrit_upload_squash_first_with_mirror(self):
1502 self._run_gerrit_upload_test(
1503 ['--squash'],
1504 'desc\nBUG=\n\nChange-Id: 123456789',
1505 [],
1506 squash=True,
1507 expected_upstream_ref='origin/master',
1508 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1509
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001510 def test_gerrit_upload_squash_reupload(self):
1511 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001512 self._run_gerrit_upload_test(
1513 ['--squash'],
1514 description,
1515 [],
1516 squash=True,
1517 expected_upstream_ref='origin/master',
1518 issue=123456)
1519
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001520 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1521 self.mock(git_cl, 'DieWithError',
1522 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1523 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1524 with self.assertRaises(SystemExitMock):
1525 self._run_gerrit_upload_test(
1526 ['--squash'],
1527 description,
1528 [],
1529 squash=True,
1530 expected_upstream_ref='origin/master',
1531 issue=123456,
1532 fetched_status='ABANDONED')
1533
rmistry@google.com2dd99862015-06-22 12:22:18 +00001534 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001535 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001536 def mock_run_git(*args, **_kwargs):
1537 if args[0] == ['for-each-ref',
1538 '--format=%(refname:short) %(upstream:short)',
1539 'refs/heads']:
1540 # Create a local branch dependency tree that looks like this:
1541 # test1 -> test2 -> test3 -> test4 -> test5
1542 # -> test3.1
1543 # test6 -> test0
1544 branch_deps = [
1545 'test2 test1', # test1 -> test2
1546 'test3 test2', # test2 -> test3
1547 'test3.1 test2', # test2 -> test3.1
1548 'test4 test3', # test3 -> test4
1549 'test5 test4', # test4 -> test5
1550 'test6 test0', # test0 -> test6
1551 'test7', # test7
1552 ]
1553 return '\n'.join(branch_deps)
1554 self.mock(git_cl, 'RunGit', mock_run_git)
1555
1556 class RecordCalls:
1557 times_called = 0
1558 record_calls = RecordCalls()
1559 def mock_CMDupload(*args, **_kwargs):
1560 record_calls.times_called += 1
1561 return 0
1562 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1563
1564 self.calls = [
1565 (('[Press enter to continue or ctrl-C to quit]',), ''),
1566 ]
1567
1568 class MockChangelist():
1569 def __init__(self):
1570 pass
1571 def GetBranch(self):
1572 return 'test1'
1573 def GetIssue(self):
1574 return '123'
1575 def GetPatchset(self):
1576 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001577 def IsGerrit(self):
1578 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001579
1580 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1581 # CMDupload should have been called 5 times because of 5 dependent branches.
1582 self.assertEquals(5, record_calls.times_called)
1583 self.assertEquals(0, ret)
1584
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001585 def test_gerrit_change_id(self):
1586 self.calls = [
1587 ((['git', 'write-tree'], ),
1588 'hashtree'),
1589 ((['git', 'rev-parse', 'HEAD~0'], ),
1590 'branch-parent'),
1591 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1592 'A B <a@b.org> 1456848326 +0100'),
1593 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1594 'C D <c@d.org> 1456858326 +0100'),
1595 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1596 'hashchange'),
1597 ]
1598 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1599 self.assertEqual(change_id, 'Ihashchange')
1600
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001601 def test_desecription_append_footer(self):
1602 for init_desc, footer_line, expected_desc in [
1603 # Use unique desc first lines for easy test failure identification.
1604 ('foo', 'R=one', 'foo\n\nR=one'),
1605 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1606 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1607 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1608 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1609 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1610 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1611 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1612 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1613 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1614 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1615 ]:
1616 desc = git_cl.ChangeDescription(init_desc)
1617 desc.append_footer(footer_line)
1618 self.assertEqual(desc.description, expected_desc)
1619
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001620 def test_update_reviewers(self):
1621 data = [
1622 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001623 ('foo\nR=xx', [], 'foo\nR=xx'),
1624 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001625 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001626 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1627 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1628 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001629 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001630 ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], 'foo\n\nR=a@c, xx, bar\nTBR=yy'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001631 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001632 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1633 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1634 # Same as the line before, but full of whitespaces.
1635 (
1636 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1637 'foo\nBar\n\nR=c@c\n BUG =',
1638 ),
1639 # Whitespaces aren't interpreted as new lines.
1640 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001641 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001642 expected = [i[2] for i in data]
1643 actual = []
1644 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001645 obj = git_cl.ChangeDescription(orig)
1646 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001647 actual.append(obj.description)
1648 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001649
wittman@chromium.org455dc922015-01-26 20:15:50 +00001650 def test_get_target_ref(self):
1651 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001652 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001653 self.assertEqual(None, git_cl.GetTargetRef(None,
1654 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001655 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001656
wittman@chromium.org455dc922015-01-26 20:15:50 +00001657 # Check default target refs for branches.
1658 self.assertEqual('refs/heads/master',
1659 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001660 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001661 self.assertEqual('refs/heads/master',
1662 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001663 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001664 self.assertEqual('refs/heads/master',
1665 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001666 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001667 self.assertEqual('refs/branch-heads/123',
1668 git_cl.GetTargetRef('origin',
1669 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001670 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001671 self.assertEqual('refs/diff/test',
1672 git_cl.GetTargetRef('origin',
1673 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001674 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001675 self.assertEqual('refs/heads/chrome/m42',
1676 git_cl.GetTargetRef('origin',
1677 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001678 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001679
1680 # Check target refs for user-specified target branch.
1681 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1682 'refs/remotes/branch-heads/123'):
1683 self.assertEqual('refs/branch-heads/123',
1684 git_cl.GetTargetRef('origin',
1685 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001686 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001687 for branch in ('origin/master', 'remotes/origin/master',
1688 'refs/remotes/origin/master'):
1689 self.assertEqual('refs/heads/master',
1690 git_cl.GetTargetRef('origin',
1691 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001692 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001693 for branch in ('master', 'heads/master', 'refs/heads/master'):
1694 self.assertEqual('refs/heads/master',
1695 git_cl.GetTargetRef('origin',
1696 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001697 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001698
wychen@chromium.orga872e752015-04-28 23:42:18 +00001699 def test_patch_when_dirty(self):
1700 # Patch when local tree is dirty
1701 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1702 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1703
1704 def test_diff_when_dirty(self):
1705 # Do 'git cl diff' when local tree is dirty
1706 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1707 self.assertNotEqual(git_cl.main(['diff']), 0)
1708
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001709 @staticmethod
1710 def _get_gerrit_codereview_server_calls(branch, value=None,
1711 git_short_host='host',
1712 detect_branch=True):
1713 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1714
1715 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1716 """
1717 calls = []
1718 if detect_branch:
1719 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1720 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1721 CERR1 if value is None else value))
1722 if value is None:
1723 calls += [
1724 ((['git', 'config', 'branch.' + branch + '.merge'],),
1725 'refs/heads' + branch),
1726 ((['git', 'config', 'branch.' + branch + '.remote'],),
1727 'origin'),
1728 ((['git', 'config', 'remote.origin.url'],),
1729 'https://%s.googlesource.com/my/repo' % git_short_host),
1730 ]
1731 return calls
1732
tandriidf09a462016-08-18 16:23:55 -07001733 def _patch_common(self, is_gerrit=False, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001734 new_branch=False, git_short_host='host',
1735 detect_gerrit_server=True):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001736 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001737 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1738 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001739 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001740 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001741 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1742
tandriidf09a462016-08-18 16:23:55 -07001743 if new_branch:
1744 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1745 else:
1746 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001747
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001748 if not force_codereview:
1749 # These calls detect codereview to use.
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001750 self.calls += [
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001751 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001752 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1753 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii5d48c322016-08-18 16:19:37 -07001754 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001755 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001756
1757 if is_gerrit:
1758 if not force_codereview:
1759 self.calls += [
1760 ((['git', 'config', 'gerrit.host'],), 'true'),
1761 ]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001762 if detect_gerrit_server:
1763 self.calls += self._get_gerrit_codereview_server_calls(
1764 'master', git_short_host=git_short_host,
1765 detect_branch=not new_branch and force_codereview)
1766
1767 self.calls += [
1768 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01001769 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001770 {
1771 'current_revision': '7777777777',
1772 'revisions': {
1773 '1111111111': {
1774 '_number': 1,
1775 'fetch': {'http': {
1776 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1777 'ref': 'refs/changes/56/123456/1',
1778 }},
1779 },
1780 '7777777777': {
1781 '_number': 7,
1782 'fetch': {'http': {
1783 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
1784 'ref': 'refs/changes/56/123456/7',
1785 }},
1786 },
1787 },
1788 }),
1789 ]
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001790 else:
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001791 self.calls += [
tandrii5d48c322016-08-18 16:19:37 -07001792 ((['git', 'config', 'gerrit.host'],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001793 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
skobes6468b902016-10-24 08:45:10 -07001794 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001795 ((['git', 'rev-parse', '--show-cdup'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001796 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00001797
tandriidf09a462016-08-18 16:23:55 -07001798 def _common_patch_successful(self, new_branch=False):
1799 self._patch_common(new_branch=new_branch)
wychen@chromium.orga872e752015-04-28 23:42:18 +00001800 self.calls += [
wychen@chromium.orga872e752015-04-28 23:42:18 +00001801 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +00001802 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +00001803 'patch from issue 123456 at patchset 60001 ' +
1804 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001805 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001806 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001807 ((['git', 'config', 'branch.master.rietveldserver',
1808 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001809 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07001810 ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00001811 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001812
1813 def test_patch_successful(self):
1814 self._common_patch_successful()
wychen@chromium.orga872e752015-04-28 23:42:18 +00001815 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1816
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001817 def test_patch_successful_new_branch(self):
tandriidf09a462016-08-18 16:23:55 -07001818 self._common_patch_successful(new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00001819 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
1820
wychen@chromium.orga872e752015-04-28 23:42:18 +00001821 def test_patch_conflict(self):
1822 self._patch_common()
skobes6468b902016-10-24 08:45:10 -07001823 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00001824 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00001825
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001826 def test_gerrit_patch_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001827 self._patch_common(is_gerrit=True, git_short_host='chromium',
1828 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001829 self.calls += [
1830 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1831 'refs/changes/56/123456/7'],), ''),
1832 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001833 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001834 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001835 ((['git', 'config', 'branch.master.gerritserver',
1836 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001837 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001838 ]
1839 self.assertEqual(git_cl.main(['patch', '123456']), 0)
1840
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001841 def test_patch_force_codereview(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001842 self._patch_common(is_gerrit=True, force_codereview=True,
1843 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001844 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001845 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001846 'refs/changes/56/123456/7'],), ''),
1847 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001848 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001849 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001850 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001851 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001852 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001853 ]
1854 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
1855
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001856 def test_gerrit_patch_url_successful(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001857 self._patch_common(is_gerrit=True, git_short_host='else',
1858 detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001859 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001860 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001861 'refs/changes/56/123456/1'],), ''),
1862 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001863 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001864 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001865 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001866 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07001867 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001868 ]
1869 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001870 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001871
1872 def test_gerrit_patch_conflict(self):
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001873 self._patch_common(is_gerrit=True, detect_gerrit_server=False,
1874 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001875 self.calls += [
1876 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
1877 'refs/changes/56/123456/1'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07001878 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
1879 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
1880 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00001881 ]
1882 with self.assertRaises(SystemExitMock):
1883 git_cl.main(['patch',
1884 'https://chromium-review.googlesource.com/#/c/123456/1'])
1885
tandriic2405f52016-10-10 08:13:15 -07001886 def test_gerrit_patch_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01001887 def notExists(_issue, *_, **kwargs):
1888 self.assertFalse(kwargs['ignore_404'])
1889 raise git_cl.gerrit_util.GerritError(404, '')
1890 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
1891
tandriic2405f52016-10-10 08:13:15 -07001892 url = 'https://chromium-review.googlesource.com'
tandriic2405f52016-10-10 08:13:15 -07001893 self.calls = [
1894 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1895 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1896 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1897 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1898 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
1899 ((['git', 'config', 'gerrit.host'],), 'true'),
Aaron Gablea45ee112016-11-22 15:14:38 -08001900 ((['DieWithError', 'change 123456 at ' + url + ' does not exist '
tandriic2405f52016-10-10 08:13:15 -07001901 'or you have no access to it'],), SystemExitMock()),
1902 ]
1903 with self.assertRaises(SystemExitMock):
1904 self.assertEqual(1, git_cl.main(['patch', url + '/#/c/123456/1']))
1905
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001906 def _checkout_calls(self):
1907 return [
1908 ((['git', 'config', '--local', '--get-regexp',
1909 'branch\\..*\\.rietveldissue'], ),
1910 ('branch.retrying.rietveldissue 1111111111\n'
1911 'branch.some-fix.rietveldissue 2222222222\n')),
1912 ((['git', 'config', '--local', '--get-regexp',
1913 'branch\\..*\\.gerritissue'], ),
1914 ('branch.ger-branch.gerritissue 123456\n'
1915 'branch.gbranch654.gerritissue 654321\n')),
1916 ]
1917
1918 def test_checkout_gerrit(self):
1919 """Tests git cl checkout <issue>."""
1920 self.calls = self._checkout_calls()
1921 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
1922 self.assertEqual(0, git_cl.main(['checkout', '123456']))
1923
1924 def test_checkout_rietveld(self):
1925 """Tests git cl checkout <issue>."""
1926 self.calls = self._checkout_calls()
1927 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
1928 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
1929
1930 def test_checkout_not_found(self):
1931 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001932 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00001933 self.calls = self._checkout_calls()
1934 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1935
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001936 def test_checkout_no_branch_issues(self):
1937 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00001938 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001939 self.calls = [
1940 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001941 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001942 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07001943 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00001944 ]
1945 self.assertEqual(1, git_cl.main(['checkout', '99999']))
1946
tandrii@chromium.org28253532016-04-14 13:46:56 +00001947 def _test_gerrit_ensure_authenticated_common(self, auth,
1948 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001949 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
1950 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
1951 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11001952 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001953 self.mock(git_cl, 'ask_for_data',
1954 lambda msg: self._mocked_call(['ask_for_data', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00001955 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001956 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00001957 cl.branch = 'master'
1958 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001959 cl.lookedup_issue = True
1960 return cl
1961
1962 def test_gerrit_ensure_authenticated_missing(self):
1963 cl = self._test_gerrit_ensure_authenticated_common(auth={
1964 'chromium.googlesource.com': 'git is ok, but gerrit one is missing',
1965 })
1966 self.calls.append(
1967 ((['DieWithError',
1968 'Credentials for the following hosts are required:\n'
1969 ' chromium-review.googlesource.com\n'
1970 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
1971 'You can (re)generate your credentails by visiting '
1972 'https://chromium-review.googlesource.com/new-password'],), ''),)
1973 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1974
1975 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001976 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001977 cl = self._test_gerrit_ensure_authenticated_common(auth={
1978 'chromium.googlesource.com': 'one',
1979 'chromium-review.googlesource.com': 'other',
1980 })
1981 self.calls.append(
1982 ((['ask_for_data', 'If you know what you are doing, '
qyearsley53f48a12016-09-01 10:45:13 -07001983 'press Enter to continue, Ctrl+C to abort.'],), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001984 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1985
1986 def test_gerrit_ensure_authenticated_ok(self):
1987 cl = self._test_gerrit_ensure_authenticated_common(auth={
1988 'chromium.googlesource.com': 'same',
1989 'chromium-review.googlesource.com': 'same',
1990 })
1991 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1992
tandrii@chromium.org28253532016-04-14 13:46:56 +00001993 def test_gerrit_ensure_authenticated_skipped(self):
1994 cl = self._test_gerrit_ensure_authenticated_common(
1995 auth={}, skip_auth_check=True)
1996 self.assertIsNone(cl.EnsureAuthenticated(force=False))
1997
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00001998 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07001999 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2000 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002001 self.calls = [
2002 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002003 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002004 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2005 ((['git', 'config', 'rietveld.server'],), ''),
2006 ((['git', 'config', 'rietveld.server'],), ''),
2007 ((['git', 'config', 'branch.feature.rietveldserver'],),
2008 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002009 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002010 ]
2011 self.assertEqual(0, git_cl.main(['set-commit']))
2012
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002013 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002014 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002015 lambda h, i, labels, notify=None:
2016 self._mocked_call(['SetReview', h, i, labels, notify]))
2017
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002018 self.calls = [
2019 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002020 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2021 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002022 ((['git', 'config', 'branch.feature.gerritserver'],),
2023 'https://chromium-review.googlesource.com'),
2024 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002025 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002026 ]
tandriid9e5ce52016-07-13 02:32:59 -07002027
2028 def test_cmd_set_commit_gerrit_clear(self):
2029 self._cmd_set_commit_gerrit_common(0)
2030 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2031
2032 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002033 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002034 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2035
tandriid9e5ce52016-07-13 02:32:59 -07002036 def test_cmd_set_commit_gerrit(self):
2037 self._cmd_set_commit_gerrit_common(2)
2038 self.assertEqual(0, git_cl.main(['set-commit']))
2039
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002040 def test_description_display(self):
2041 out = StringIO.StringIO()
2042 self.mock(git_cl.sys, 'stdout', out)
2043
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002044 self.mock(git_cl, 'Changelist', ChangelistMock)
2045 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002046
2047 self.assertEqual(0, git_cl.main(['description', '-d']))
2048 self.assertEqual('foo\n', out.getvalue())
2049
2050 def test_description_rietveld(self):
2051 out = StringIO.StringIO()
2052 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002053 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002054
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002055 self.assertEqual(0, git_cl.main([
2056 'description', 'https://code.review.org/123123', '-d', '--rietveld']))
2057 self.assertEqual('foobar\n', out.getvalue())
2058
iannucci3c972b92016-08-17 13:24:10 -07002059 def test_StatusFieldOverrideIssueMissingArgs(self):
2060 out = StringIO.StringIO()
2061 self.mock(git_cl.sys, 'stderr', out)
2062
2063 try:
2064 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2065 except SystemExit as ex:
2066 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002067 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002068
2069 out = StringIO.StringIO()
2070 self.mock(git_cl.sys, 'stderr', out)
2071
2072 try:
2073 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2074 except SystemExit as ex:
2075 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002076 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002077
2078 def test_StatusFieldOverrideIssue(self):
2079 out = StringIO.StringIO()
2080 self.mock(git_cl.sys, 'stdout', out)
2081
2082 def assertIssue(cl_self, *_args):
2083 self.assertEquals(cl_self.issue, 1)
2084 return 'foobar'
2085
2086 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2087 self.calls = [
2088 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2089 ((['git', 'config', 'rietveld.server'],), ''),
2090 ((['git', 'config', 'rietveld.server'],), ''),
2091 ]
iannuccie53c9352016-08-17 14:40:40 -07002092 self.assertEqual(
2093 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2094 0)
iannucci3c972b92016-08-17 13:24:10 -07002095 self.assertEqual(out.getvalue(), 'foobar\n')
2096
iannuccie53c9352016-08-17 14:40:40 -07002097 def test_SetCloseOverrideIssue(self):
2098 def assertIssue(cl_self, *_args):
2099 self.assertEquals(cl_self.issue, 1)
2100 return 'foobar'
2101
2102 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2103 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2104 self.calls = [
2105 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2106 ((['git', 'config', 'rietveld.server'],), ''),
2107 ((['git', 'config', 'rietveld.server'],), ''),
2108 ]
2109 self.assertEqual(
2110 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2111
2112 def test_SetCommitOverrideIssue(self):
2113 def assertIssue(cl_self, *_args):
2114 self.assertEquals(cl_self.issue, 1)
2115 return 'foobar'
2116
2117 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2118 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2119 self.calls = [
2120 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2121 ((['git', 'config', 'rietveld.server'],), ''),
2122 ((['git', 'config', 'rietveld.server'],), ''),
2123 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2124 ((['git', 'config', 'rietveld.server'],), ''),
2125 ((['git', 'config', 'rietveld.server'],), ''),
2126 ]
2127 self.assertEqual(
2128 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2129
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002130 def test_description_gerrit(self):
2131 out = StringIO.StringIO()
2132 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002133 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002134 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002135 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2136 {
2137 'current_revision': 'sha1',
2138 'revisions': {'sha1': {
2139 'commit': {'message': 'foobar'},
2140 }},
2141 }),
2142 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002143 self.assertEqual(0, git_cl.main([
2144 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2145 self.assertEqual('foobar\n', out.getvalue())
2146
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002147 def test_description_set_raw(self):
2148 out = StringIO.StringIO()
2149 self.mock(git_cl.sys, 'stdout', out)
2150
2151 self.mock(git_cl, 'Changelist', ChangelistMock)
2152 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2153
2154 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2155 self.assertEqual('hihi', ChangelistMock.desc)
2156
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002157 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002158 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002159
2160 def RunEditor(desc, _, **kwargs):
2161 self.assertEquals(
2162 '# Enter a description of the change.\n'
2163 '# This will be displayed on the codereview site.\n'
2164 '# The first line will also be used as the subject of the review.\n'
2165 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002166 '--------------------\n'
2167 'Some.\n\nBUG=\n\nChange-Id: xxx',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002168 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002169 # Simulate user changing something.
2170 return 'Some.\n\nBUG=123\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002171
dsansomee2d6fd92016-09-08 00:10:47 -07002172 def UpdateDescriptionRemote(_, desc, force=False):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002173 self.assertEquals(desc, 'Some.\n\nBUG=123\n\nChange-Id: xxx')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002174
2175 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2176 self.mock(git_cl.Changelist, 'GetDescription',
2177 lambda *args: current_desc)
2178 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2179 UpdateDescriptionRemote)
2180 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2181
2182 self.calls = [
2183 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002184 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002185 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2186 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
Mark Mentovai57c47212017-03-09 11:14:09 -05002187 ((['git', 'config', 'rietveld.bug-line-format'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002188 ((['git', 'config', 'core.editor'],), 'vi'),
2189 ]
2190 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2191
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002192 def test_description_set_stdin(self):
2193 out = StringIO.StringIO()
2194 self.mock(git_cl.sys, 'stdout', out)
2195
2196 self.mock(git_cl, 'Changelist', ChangelistMock)
2197 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2198
2199 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2200 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2201
kmarshall3bff56b2016-06-06 18:31:47 -07002202 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002203 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2204
kmarshall3bff56b2016-06-06 18:31:47 -07002205 self.calls = \
2206 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2207 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002208 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002209 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2210 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002211 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2212 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2213 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002214 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2215 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2216 ((['git', 'branch', '-D', 'foo'],), '')]
2217
kmarshall3bff56b2016-06-06 18:31:47 -07002218 self.mock(git_cl, 'get_cl_statuses',
2219 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002220 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2221 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2222 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002223
2224 self.assertEqual(0, git_cl.main(['archive', '-f']))
2225
2226 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002227 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002228 self.calls = \
2229 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2230 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002231 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002232 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2233 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002234 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2235
kmarshall9249e012016-08-23 12:02:16 -07002236 self.mock(git_cl, 'get_cl_statuses',
2237 lambda branches, fine_grained, max_processes:
2238 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2239
2240 self.assertEqual(1, git_cl.main(['archive', '-f']))
2241
2242 def test_archive_dry_run(self):
2243 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2244
2245 self.calls = \
2246 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2247 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2248 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2249 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2250 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2251 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2252 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2253 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2254 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002255
2256 self.mock(git_cl, 'get_cl_statuses',
2257 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002258 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2259 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2260 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002261
kmarshall9249e012016-08-23 12:02:16 -07002262 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2263
2264 def test_archive_no_tags(self):
2265 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2266
2267 self.calls = \
2268 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2269 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2270 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2271 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2272 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2273 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2274 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2275 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2276 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2277 ((['git', 'branch', '-D', 'foo'],), '')]
2278
2279 self.mock(git_cl, 'get_cl_statuses',
2280 lambda branches, fine_grained, max_processes:
2281 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2282 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2283 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2284
2285 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002286
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002287 def test_cmd_issue_erase_existing(self):
2288 out = StringIO.StringIO()
2289 self.mock(git_cl.sys, 'stdout', out)
2290 self.calls = [
2291 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002292 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2293 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002294 # Let this command raise exception (retcode=1) - it should be ignored.
2295 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002296 CERR1),
2297 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2298 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002299 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2300 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2301 ''),
2302 ]
2303 self.assertEqual(0, git_cl.main(['issue', '0']))
2304
phajdan.jre328cf92016-08-22 04:12:17 -07002305 def test_cmd_issue_json(self):
2306 out = StringIO.StringIO()
2307 self.mock(git_cl.sys, 'stdout', out)
2308 self.calls = [
2309 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002310 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002311 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2312 ((['git', 'config', 'rietveld.server'],),
2313 'https://codereview.chromium.org'),
2314 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2315 (('write_json', 'output.json',
2316 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2317 ''),
2318 ]
2319 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2320
tandriide281ae2016-10-12 06:02:30 -07002321 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002322 self.mock(git_cl.Changelist, 'GetChange',
2323 lambda _, *a: (
2324 self._mocked_call(['GetChange']+list(a))))
2325 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2326 lambda *_, **__: (
2327 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002328 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2329 lambda _, s: self._mocked_call(['SetCQState', s]))
2330 self.calls = [
2331 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002332 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002333 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2334 ((['git', 'config', 'rietveld.server'],),
2335 'https://codereview.chromium.org'),
2336 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2337 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2338 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2339 ((['get_or_create_merge_base', 'feature', 'feature'],),
2340 'fake_ancestor_sha'),
2341 ((['GetChange', 'fake_ancestor_sha', None], ),
2342 git_cl.presubmit_support.GitChange(
2343 '', '', '', '', '', '', '', '')),
2344 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2345 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002346 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2347 ]
2348 out = StringIO.StringIO()
2349 self.mock(git_cl.sys, 'stdout', out)
2350 self.assertEqual(0, git_cl.main(['try']))
2351 self.assertEqual(
2352 out.getvalue(),
2353 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2354
tandrii8c5a3532016-11-04 07:52:02 -07002355 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2356 self.mock(git_cl.Changelist, 'GetChange',
2357 lambda _, *a: (
2358 self._mocked_call(['GetChange']+list(a))))
2359 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2360 lambda *_, **__: (
2361 self._mocked_call(['DoGetTryMasters'])))
2362 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2363 lambda _, s: self._mocked_call(['SetCQState', s]))
2364
tandrii8c5a3532016-11-04 07:52:02 -07002365 self.calls = [
2366 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2367 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2368 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2369 ((['git', 'config', 'branch.feature.gerritserver'],),
2370 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002371 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2372 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2373 'project': 'depot_tools',
2374 'status': 'OPEN',
2375 'owner': {'email': 'owner@e.mail'},
2376 'revisions': {
2377 'deadbeaf': {
2378 '_number': 6,
2379 },
2380 'beeeeeef': {
2381 '_number': 7,
2382 'fetch': {'http': {
2383 'url': 'https://chromium.googlesource.com/depot_tools',
2384 'ref': 'refs/changes/56/123456/7'
2385 }},
2386 },
2387 },
2388 }),
tandrii8c5a3532016-11-04 07:52:02 -07002389 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2390 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2391 ((['get_or_create_merge_base', 'feature', 'feature'],),
2392 'fake_ancestor_sha'),
2393 ((['GetChange', 'fake_ancestor_sha', None], ),
2394 git_cl.presubmit_support.GitChange(
2395 '', '', '', '', '', '', '', '')),
2396 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2397 ((['DoGetTryMasters'], ), None),
2398 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2399 ]
2400 out = StringIO.StringIO()
2401 self.mock(git_cl.sys, 'stdout', out)
2402 self.assertEqual(0, git_cl.main(['try']))
2403 self.assertEqual(
2404 out.getvalue(),
2405 'scheduled CQ Dry Run on '
2406 'https://chromium-review.googlesource.com/123456\n')
2407
2408 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2409 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2410 lambda _: {
2411 'owner_email': 'owner@e.mail',
2412 'private': False,
2413 'closed': False,
2414 'project': 'depot_tools',
2415 'patchsets': [20001],
2416 })
tandriide281ae2016-10-12 06:02:30 -07002417 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2418 self.calls = [
2419 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2420 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2421 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2422 ((['git', 'config', 'rietveld.server'],),
2423 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002424 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002425 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002426 ]
2427
2428 def _buildbucket_retry(*_, **kw):
2429 # self.maxDiff = 10000
2430 body = json.loads(kw['body'])
2431 self.assertEqual(len(body['builds']), 1)
2432 build = body['builds'][0]
2433 params = json.loads(build.pop('parameters_json'))
2434 self.assertEqual(params, {
2435 u'builder_name': u'win',
2436 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2437 u'revision': None}],
2438 u'properties': {
2439 u'category': u'git_cl_try',
2440 u'issue': 123,
2441 u'key': u'val',
2442 u'json': [{u'a': 1}, None],
2443 u'master': u'tryserver.chromium',
2444 u'patch_project': u'depot_tools',
2445 u'patch_storage': u'rietveld',
2446 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002447 u'rietveld': u'https://codereview.chromium.org',
2448 }
2449 })
2450 self.assertEqual(build, {
2451 u'bucket': u'master.tryserver.chromium',
2452 u'client_operation_id': u'uuid4',
2453 u'tags': [u'builder:win',
2454 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002455 u'user_agent:git_cl_try',
2456 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002457 })
2458
2459 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2460
2461 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2462 self.assertEqual(0, git_cl.main([
2463 'try', '-m', 'tryserver.chromium', '-b', 'win',
2464 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2465 self.assertRegexpMatches(
2466 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002467 'Tried jobs on:\nBucket: master.tryserver.chromium')
2468
tandrii8c5a3532016-11-04 07:52:02 -07002469 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2470 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2471 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2472
tandrii8c5a3532016-11-04 07:52:02 -07002473 self.calls = [
2474 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2475 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2476 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2477 ((['git', 'config', 'branch.feature.gerritserver'],),
2478 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002479 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002480 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002481 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002482 'status': 'OPEN',
2483 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002484 'revisions': {
2485 'deadbeaf': {
2486 '_number': 6,
2487 },
2488 'beeeeeef': {
2489 '_number': 7,
2490 'fetch': {'http': {
2491 'url': 'https://chromium.googlesource.com/depot_tools',
2492 'ref': 'refs/changes/56/123456/7'
2493 }},
2494 },
2495 },
2496 }),
2497 ]
2498
2499 def _buildbucket_retry(*_, **kw):
2500 # self.maxDiff = 10000
2501 body = json.loads(kw['body'])
2502 self.assertEqual(len(body['builds']), 1)
2503 build = body['builds'][0]
2504 params = json.loads(build.pop('parameters_json'))
2505 self.assertEqual(params, {
2506 u'builder_name': u'win',
2507 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2508 u'revision': None}],
2509 u'properties': {
2510 u'category': u'git_cl_try',
2511 u'key': u'val',
2512 u'json': [{u'a': 1}, None],
2513 u'master': u'tryserver.chromium',
2514
2515 u'patch_gerrit_url':
2516 u'https://chromium-review.googlesource.com',
2517 u'patch_issue': 123456,
2518 u'patch_project': u'depot_tools',
2519 u'patch_ref': u'refs/changes/56/123456/7',
2520 u'patch_repository_url':
2521 u'https://chromium.googlesource.com/depot_tools',
2522 u'patch_set': 7,
2523 u'patch_storage': u'gerrit',
2524 }
2525 })
2526 self.assertEqual(build, {
2527 u'bucket': u'master.tryserver.chromium',
2528 u'client_operation_id': u'uuid4',
2529 u'tags': [
2530 u'builder:win',
2531 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2532 u'user_agent:git_cl_try',
2533 u'master:tryserver.chromium'],
2534 })
2535
2536 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2537
2538 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2539 self.assertEqual(0, git_cl.main([
2540 'try', '-m', 'tryserver.chromium', '-b', 'win',
2541 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2542 self.assertRegexpMatches(
2543 git_cl.sys.stdout.getvalue(),
2544 'Tried jobs on:\nBucket: master.tryserver.chromium')
2545
borenet6c0efe62016-10-19 08:13:29 -07002546 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002547 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2548 lambda _: {
2549 'owner_email': 'owner@e.mail',
2550 'private': False,
2551 'closed': False,
2552 'project': 'depot_tools',
2553 'patchsets': [20001],
2554 })
borenet6c0efe62016-10-19 08:13:29 -07002555 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2556 self.calls = [
2557 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2558 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2559 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2560 ((['git', 'config', 'rietveld.server'],),
2561 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002562 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002563 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002564 ]
2565
2566 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002567 body = json.loads(kw['body'])
2568 self.assertEqual(len(body['builds']), 1)
2569 build = body['builds'][0]
2570 params = json.loads(build.pop('parameters_json'))
2571 self.assertEqual(params, {
2572 u'builder_name': u'win',
2573 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2574 u'revision': None}],
2575 u'properties': {
2576 u'category': u'git_cl_try',
2577 u'issue': 123,
2578 u'patch_project': u'depot_tools',
2579 u'patch_storage': u'rietveld',
2580 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002581 u'rietveld': u'https://codereview.chromium.org',
2582 }
2583 })
2584 self.assertEqual(build, {
2585 u'bucket': u'test.bucket',
2586 u'client_operation_id': u'uuid4',
2587 u'tags': [u'builder:win',
2588 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2589 u'user_agent:git_cl_try'],
2590 })
2591
2592 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2593
2594 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2595 self.assertEqual(0, git_cl.main([
2596 'try', '-B', 'test.bucket', '-b', 'win']))
2597 self.assertRegexpMatches(
2598 git_cl.sys.stdout.getvalue(),
2599 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002600
qyearsley123a4682016-10-26 09:12:17 -07002601 def test_git_cl_try_bots_on_multiple_masters(self):
2602 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2603 self.calls = [
2604 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2605 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2606 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2607 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002608 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002609 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2610 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2611 ]
2612
2613 def _buildbucket_retry(*_, **kw):
2614 body = json.loads(kw['body'])
2615 self.assertEqual(len(body['builds']), 2)
2616
2617 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2618 self.assertEqual(first_build_params['builder_name'], 'builder1')
2619 self.assertEqual(first_build_params['properties']['master'], 'master1')
2620
2621 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2622 self.assertEqual(first_build_params['builder_name'], 'builder2')
2623 self.assertEqual(first_build_params['properties']['master'], 'master2')
2624
2625 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2626
2627 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2628 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2629
2630 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2631 self.assertEqual(
2632 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2633 self.assertEqual(
2634 git_cl.sys.stdout.getvalue(),
2635 'Tried jobs on:\n'
2636 'Bucket: master.master1\n'
2637 ' builder1: []\n'
2638 'Bucket: master.master2\n'
2639 ' builder2: []\n'
2640 'To see results here, run: git cl try-results\n'
2641 'To see results in browser, run: git cl web\n')
2642
tandrii16e0b4e2016-06-07 10:34:28 -07002643 def _common_GerritCommitMsgHookCheck(self):
2644 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2645 self.mock(git_cl.os.path, 'abspath',
2646 lambda path: self._mocked_call(['abspath', path]))
2647 self.mock(git_cl.os.path, 'exists',
2648 lambda path: self._mocked_call(['exists', path]))
2649 self.mock(git_cl.gclient_utils, 'FileRead',
2650 lambda path: self._mocked_call(['FileRead', path]))
2651 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2652 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2653 self.calls = [
2654 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2655 ((['abspath', '../'],), '/abs/git_repo_root'),
2656 ]
2657 return git_cl.Changelist(codereview='gerrit', issue=123)
2658
2659 def test_GerritCommitMsgHookCheck_custom_hook(self):
2660 cl = self._common_GerritCommitMsgHookCheck()
2661 self.calls += [
2662 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2663 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2664 '#!/bin/sh\necho "custom hook"')
2665 ]
2666 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2667
2668 def test_GerritCommitMsgHookCheck_not_exists(self):
2669 cl = self._common_GerritCommitMsgHookCheck()
2670 self.calls += [
2671 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2672 ]
2673 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2674
2675 def test_GerritCommitMsgHookCheck(self):
2676 cl = self._common_GerritCommitMsgHookCheck()
2677 self.calls += [
2678 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2679 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2680 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
2681 (('Do you want to remove it now? [Yes/No]',), 'Yes'),
2682 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2683 ''),
2684 ]
2685 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2686
tandriic4344b52016-08-29 06:04:54 -07002687 def test_GerritCmdLand(self):
2688 self.calls += [
2689 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2690 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2691 'deadbeaf'),
2692 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2693 ((['git', 'config', 'branch.feature.gerritserver'],),
2694 'chromium-review.googlesource.com'),
2695 ]
2696 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2697 cl._codereview_impl._GetChangeDetail = lambda _: {
2698 'labels': {},
2699 'current_revision': 'deadbeaf',
2700 }
agable32978d92016-11-01 12:55:02 -07002701 cl._codereview_impl._GetChangeCommit = lambda: {
2702 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002703 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002704 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2705 }
tandriic4344b52016-08-29 06:04:54 -07002706 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002707 out = StringIO.StringIO()
2708 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002709 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002710 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002711 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002712
tandrii221ab252016-10-06 08:12:04 -07002713 BUILDBUCKET_BUILDS_MAP = {
2714 '9000': {
2715 'id': '9000',
2716 'status': 'STARTED',
2717 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2718 'result_details_json': '{"properties": {}}',
2719 'bucket': 'master.x.y',
2720 'created_by': 'user:someone@chromium.org',
2721 'created_ts': '147200002222000',
2722 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2723 },
2724 '8000': {
2725 'id': '8000',
2726 'status': 'COMPLETED',
2727 'result': 'FAILURE',
2728 'failure_reason': 'BUILD_FAILURE',
2729 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2730 'result_details_json': '{"properties": {}}',
2731 'bucket': 'master.x.y',
2732 'created_by': 'user:someone@chromium.org',
2733 'created_ts': '147200001111000',
2734 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2735 },
2736 }
2737
2738 def test_write_try_results_json(self):
2739 expected_output = [
2740 {
2741 'buildbucket_id': '8000',
2742 'bucket': 'master.x.y',
2743 'builder_name': 'my-builder',
2744 'status': 'COMPLETED',
2745 'result': 'FAILURE',
2746 'failure_reason': 'BUILD_FAILURE',
2747 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2748 },
2749 {
2750 'buildbucket_id': '9000',
2751 'bucket': 'master.x.y',
2752 'builder_name': 'my-builder',
2753 'status': 'STARTED',
2754 'result': None,
2755 'failure_reason': None,
2756 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2757 }
2758 ]
2759 self.calls = [(('write_json', 'output.json', expected_output), '')]
2760 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
2761
tandrii45b2a582016-10-11 03:14:16 -07002762 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07002763 out = StringIO.StringIO()
2764 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07002765 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
2766 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07002767 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
2768 self._mocked_call(['get_authenticator_for_host', host]))
2769 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
2770 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07002771
2772 def _setup_fetch_try_jobs_rietveld(self, *request_results):
2773 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07002774 self.calls += [
2775 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2776 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
2777 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2778 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2779 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2780 ((['git', 'config', 'branch.feature.rietveldserver'],),
2781 'codereview.example.com'),
2782 ((['get_authenticator_for_host', 'codereview.example.com'],),
2783 AuthenticatorMock()),
2784 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2785
2786 def test_fetch_try_jobs_none_rietveld(self):
2787 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07002788 # Simulate that user isn't logged in.
2789 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07002790 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002791 self.assertRegexpMatches(sys.stdout.getvalue(),
2792 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07002793 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2794
2795 def test_fetch_try_jobs_some_rietveld(self):
2796 self._setup_fetch_try_jobs_rietveld({
2797 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2798 })
2799 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07002800 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
2801 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2802 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2803
2804 def _setup_fetch_try_jobs_gerrit(self, *request_results):
2805 self._setup_fetch_try_jobs(most_recent_patchset=13)
2806 self.calls += [
2807 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2808 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2809 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002810 # TODO(tandrii): Uncomment the below if we decide to support checking
2811 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07002812 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002813 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07002814 ((['git', 'config', 'branch.feature.gerritserver'],),
2815 'https://x-review.googlesource.com'),
2816 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
2817 AuthenticatorMock()),
2818 ] + [((['_buildbucket_retry'],), r) for r in request_results]
2819
2820 def test_fetch_try_jobs_none_gerrit(self):
2821 self._setup_fetch_try_jobs_gerrit({})
2822 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002823 # TODO(tandrii): Uncomment the below if we decide to support checking
2824 # patchsets for Gerrit.
2825 # self.assertRegexpMatches(
2826 # sys.stdout.getvalue(),
2827 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07002828 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
2829
2830 def test_fetch_try_jobs_some_gerrit(self):
2831 self._setup_fetch_try_jobs_gerrit({
2832 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
2833 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05002834 # TODO(tandrii): Uncomment the below if we decide to support checking
2835 # patchsets for Gerrit.
2836 # self.calls.remove(
2837 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07002838 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
2839
2840 # ... and doesn't result in warning.
2841 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
2842 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07002843 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
2844 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
2845
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002846 def _mock_gerrit_changes_for_detail_cache(self):
2847 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002848
2849 def test_gerrit_change_detail_cache_normalize(self):
2850 self._mock_gerrit_changes_for_detail_cache()
2851 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002852 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002853 ]
2854 cl = git_cl.Changelist(codereview='gerrit')
2855 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
2856 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
2857 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
2858 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
2859
2860 def test_gerrit_change_detail_cache_simple(self):
2861 self._mock_gerrit_changes_for_detail_cache()
2862 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002863 (('GetChangeDetail', 'host', '1', []), 'a'),
2864 (('GetChangeDetail', 'host', '2', []), 'b'),
2865 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002866 ]
2867 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2868 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
2869 self.assertEqual(cl._GetChangeDetail(), 'a')
2870 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01002871 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002872 self.assertEqual(cl._GetChangeDetail(), 'a')
2873 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
2874
2875 def test_gerrit_change_detail_cache_options(self):
2876 self._mock_gerrit_changes_for_detail_cache()
2877 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002878 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
2879 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
2880 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
2881 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01002882 ]
2883 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2884 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
2885 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
2886 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
2887 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
2888 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2889 self.assertEqual(cl._GetChangeDetail(), 'cab')
2890
2891 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
2892 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
2893 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
2894 self.assertEqual(cl._GetChangeDetail(), 'cab')
2895
2896 # Finally, no_cache should invalidate all caches for given change.
2897 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
2898 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
2899
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01002900 def test_gerrit_description_caching(self):
2901 def gen_detail(rev, desc):
2902 return {
2903 'current_revision': rev,
2904 'revisions': {rev: {'commit': {'message': desc}}}
2905 }
2906 self.calls = [
2907 (('GetChangeDetail', 'host', '1',
2908 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2909 gen_detail('rev1', 'desc1')),
2910 (('GetChangeDetail', 'host', '1',
2911 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2912 gen_detail('rev2', 'desc2')),
2913 ]
2914
2915 self._mock_gerrit_changes_for_detail_cache()
2916 cl = git_cl.Changelist(issue=1, codereview='gerrit')
2917 self.assertEqual(cl.GetDescription(), 'desc1')
2918 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
2919 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002920
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002921if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01002922 logging.basicConfig(
2923 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00002924 unittest.main()