blob: 70cb28da920685b9b2e1e6ecbecb6343299f61ec [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
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01009import datetime
tandriide281ae2016-10-12 06:02:30 -070010import json
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +010011import logging
maruel@chromium.orgddd59412011-11-30 14:20:38 +000012import os
maruel@chromium.orga3353652011-11-30 14:26:57 +000013import StringIO
maruel@chromium.orgddd59412011-11-30 14:20:38 +000014import sys
15import unittest
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +000016import urlparse
maruel@chromium.orgddd59412011-11-30 14:20:38 +000017
18sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
19
20from testing_support.auto_stub import TestCase
21
22import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000023import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000024import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000025import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000026
tandrii5d48c322016-08-18 16:19:37 -070027def callError(code=1, cmd='', cwd='', stdout='', stderr=''):
28 return subprocess2.CalledProcessError(code, cmd, cwd, stdout, stderr)
29
30
31CERR1 = callError(1)
32
33
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000034class ChangelistMock(object):
35 # A class variable so we can access it when we don't have access to the
36 # instance that's being set.
37 desc = ""
38 def __init__(self, **kwargs):
39 pass
40 def GetIssue(self):
41 return 1
Kenneth Russell61e2ed42017-02-15 11:47:13 -080042 def GetDescription(self, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000043 return ChangelistMock.desc
dsansomee2d6fd92016-09-08 00:10:47 -070044 def UpdateDescription(self, desc, force=False):
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +000045 ChangelistMock.desc = desc
46
tandrii5d48c322016-08-18 16:19:37 -070047
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000048class PresubmitMock(object):
49 def __init__(self, *args, **kwargs):
50 self.reviewers = []
51 @staticmethod
52 def should_continue():
53 return True
54
55
56class RietveldMock(object):
57 def __init__(self, *args, **kwargs):
58 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000059
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000060 @staticmethod
Kenneth Russell61e2ed42017-02-15 11:47:13 -080061 def get_description(issue, force=False):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000062 return 'Issue: %d' % issue
63
maruel@chromium.org78936cb2013-04-11 00:17:52 +000064 @staticmethod
65 def get_issue_properties(_issue, _messages):
66 return {
67 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
68 'messages': [
69 {
70 'approval': True,
71 'sender': 'john@chromium.org',
72 },
73 ],
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010074 'patchsets': [1, 20001],
maruel@chromium.org78936cb2013-04-11 00:17:52 +000075 }
76
iannuccie53c9352016-08-17 14:40:40 -070077 @staticmethod
78 def close_issue(_issue):
79 return 'Closed'
80
skobes6468b902016-10-24 08:45:10 -070081 @staticmethod
82 def get_patch(issue, patchset):
83 return 'patch set from issue %s patchset %s' % (issue, patchset)
84
Andrii Shyshkalov06a25022016-11-24 16:47:00 +010085 @staticmethod
86 def update_description(_issue, _description):
87 return 'Updated'
88
89 @staticmethod
90 def add_comment(_issue, _comment):
91 return 'Commented'
92
93
94
skobes6468b902016-10-24 08:45:10 -070095
96class GitCheckoutMock(object):
97 def __init__(self, *args, **kwargs):
98 pass
99
100 @staticmethod
101 def reset():
102 GitCheckoutMock.conflict = False
103
104 def apply_patch(self, p):
105 if GitCheckoutMock.conflict:
106 raise Exception('failed')
107
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000108
109class WatchlistsMock(object):
110 def __init__(self, _):
111 pass
112 @staticmethod
113 def GetWatchersForPaths(_):
114 return ['joe@example.com']
115
116
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000117class CodereviewSettingsFileMock(object):
118 def __init__(self):
119 pass
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800120 # pylint: disable=no-self-use
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000121 def read(self):
122 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000123 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +0000124
125
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000126class AuthenticatorMock(object):
127 def __init__(self, *_args):
128 pass
129 def has_cached_credentials(self):
130 return True
tandrii221ab252016-10-06 08:12:04 -0700131 def authorize(self, http):
132 return http
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000133
134
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100135def CookiesAuthenticatorMockFactory(hosts_with_creds=None, same_auth=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000136 """Use to mock Gerrit/Git credentials from ~/.netrc or ~/.gitcookies.
137
138 Usage:
139 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100140 CookiesAuthenticatorMockFactory({'host': ('user', _, 'pass')})
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000141
142 OR
143 >>> self.mock(git_cl.gerrit_util, "CookiesAuthenticator",
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100144 CookiesAuthenticatorMockFactory(
145 same_auth=('user', '', 'pass'))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000146 """
147 class CookiesAuthenticatorMock(git_cl.gerrit_util.CookiesAuthenticator):
Quinten Yearsleyb2cc4a92016-12-15 13:53:26 -0800148 def __init__(self): # pylint: disable=super-init-not-called
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000149 # Intentionally not calling super() because it reads actual cookie files.
150 pass
151 @classmethod
152 def get_gitcookies_path(cls):
153 return '~/.gitcookies'
154 @classmethod
155 def get_netrc_path(cls):
156 return '~/.netrc'
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +0100157 def _get_auth_for_host(self, host):
158 if same_auth:
159 return same_auth
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000160 return (hosts_with_creds or {}).get(host)
161 return CookiesAuthenticatorMock
162
kmarshall9249e012016-08-23 12:02:16 -0700163class MockChangelistWithBranchAndIssue():
164 def __init__(self, branch, issue):
165 self.branch = branch
166 self.issue = issue
167 def GetBranch(self):
168 return self.branch
169 def GetIssue(self):
170 return self.issue
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000171
tandriic2405f52016-10-10 08:13:15 -0700172
173class SystemExitMock(Exception):
174 pass
175
176
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000177class TestGitClBasic(unittest.TestCase):
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100178 def test_get_description(self):
179 cl = git_cl.Changelist(issue=1, codereview='rietveld',
180 codereview_host='host')
181 cl.description = 'x'
182 cl.has_description = True
Kenneth Russell61e2ed42017-02-15 11:47:13 -0800183 cl._codereview_impl.FetchDescription = lambda *a, **kw: 'y'
Andrii Shyshkalov31863012017-02-08 11:35:12 +0100184 self.assertEquals(cl.GetDescription(), 'x')
185 self.assertEquals(cl.GetDescription(force=True), 'y')
186 self.assertEquals(cl.GetDescription(), 'y')
187
Robert Iannucci09f1f3d2017-03-28 16:54:32 -0700188 def test_description_footers(self):
189 cl = git_cl.Changelist(issue=1, codereview='gerrit',
190 codereview_host='host')
191 cl.description = '\n'.join([
192 'This is some message',
193 '',
194 'It has some lines',
195 'and, also',
196 '',
197 'Some: Really',
198 'Awesome: Footers',
199 ])
200 cl.has_description = True
201 cl._codereview_impl.UpdateDescriptionRemote = lambda *a, **kw: 'y'
202 msg, footers = cl.GetDescriptionFooters()
203 self.assertEquals(
204 msg, ['This is some message', '', 'It has some lines', 'and, also'])
205 self.assertEquals(footers, [('Some', 'Really'), ('Awesome', 'Footers')])
206
207 msg.append('wut')
208 footers.append(('gnarly-dude', 'beans'))
209 cl.UpdateDescriptionFooters(msg, footers)
210 self.assertEquals(cl.GetDescription().splitlines(), [
211 'This is some message',
212 '',
213 'It has some lines',
214 'and, also',
215 'wut'
216 '',
217 'Some: Really',
218 'Awesome: Footers',
219 'Gnarly-Dude: beans',
220 ])
221
tandriif9aefb72016-07-01 09:06:51 -0700222 def test_get_bug_line_values(self):
223 f = lambda p, bugs: list(git_cl._get_bug_line_values(p, bugs))
224 self.assertEqual(f('', ''), [])
225 self.assertEqual(f('', '123,v8:456'), ['123', 'v8:456'])
226 self.assertEqual(f('v8', '456'), ['v8:456'])
227 self.assertEqual(f('v8', 'chromium:123,456'), ['v8:456', 'chromium:123'])
228 # Not nice, but not worth carying.
229 self.assertEqual(f('v8', 'chromium:123,456,v8:123'),
230 ['v8:456', 'chromium:123', 'v8:123'])
231
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100232 def _test_git_number(self, parent_msg, dest_ref, child_msg,
233 parent_hash='parenthash'):
234 desc = git_cl.ChangeDescription(child_msg)
235 desc.update_with_git_number_footers(parent_hash, parent_msg, dest_ref)
236 return desc.description
237
238 def assertEqualByLine(self, actual, expected):
239 self.assertEqual(actual.splitlines(), expected.splitlines())
240
241 def test_git_number_bad_parent(self):
242 with self.assertRaises(ValueError):
243 self._test_git_number('Parent', 'refs/heads/master', 'Child')
244
245 def test_git_number_bad_parent_footer(self):
246 with self.assertRaises(AssertionError):
247 self._test_git_number(
248 'Parent\n'
249 '\n'
250 'Cr-Commit-Position: wrong',
251 'refs/heads/master', 'Child')
252
253 def test_git_number_bad_lineage_ignored(self):
254 actual = self._test_git_number(
255 'Parent\n'
256 '\n'
257 'Cr-Commit-Position: refs/heads/master@{#1}\n'
258 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}',
259 'refs/heads/master', 'Child')
260 self.assertEqualByLine(
261 actual,
262 'Child\n'
263 '\n'
264 'Cr-Commit-Position: refs/heads/master@{#2}\n'
265 'Cr-Branched-From: mustBeReal40CharHash-branch@{#pos}')
266
267 def test_git_number_same_branch(self):
268 actual = self._test_git_number(
269 'Parent\n'
270 '\n'
271 'Cr-Commit-Position: refs/heads/master@{#12}',
272 dest_ref='refs/heads/master',
273 child_msg='Child')
274 self.assertEqualByLine(
275 actual,
276 'Child\n'
277 '\n'
278 'Cr-Commit-Position: refs/heads/master@{#13}')
279
280 def test_git_number_same_branch_with_originals(self):
281 actual = self._test_git_number(
282 'Parent\n'
283 '\n'
284 'Cr-Commit-Position: refs/heads/master@{#12}',
285 dest_ref='refs/heads/master',
286 child_msg='Child\n'
287 '\n'
288 'Some users are smart and insert their own footers\n'
289 '\n'
290 'Cr-Whatever: value\n'
291 'Cr-Commit-Position: refs/copy/paste@{#22}')
292 self.assertEqualByLine(
293 actual,
294 'Child\n'
295 '\n'
296 'Some users are smart and insert their own footers\n'
297 '\n'
298 'Cr-Original-Whatever: value\n'
299 'Cr-Original-Commit-Position: refs/copy/paste@{#22}\n'
300 'Cr-Commit-Position: refs/heads/master@{#13}')
301
302 def test_git_number_new_branch(self):
303 actual = self._test_git_number(
304 'Parent\n'
305 '\n'
306 'Cr-Commit-Position: refs/heads/master@{#12}',
307 dest_ref='refs/heads/branch',
308 child_msg='Child')
309 self.assertEqualByLine(
310 actual,
311 'Child\n'
312 '\n'
313 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
314 'Cr-Branched-From: parenthash-refs/heads/master@{#12}')
315
316 def test_git_number_lineage(self):
317 actual = self._test_git_number(
318 'Parent\n'
319 '\n'
320 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
321 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
322 dest_ref='refs/heads/branch',
323 child_msg='Child')
324 self.assertEqualByLine(
325 actual,
326 'Child\n'
327 '\n'
328 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
329 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
330
331 def test_git_number_moooooooore_lineage(self):
332 actual = self._test_git_number(
333 'Parent\n'
334 '\n'
335 'Cr-Commit-Position: refs/heads/branch@{#5}\n'
336 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
337 dest_ref='refs/heads/mooore',
338 child_msg='Child')
339 self.assertEqualByLine(
340 actual,
341 'Child\n'
342 '\n'
343 'Cr-Commit-Position: refs/heads/mooore@{#1}\n'
344 'Cr-Branched-From: parenthash-refs/heads/branch@{#5}\n'
345 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
346
Andrii Shyshkalovb5effa12016-12-14 19:35:12 +0100347 def test_git_number_ever_moooooooore_lineage(self):
348 self.maxDiff = 10000
349 actual = self._test_git_number(
350 'CQ commit on fresh new branch + numbering.\n'
351 '\n'
352 'NOTRY=True\n'
353 'NOPRESUBMIT=True\n'
354 'BUG=\n'
355 '\n'
356 'Review-Url: https://codereview.chromium.org/2577703003\n'
357 'Cr-Commit-Position: refs/heads/gnumb-test/br@{#1}\n'
358 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
359 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}',
360 dest_ref='refs/heads/gnumb-test/cl',
361 child_msg='git cl on fresh new branch + numbering.\n'
362 '\n'
363 'Review-Url: https://codereview.chromium.org/2575043003 .\n')
364 self.assertEqualByLine(
365 actual,
366 'git cl on fresh new branch + numbering.\n'
367 '\n'
368 'Review-Url: https://codereview.chromium.org/2575043003 .\n'
369 'Cr-Commit-Position: refs/heads/gnumb-test/cl@{#1}\n'
370 'Cr-Branched-From: parenthash-refs/heads/gnumb-test/br@{#1}\n'
371 'Cr-Branched-From: 0749ff9edc-refs/heads/gnumb-test/cq@{#4}\n'
372 'Cr-Branched-From: 5c49df2da6-refs/heads/master@{#41618}')
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +0100373
374 def test_git_number_cherry_pick(self):
375 actual = self._test_git_number(
376 'Parent\n'
377 '\n'
378 'Cr-Commit-Position: refs/heads/branch@{#1}\n'
379 'Cr-Branched-From: somehash-refs/heads/master@{#12}',
380 dest_ref='refs/heads/branch',
381 child_msg='Child, which is cherry-pick from master\n'
382 '\n'
383 'Cr-Commit-Position: refs/heads/master@{#100}\n'
384 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)')
385 self.assertEqualByLine(
386 actual,
387 'Child, which is cherry-pick from master\n'
388 '\n'
389 '(cherry picked from commit deadbeef12345678deadbeef12345678deadbeef)\n'
390 '\n'
391 'Cr-Original-Commit-Position: refs/heads/master@{#100}\n'
392 'Cr-Commit-Position: refs/heads/branch@{#2}\n'
393 'Cr-Branched-From: somehash-refs/heads/master@{#12}')
394
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +0000395
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200396class TestParseIssueURL(unittest.TestCase):
397 def _validate(self, parsed, issue=None, patchset=None, hostname=None,
398 codereview=None, fail=False):
399 self.assertIsNotNone(parsed)
400 if fail:
401 self.assertFalse(parsed.valid)
402 return
403 self.assertTrue(parsed.valid)
404 self.assertEqual(parsed.issue, issue)
405 self.assertEqual(parsed.patchset, patchset)
406 self.assertEqual(parsed.hostname, hostname)
407 self.assertEqual(parsed.codereview, codereview)
408
409 def _run_and_validate(self, func, url, *args, **kwargs):
410 result = func(urlparse.urlparse(url))
411 if kwargs.pop('fail', False):
412 self.assertIsNone(result)
413 return None
414 self._validate(result, *args, fail=False, **kwargs)
415
416 def test_rietveld(self):
417 def test(url, *args, **kwargs):
418 self._run_and_validate(git_cl._RietveldChangelistImpl.ParseIssueURL, url,
419 *args, codereview='rietveld', **kwargs)
420
421 test('http://codereview.chromium.org/123',
422 123, None, 'codereview.chromium.org')
423 test('https://codereview.chromium.org/123',
424 123, None, 'codereview.chromium.org')
425 test('https://codereview.chromium.org/123/',
426 123, None, 'codereview.chromium.org')
427 test('https://codereview.chromium.org/123/whatever',
428 123, None, 'codereview.chromium.org')
429 test('https://codereview.chromium.org/123/#ps20001',
430 123, 20001, 'codereview.chromium.org')
431 test('http://codereview.chromium.org/download/issue123_4.diff',
432 123, 4, 'codereview.chromium.org')
433 # This looks like bad Gerrit, but is actually valid Rietveld, too.
434 test('https://chrome-review.source.com/123/4/',
435 123, None, 'chrome-review.source.com')
436
437 test('https://codereview.chromium.org/deadbeaf', fail=True)
438 test('https://codereview.chromium.org/api/123', fail=True)
439 test('bad://codereview.chromium.org/123', fail=True)
440 test('http://codereview.chromium.org/download/issue123_4.diffff', fail=True)
441
442 def test_gerrit(self):
443 def test(url, issue=None, patchset=None, hostname=None, fail=None):
444 self._test_ParseIssueUrl(
445 git_cl._GerritChangelistImpl.ParseIssueURL,
446 url, issue, patchset, hostname, fail)
447 def test(url, *args, **kwargs):
448 self._run_and_validate(git_cl._GerritChangelistImpl.ParseIssueURL, url,
449 *args, codereview='gerrit', **kwargs)
450
451 test('http://chrome-review.source.com/c/123',
452 123, None, 'chrome-review.source.com')
453 test('https://chrome-review.source.com/c/123/',
454 123, None, 'chrome-review.source.com')
455 test('https://chrome-review.source.com/c/123/4',
456 123, 4, 'chrome-review.source.com')
457 test('https://chrome-review.source.com/#/c/123/4',
458 123, 4, 'chrome-review.source.com')
459 test('https://chrome-review.source.com/c/123/4',
460 123, 4, 'chrome-review.source.com')
461 test('https://chrome-review.source.com/123',
462 123, None, 'chrome-review.source.com')
463 test('https://chrome-review.source.com/123/4',
464 123, 4, 'chrome-review.source.com')
465
466 test('https://chrome-review.source.com/c/123/1/whatisthis', fail=True)
467 test('https://chrome-review.source.com/c/abc/', fail=True)
468 test('ssh://chrome-review.source.com/c/123/1/', fail=True)
469
470 def test_ParseIssueNumberArgument(self):
471 def test(arg, *args, **kwargs):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200472 codereview_hint = kwargs.pop('hint', None)
473 self._validate(git_cl.ParseIssueNumberArgument(arg, codereview_hint),
474 *args, **kwargs)
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200475
476 test('123', 123)
477 test('', fail=True)
478 test('abc', fail=True)
479 test('123/1', fail=True)
480 test('123a', fail=True)
481 test('ssh://chrome-review.source.com/#/c/123/4/', fail=True)
482 # Rietveld.
483 test('https://codereview.source.com/www123', fail=True)
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200484 # Matches both, but we take Rietveld now by default.
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200485 test('https://codereview.source.com/123',
486 123, None, 'codereview.source.com', 'rietveld')
Andrii Shyshkalovc9712392017-04-11 13:35:21 +0200487 # Matches both, but we take Gerrit if specifically requested.
488 test('https://codereview.source.com/123',
489 123, None, 'codereview.source.com', 'gerrit',
490 hint='gerrit')
Andrii Shyshkalov90f31922017-04-10 16:10:21 +0200491 # Gerrrit.
492 test('https://chrome-review.source.com/c/123/4',
493 123, 4, 'chrome-review.source.com', 'gerrit')
494 test('https://chrome-review.source.com/bad/123/4', fail=True)
495
496
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100497class GitCookiesCheckerTest(TestCase):
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100498 def setUp(self):
499 super(GitCookiesCheckerTest, self).setUp()
500 self.c = git_cl._GitCookiesChecker()
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100501 self.c._all_hosts = []
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100502
503 def mock_hosts_creds(self, subhost_identity_pairs):
504 def ensure_googlesource(h):
505 if not h.endswith(self.c._GOOGLESOURCE):
506 assert not h.endswith('.')
507 return h + '.' + self.c._GOOGLESOURCE
508 return h
509 self.c._all_hosts = [(ensure_googlesource(h), i, '.gitcookies')
510 for h, i in subhost_identity_pairs]
511
512 def test_analysis_nothing(self):
513 self.c._all_hosts = []
514 self.assertFalse(self.c.has_generic_host())
515 self.assertEqual(set(), self.c.get_conflicting_hosts())
516 self.assertEqual(set(), self.c.get_duplicated_hosts())
517 self.assertEqual(set(), self.c.get_partially_configured_hosts())
518 self.assertEqual(set(), self.c.get_hosts_with_wrong_identities())
519
520 def test_analysis(self):
521 self.mock_hosts_creds([
522 ('.googlesource.com', 'git-example.chromium.org'),
523
524 ('chromium', 'git-example.google.com'),
525 ('chromium-review', 'git-example.google.com'),
526 ('chrome-internal', 'git-example.chromium.org'),
527 ('chrome-internal-review', 'git-example.chromium.org'),
528 ('conflict', 'git-example.google.com'),
529 ('conflict-review', 'git-example.chromium.org'),
530 ('dup', 'git-example.google.com'),
531 ('dup', 'git-example.google.com'),
532 ('dup-review', 'git-example.google.com'),
533 ('partial', 'git-example.google.com'),
534 ])
535 self.assertTrue(self.c.has_generic_host())
536 self.assertEqual(set(['conflict.googlesource.com']),
537 self.c.get_conflicting_hosts())
538 self.assertEqual(set(['dup.googlesource.com']),
539 self.c.get_duplicated_hosts())
540 self.assertEqual(set(['partial.googlesource.com']),
541 self.c.get_partially_configured_hosts())
542 self.assertEqual(set(['chromium.googlesource.com',
543 'chrome-internal.googlesource.com']),
544 self.c.get_hosts_with_wrong_identities())
545
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +0100546 def test_report_no_problems(self):
547 self.test_analysis_nothing()
548 self.mock(sys, 'stdout', StringIO.StringIO())
549 self.assertFalse(self.c.find_and_report_problems())
550 self.assertEqual(sys.stdout.getvalue(), '')
551
552 def test_report(self):
553 self.test_analysis()
554 self.mock(sys, 'stdout', StringIO.StringIO())
555 self.assertTrue(self.c.find_and_report_problems())
556 with open(os.path.join(os.path.dirname(__file__),
557 'git_cl_creds_check_report.txt')) as f:
558 expected = f.read()
559 def by_line(text):
560 return [l.rstrip() for l in text.rstrip().splitlines()]
Andrii Shyshkalov4812e612017-03-27 17:22:57 +0200561 self.assertEqual(by_line(sys.stdout.getvalue().strip()), by_line(expected))
Andrii Shyshkalov97800502017-03-16 16:04:32 +0100562
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000563class TestGitCl(TestCase):
564 def setUp(self):
565 super(TestGitCl, self).setUp()
566 self.calls = []
tandrii9d206752016-06-20 11:32:47 -0700567 self._calls_done = []
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000568 self.mock(subprocess2, 'call', self._mocked_call)
569 self.mock(subprocess2, 'check_call', self._mocked_call)
570 self.mock(subprocess2, 'check_output', self._mocked_call)
tandrii5d48c322016-08-18 16:19:37 -0700571 self.mock(subprocess2, 'communicate',
572 lambda *a, **kw: ([self._mocked_call(*a, **kw), ''], 0))
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000573 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +0000574 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000575 self.mock(git_common, 'get_or_create_merge_base',
576 lambda *a: (
577 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +0000578 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000579 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100580 self.mock(git_cl, 'ask_for_data', lambda *a, **k: self._mocked_call(
581 *(['ask_for_data'] + list(a)), **k))
phajdan.jre328cf92016-08-22 04:12:17 -0700582 self.mock(git_cl, 'write_json', lambda path, contents:
583 self._mocked_call('write_json', path, contents))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000584 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000585 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +0000586 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
skobes6468b902016-10-24 08:45:10 -0700587 self.mock(git_cl.checkout, 'GitCheckout', GitCheckoutMock)
588 GitCheckoutMock.reset()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000589 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000590 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000591 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +0100592 self.mock(git_cl.gerrit_util, 'GetChangeDetail',
593 lambda *args, **kwargs: self._mocked_call(
594 'GetChangeDetail', *args, **kwargs))
595 self.mock(git_cl.gerrit_util, 'AddReviewers',
596 lambda h, i, add, is_reviewer, notify: self._mocked_call(
597 'AddReviewers', h, i, add, is_reviewer, notify))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000598 self.mock(git_cl.gerrit_util.GceAuthenticator, 'is_gce',
599 classmethod(lambda _: False))
tandriic2405f52016-10-10 08:13:15 -0700600 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +1100601 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000602 # It's important to reset settings to not have inter-tests interference.
603 git_cl.settings = None
604
605 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000606 try:
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100607 self.assertEquals([], self.calls)
608 except AssertionError:
wychen@chromium.org445c8962015-04-28 23:30:05 +0000609 if not self.has_failed():
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100610 raise
611 # Sadly, has_failed() returns True if this OR any other tests before this
612 # one have failed.
613 git_cl.logging.exception(
614 '\nIF YOU SEE THIS, READ BELOW, IT WILL SAVE YOUR TIME!\n'
615 'There are un-consumed self.calls after this test has finished.\n'
616 'If you don\'t know which test this is, run:\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700617 ' tests/git_cl_tests.py -v\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100618 '\n'
619 'If you are already running just this single test, then **first** '
620 'fix the problem whose exception is emitted below by unittest '
621 'runner.\n'
622 '\n'
623 'Else, to be sure what\'s going on, run this test **alone** with \n'
Aaron Gable3a16ed12017-03-23 10:51:55 -0700624 ' tests/git_cl_tests.py TestGitCl.<name>\n'
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +0100625 'and follow instructions above.\n' +
626 '=' * 80)
wychen@chromium.org445c8962015-04-28 23:30:05 +0000627 finally:
628 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000629
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000630 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000631 self.assertTrue(
632 self.calls,
tandrii9d206752016-06-20 11:32:47 -0700633 '@%d Expected: <Missing> Actual: %r' % (len(self._calls_done), args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000634 top = self.calls.pop(0)
wychen@chromium.orga872e752015-04-28 23:42:18 +0000635 expected_args, result = top
636
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000637 # Also logs otherwise it could get caught in a try/finally and be hard to
638 # diagnose.
639 if expected_args != args:
tandrii9d206752016-06-20 11:32:47 -0700640 N = 5
641 prior_calls = '\n '.join(
642 '@%d: %r' % (len(self._calls_done) - N + i, c[0])
643 for i, c in enumerate(self._calls_done[-N:]))
644 following_calls = '\n '.join(
645 '@%d: %r' % (len(self._calls_done) + i + 1, c[0])
646 for i, c in enumerate(self.calls[:N]))
647 extended_msg = (
648 'A few prior calls:\n %s\n\n'
649 'This (expected):\n @%d: %r\n'
650 'This (actual):\n @%d: %r\n\n'
651 'A few following expected calls:\n %s' %
652 (prior_calls, len(self._calls_done), expected_args,
653 len(self._calls_done), args, following_calls))
654 git_cl.logging.error(extended_msg)
655
tandrii99a72f22016-08-17 14:33:24 -0700656 self.fail('@%d\n'
657 ' Expected: %r\n'
658 ' Actual: %r' % (
tandrii9d206752016-06-20 11:32:47 -0700659 len(self._calls_done), expected_args, args))
660
661 self._calls_done.append(top)
tandrii5d48c322016-08-18 16:19:37 -0700662 if isinstance(result, Exception):
663 raise result
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000664 return result
665
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +0100666 def test_ask_for_explicit_yes_true(self):
667 self.calls = [
668 (('ask_for_data', 'prompt [Yes/No]: '), 'blah'),
669 (('ask_for_data', 'Please, type yes or no: '), 'ye'),
670 ]
671 self.assertTrue(git_cl.ask_for_explicit_yes('prompt'))
672
673 def test_ask_for_explicit_yes_true(self):
674 self.calls = [
675 (('ask_for_data', 'prompt [Yes/No]: '), 'yesish'),
676 (('ask_for_data', 'Please, type yes or no: '), 'nO'),
677 ]
678 self.assertFalse(git_cl.ask_for_explicit_yes('prompt'))
679
tandrii48df5812016-10-17 03:55:37 -0700680 def test_LoadCodereviewSettingsFromFile_gerrit(self):
681 codereview_file = StringIO.StringIO('GERRIT_HOST: true')
682 self.calls = [
683 ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1),
684 ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1),
685 ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1),
686 ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1),
687 ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1),
688 ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700689 ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],),
690 CERR1),
691 ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1),
tandrii48df5812016-10-17 03:55:37 -0700692 ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],),
693 CERR1),
694 ((['git', 'config', 'gerrit.host', 'true'],), ''),
695 ]
696 self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file))
697
maruel@chromium.orga3353652011-11-30 14:26:57 +0000698 @classmethod
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000699 def _is_gerrit_calls(cls, gerrit=False):
700 return [((['git', 'config', 'rietveld.autoupdate'],), ''),
701 ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')]
702
703 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000704 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000705 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000706 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000707
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000708 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000709 def _upload_no_rev_calls(cls, similarity, find_copies):
710 return (cls._git_base_calls(similarity, find_copies) +
711 cls._git_upload_no_rev_calls())
712
713 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000714 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000715 if similarity is None:
716 similarity = '50'
tandrii33a46ff2016-08-23 05:53:40 -0700717 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700718 'branch.master.git-cl-similarity'],), CERR1)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000719 else:
tandrii33a46ff2016-08-23 05:53:40 -0700720 similarity_call = ((['git', 'config',
tandrii5d48c322016-08-18 16:19:37 -0700721 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000722
723 if find_copies is None:
724 find_copies = True
tandrii5d48c322016-08-18 16:19:37 -0700725 find_copies_call = ((['git', 'config', '--bool',
726 'branch.master.git-find-copies'],), CERR1)
iannucci@chromium.org79540052012-10-19 23:15:26 +0000727 else:
tandrii5d48c322016-08-18 16:19:37 -0700728 val = str(find_copies).lower()
729 find_copies_call = ((['git', 'config', '--bool',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000730 'branch.master.git-find-copies', val],), '')
731
732 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000733 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
scottmgb84b5e32016-11-10 09:25:33 -0800734 '-l100000', '-C'+similarity,
735 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000736 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000737 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000738 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000739
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000740 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000741 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000742 similarity_call,
743 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
744 find_copies_call,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000745 ] + cls._is_gerrit_calls() + [
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000746 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -0700747 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
748 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +0000749 ((['git', 'config', 'rietveld.server'],),
750 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000751 ((['git', 'config', 'branch.master.merge'],), 'master'),
752 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000753 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000754 'fake_ancestor_sha'),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +0000755 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000756 ((['git', 'rev-parse', '--show-cdup'],), ''),
757 ((['git', 'rev-parse', 'HEAD'],), '12345'),
758 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000759 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000760 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -0700761 ((['git', 'config', 'branch.master.rietveldpatchset'],), CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000762 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000763 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000764 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000765 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000766 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000767 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000768 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000769 'desc\n'),
Aaron Gable3a16ed12017-03-23 10:51:55 -0700770 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000771 ]
772
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000773 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000774 def _git_upload_no_rev_calls(cls):
775 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000776 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000777 ]
778
779 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000780 def _git_upload_calls(cls, private):
781 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000782 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000783 private_call = []
784 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000785 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000786 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000787 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000788
maruel@chromium.orga3353652011-11-30 14:26:57 +0000789 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000790 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000791 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000792 ((['git', 'config', 'branch.master.base-url'],), ''),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -0800793 ((['git', 'config', 'remote.origin.url'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000794 ((['git', 'config', 'rietveld.project'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -0700795 ((['git', 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000796 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000797 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000798 ((['git',
tandrii33a46ff2016-08-23 05:53:40 -0700799 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000800 ] + cls._git_post_upload_calls()
801
802 @classmethod
803 def _git_post_upload_calls(cls):
804 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000805 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
806 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
807 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000808 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000809 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000810 ]
811
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000812 @staticmethod
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000813 def _git_sanity_checks(diff_base, working_branch, get_remote_branch=True):
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000814 fake_ancestor = 'fake_ancestor'
815 fake_cl = 'fake_cl_for_patch'
816 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000817 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000818 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000819 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000820 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000821 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000822 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000823 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000824 ((['git',
tandrii5d48c322016-08-18 16:19:37 -0700825 'config', 'gitcl.remotebranch'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000826 ] + ([
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000827 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000828 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000829 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000830 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000831 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000832 'config', 'branch.%s.remote' % working_branch],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000833 ] if get_remote_branch else []) + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000834 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000835 'refs/remotes/origin/master'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +0000836 ]
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000837
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000838 @staticmethod
bradnelsond975b302016-10-23 12:20:23 -0700839 def _cmd_line(description, args, similarity, find_copies, private, cc):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000840 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000841 return [
842 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000843 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000844 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000845 ] + args + [
bradnelsond975b302016-10-23 12:20:23 -0700846 '--cc', ','.join(['joe@example.com'] + cc),
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000847 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000848 '--git_similarity', similarity or '50'
Andrii Shyshkalov18975322017-01-25 16:44:13 +0100849 ] + (['--git_no_find_copies'] if find_copies is False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000850 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000851 ]
852
853 def _run_reviewer_test(
854 self,
855 upload_args,
856 expected_description,
857 returned_description,
858 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000859 reviewers,
bradnelsond975b302016-10-23 12:20:23 -0700860 private=False,
861 cc=None):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000862 """Generic reviewer test framework."""
tandrii@chromium.org28253532016-04-14 13:46:56 +0000863 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000864 try:
865 similarity = upload_args[upload_args.index('--similarity')+1]
866 except ValueError:
867 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000868
869 if '--find-copies' in upload_args:
870 find_copies = True
871 elif '--no-find-copies' in upload_args:
872 find_copies = False
873 else:
874 find_copies = None
875
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000876 private = '--private' in upload_args
bradnelsond975b302016-10-23 12:20:23 -0700877 cc = cc or []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000878
879 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000880
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000881 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000882 self.assertEquals(
883 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000884 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000885 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000886 '#--------------------This line is 72 characters long'
887 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000888 expected_description,
889 desc)
890 return returned_description
891 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000892
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000893 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000894 cmd_line = self._cmd_line(final_description, reviewers, similarity,
bradnelsond975b302016-10-23 12:20:23 -0700895 find_copies, private, cc)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000896 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000897 return 1, 2
898 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000899
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000900 git_cl.main(['upload'] + upload_args)
901
902 def test_no_reviewer(self):
903 self._run_reviewer_test(
904 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000905 'desc\n\nBUG=',
906 '# Blah blah comment.\ndesc\n\nBUG=',
907 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000908 [])
909
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000910 def test_keep_similarity(self):
911 self._run_reviewer_test(
912 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000913 'desc\n\nBUG=',
914 '# Blah blah comment.\ndesc\n\nBUG=',
915 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000916 [])
917
iannucci@chromium.org79540052012-10-19 23:15:26 +0000918 def test_keep_find_copies(self):
919 self._run_reviewer_test(
920 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000921 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000922 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000923 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000924 [])
925
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000926 def test_private(self):
927 self._run_reviewer_test(
928 ['--private'],
929 'desc\n\nBUG=',
930 '# Blah blah comment.\ndesc\n\nBUG=\n',
931 'desc\n\nBUG=',
932 [])
933
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000934 def test_reviewers_cmd_line(self):
935 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000936 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000937 self._run_reviewer_test(
938 ['-r' 'foo@example.com'],
939 description,
940 '\n%s\n' % description,
941 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000942 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000943
944 def test_reviewer_tbr_overriden(self):
945 # Reviewer is overriden with TBR
946 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000947 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000948 self._run_reviewer_test(
949 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000950 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000951 description.strip('\n'),
952 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000953 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000954
955 def test_reviewer_multiple(self):
956 # Handles multiple R= or TBR= lines.
957 description = (
bradnelsond975b302016-10-23 12:20:23 -0700958 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
959 'CC=more@example.com,people@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000960 self._run_reviewer_test(
961 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000962 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000963 description,
964 description,
bradnelsond975b302016-10-23 12:20:23 -0700965 ['--reviewers=another@example.com,reviewer@example.com'],
966 cc=['more@example.com', 'people@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000967
maruel@chromium.orga3353652011-11-30 14:26:57 +0000968 def test_reviewer_send_mail(self):
969 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000970 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000971 self._run_reviewer_test(
972 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000973 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000974 description.strip('\n'),
975 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000976 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000977
978 def test_reviewer_send_mail_no_rev(self):
979 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000980 stdout = StringIO.StringIO()
tandriic2405f52016-10-10 08:13:15 -0700981 self.calls = self._upload_no_rev_calls(None, None) + [
982 ((['DieWithError', 'Must specify reviewers to send email.'],),
983 SystemExitMock())
984 ]
985
986 def RunEditor(desc, _, **kwargs):
987 return desc
988 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
989 self.mock(sys, 'stdout', stdout)
990 with self.assertRaises(SystemExitMock):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000991 git_cl.main(['upload', '--send-mail'])
tandriic2405f52016-10-10 08:13:15 -0700992 self.assertEqual(
993 'Using 50% similarity for rename/copy detection. Override with '
994 '--similarity.\n',
995 stdout.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000996
tandriif9aefb72016-07-01 09:06:51 -0700997 def test_bug_on_cmd(self):
998 self._run_reviewer_test(
999 ['--bug=500658,proj:123'],
1000 'desc\n\nBUG=500658\nBUG=proj:123',
1001 '# Blah blah comment.\ndesc\n\nBUG=500658\nBUG=proj:1234',
1002 'desc\n\nBUG=500658\nBUG=proj:1234',
1003 [])
1004
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001005 def _land_rietveld_calls(self, repo_url, git_numberer_enabled=False,
1006 parent_msg=None,
1007 new_msg=None,
1008 fail_after_parent_msg=False,
1009 fail_cherry_pick=False,
1010 fail_push_count=0,
1011 debug=False):
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001012 if debug:
1013 # Very useful due to finally clause in git cl land raising exceptions and
1014 # shadowing real cause of failure.
1015 self.mock(git_cl, '_IS_BEING_TESTED', True)
1016 else:
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001017 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
Andrii Shyshkalov768f1d82016-12-08 15:10:13 +01001018
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001019 if git_numberer_enabled:
1020 # Special mocks to check validity of timestamp.
1021 original_git_amend_head = git_cl._git_amend_head
1022 def _git_amend_head_mock(msg, tstamp):
1023 self._mocked_call(['git_amend_head committer timestamp', tstamp])
1024 return original_git_amend_head(msg, tstamp)
1025 self.mock(git_cl, '_git_amend_head', _git_amend_head_mock)
1026
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001027 self.mock(git_cl, '_is_git_numberer_enabled', lambda url, ref:
1028 self._mocked_call('_is_git_numberer_enabled', url, ref))
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001029 self.mock(RietveldMock, 'update_description', staticmethod(
1030 lambda i, d: self._mocked_call(['update_description', i, d])))
1031 self.mock(RietveldMock, 'add_comment', staticmethod(
1032 lambda i, c: self._mocked_call(['add_comment', i, c])))
1033 self.calls = [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001034 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1035 ((['git', 'config', 'branch.feature.git-cl-similarity'],), CERR1),
1036 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1037 ((['git', 'config', '--bool', 'branch.feature.git-find-copies'],),
1038 CERR1),
1039 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
1040 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
Aaron Gable1bc7bfe2016-12-19 10:08:14 -08001041 ((['git', 'config', 'rietveld.autoupdate'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001042 ((['git', 'config', 'rietveld.server'],),
1043 'https://codereview.chromium.org'),
1044 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1045 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1046 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1047 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001048 ((['git', 'rev-list', '^feature', 'refs/remotes/origin/master'],),
1049 ''), # No commits to rebase, according to local view of origin.
1050 ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
1051 'fake_ancestor_sha'),
1052 ] + self._git_sanity_checks('fake_ancestor_sha', 'feature') + [
1053 ((['git', 'rev-parse', '--show-cdup'],), ''),
1054 ((['git', 'rev-parse', 'HEAD'],), 'fake_sha'),
1055 ((['git', 'diff', '--name-status', '--no-renames', '-r',
1056 'fake_ancestor_sha...', '.'],),
1057 'M\tfile1.cpp'),
1058 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
1059 ((['git', 'config', 'branch.feature.rietveldserver'],),
1060 'https://codereview.chromium.org'),
1061 ((['git', 'config', 'user.email'],), 'user@e.mail'),
1062 ((['git', 'config', 'rietveld.tree-status-url'],), CERR1),
1063 ((['git', 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1064 'fake_ancestor_sha', 'feature'],),
1065 # This command just prints smth like this:
1066 # file1.cpp | 53 ++++++--
1067 # 1 file changed, 33 insertions(+), 20 deletions(-)\n
1068 ''),
1069 ((['git', 'show-ref', '--quiet', '--verify',
1070 'refs/heads/git-cl-commit'],),
1071 ''), # 0 return code means branch exists.
1072 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1073 ((['git', 'show-ref', '--quiet', '--verify',
1074 'refs/heads/git-cl-cherry-pick'],),
1075 CERR1), # This means git-cl-cherry-pick branch does not exist.
1076 ((['git', 'rev-parse', '--show-cdup'],), ''),
1077 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
1078 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
1079 ((['git', 'commit', '-m',
1080 'Issue: 123\n\nR=john@chromium.org\n\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001081 'Review-Url: https://codereview.chromium.org/123 .'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001082 ((['git', 'config', 'branch.feature.merge'],), 'refs/heads/master'),
1083 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
1084 ((['git', 'config', '--get', 'remote.origin.url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001085 repo_url),
1086
1087 ((['git', 'config', 'remote.origin.url'],), repo_url),
1088 (('_is_git_numberer_enabled', repo_url, 'refs/heads/master'),
1089 git_numberer_enabled),
1090
1091 # Auto-rebase init.
1092 ((['git', 'rev-parse', 'HEAD'],), 'sha1_for_cherry_pick'),
1093 ]
1094 # Auto-rebase loops.
1095 for attempt in xrange(fail_push_count + 1):
1096 self.calls += [
1097 # Auto-rebase loop start.
1098 ((['git', 'retry', 'fetch', 'origin',
1099 '+refs/heads/master:refs/heads/git-cl-cherry-pick'],), ''),
1100 ((['git', 'checkout', 'refs/heads/git-cl-cherry-pick'],), ''),
1101 # NOTE: if fail_push_count>0, this sha1_of_parent should probably be
1102 # different in each loop iteration for truly realistic test.
1103 ((['git', 'rev-parse', 'HEAD'],), 'sha1_of_parent'),
1104 ((['git', 'cherry-pick', 'sha1_for_cherry_pick'],),
1105 callError(1, 'failed to cherry pick') if fail_cherry_pick
1106 else ''),
1107 ]
1108 if fail_cherry_pick:
1109 return
1110
1111 if git_numberer_enabled:
1112 assert parent_msg
1113 self.calls += [
1114 ((['git', 'show', '-s', '--format=%B', 'sha1_of_parent'],),
1115 parent_msg),
1116 ]
1117 if fail_after_parent_msg:
1118 return
1119 assert new_msg
1120 self.calls += [
1121 ((['git', 'show', '-s', '--format=%ct', 'sha1_of_parent'],),
1122 '1480022355'), # Committer's unix timestamp.
1123 ((['git', 'show', '-s', '--format=%ct', 'HEAD'],),
1124 '1480024000'),
1125 ((['git_amend_head committer timestamp', 1480024000],), ''),
1126 ((['git', 'commit', '--amend', '-m', new_msg],), ''),
1127 ]
1128 self.calls += [
1129 ((['git', 'push', '--porcelain', 'origin', 'HEAD:refs/heads/master'],),
1130 CERR1 if attempt < fail_push_count else ''),
1131 ]
1132 # End of autorebase + push.
1133
1134 self.calls += [
1135 ((['git', 'rev-parse', 'HEAD'],), 'sha1_committed'),
1136 ]
1137 if git_numberer_enabled:
1138 self.calls += [
1139 ((['git', 'show', '-s', '--format=%B', 'HEAD'],), new_msg),
1140 ]
1141
1142 # Cleanup calls.
1143 self.calls += [
1144 ((['git', 'checkout', '-q', 'feature'],), ''),
1145 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
1146 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001147 ]
1148
1149 def test_land_rietveld(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001150 self._land_rietveld_calls(
1151 repo_url='https://chromium.googlesource.com/infra/infra',
1152 git_numberer_enabled=False,
1153 debug=False)
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001154 self.calls += [
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001155 ((['git', 'config', 'rietveld.viewvc-url'],),
1156 'https://chromium.googlesource.com/infra/infra/+/'),
1157 ((['update_description', 123,
1158 'Issue: 123\n\nR=john@chromium.org\n\nCommitted: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001159 'https://chromium.googlesource.com/infra/infra/+/sha1_committed'],),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001160 ''),
1161 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001162 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov06a25022016-11-24 16:47:00 +01001163 ]
1164 git_cl.main(['land'])
1165
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001166 def test_land_rietveld_fail_cherry_pick(self):
1167 self._land_rietveld_calls(
1168 repo_url='https://chromium.googlesource.com/infra/infra',
1169 git_numberer_enabled=False,
1170 fail_cherry_pick=True,
1171 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001172 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001173 ((['git', 'diff', '--name-status', '--diff-filter=U'],),
1174 'U path/file1\n'
1175 'U file2.cpp\n'),
1176 ((['git', 'cherry-pick', '--abort'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001177 ((['git', 'checkout', '-q', 'feature'],), ''),
1178 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001179 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
1180 ]
1181 git_cl.main(['land'])
1182
1183 def test_land_rietveld_git_numberer_fail_1_push(self):
1184 return self.test_land_rietveld_git_numberer(fail_push_count=1)
1185
1186 def test_land_rietveld_git_numberer(self, fail_push_count=0):
1187 self._land_rietveld_calls(
1188 repo_url='https://chromium.googlesource.com/chromium/src',
1189 git_numberer_enabled=True,
1190 parent_msg=('This is parent commit.\n'
1191 '\n'
1192 'Cr-Commit-Position: refs/heads/master@{#543}\n'
1193 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1194 new_msg=('Issue: 123\n\nR=john@chromium.org\n'
1195 '\n'
1196 'Review-Url: https://codereview.chromium.org/123 .\n'
1197 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1198 'Cr-Branched-From: refs/svn/2014@{#2208}'),
1199 fail_push_count=fail_push_count,
1200 debug=False)
1201
1202 self.calls += [
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001203 ((['git', 'config', 'rietveld.viewvc-url'],),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001204 'https://chromium.googlesource.com/chromium/src/+/'),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001205 ((['update_description', 123,
1206 'Issue: 123\n\nR=john@chromium.org\n'
1207 '\n'
Andrii Shyshkalovf01be222016-12-08 19:21:13 +01001208 'Review-Url: https://codereview.chromium.org/123 .\n'
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001209 'Cr-Commit-Position: refs/heads/master@{#544}\n'
1210 'Cr-Branched-From: refs/svn/2014@{#2208}\n'
1211 'Committed: '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001212 'https://chromium.googlesource.com/chromium/src/+/sha1_committed'],),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001213 ''),
1214 ((['add_comment', 123, 'Committed patchset #2 (id:20001) manually as '
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001215 'sha1_committed (presubmit successful).'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001216 ]
1217 git_cl.main(['land'])
1218
1219 def test_land_rietveld_git_numberer_bad_parent(self):
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001220 self._land_rietveld_calls(
1221 repo_url='https://chromium.googlesource.com/v8/v8',
1222 git_numberer_enabled=True,
1223 parent_msg='This is parent commit with no footer.',
1224 fail_after_parent_msg=True,
1225 debug=False)
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001226 self.calls += [
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001227 # Cleanup calls to restore original state.
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001228 ((['git', 'checkout', '-q', 'feature'],), ''),
1229 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
Andrii Shyshkalovaa31b972017-03-24 16:16:33 +01001230 ((['git', 'branch', '-D', 'git-cl-cherry-pick'],), ''),
Andrii Shyshkalov15e50cc2016-12-02 14:34:08 +01001231 ]
1232 with self.assertRaises(ValueError) as cm:
1233 git_cl.main(['land'])
1234 self.assertEqual(cm.exception.message,
1235 'Unable to infer commit position from footers')
1236
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001237 def test_git_numberer_not_whitelisted_repo(self):
1238 self.calls = []
1239 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001240 remote_url='https://chromium.googlesource.com/chromium/tools/build',
1241 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001242 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001243
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001244 def test_git_numberer_fail_fetch(self):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001245 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1246 self.calls = [
1247 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001248 '+refs/meta/config:refs/git_cl/meta/config'],), CERR1),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001249 ]
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001250 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001251 remote_url='https://chromium.googlesource.com/chromium/src',
1252 remote_ref='refs/whatever')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001253 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001254
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001255 def test_git_numberer_valid_configs(self):
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001256 with git_cl.gclient_utils.temporary_directory() as tempdir:
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001257 @contextlib.contextmanager
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001258 def fake_temporary_directory(**kwargs):
1259 yield tempdir
1260 self.mock(git_cl.gclient_utils, 'temporary_directory',
1261 fake_temporary_directory)
1262 self._test_GitNumbererState_valid_configs_inner(tempdir)
1263
1264 def _test_GitNumbererState_valid_configs_inner(self, tempdir):
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001265 self.calls = [
1266 ((['git', 'fetch', 'https://chromium.googlesource.com/chromium/src',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001267 '+refs/meta/config:refs/git_cl/meta/config'],), ''),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001268 ((['git', 'show', 'refs/git_cl/meta/config:project.config'],),
1269 '''
1270 [plugin "git-numberer"]
1271 validate-enabled-refglob = refs/else/*
1272 validate-enabled-refglob = refs/heads/*
1273 validate-disabled-refglob = refs/heads/disabled
1274 validate-disabled-refglob = refs/branch-heads/*
1275 '''),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001276 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1277 '--get-all', 'plugin.git-numberer.validate-enabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001278 'refs/else/*\n'
1279 'refs/heads/*\n'),
Andrii Shyshkalov351c61d2017-01-21 20:40:16 +00001280 ((['git', 'config', '-f', os.path.join(tempdir, 'project.config') ,
1281 '--get-all', 'plugin.git-numberer.validate-disabled-refglob'],),
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001282 'refs/heads/disabled\n'
1283 'refs/branch-heads/*\n'),
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001284 ] * 3 # 3 tests below have exactly the same IO.
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001285
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001286 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001287 remote_url='https://chromium.googlesource.com/chromium/src',
1288 remote_ref='refs/heads/test')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001289 self.assertEqual(res, True)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001290
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001291 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001292 remote_url='https://chromium.googlesource.com/chromium/src',
1293 remote_ref='refs/heads/disabled')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001294 self.assertEqual(res, False)
Andrii Shyshkalovcd6a9362016-12-07 12:04:12 +01001295
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01001296 # Validator is disabled by default, even if it's not explicitly in disabled
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001297 # refglobs.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001298 res = git_cl._is_git_numberer_enabled(
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001299 remote_url='https://chromium.googlesource.com/chromium/src',
1300 remote_ref='refs/arbitrary/ref')
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001301 self.assertEqual(res, False)
Andrii Shyshkalovcbec8ef2016-12-09 13:54:51 +01001302
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001303 @classmethod
tandrii@chromium.org28253532016-04-14 13:46:56 +00001304 def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):
shinyak@chromium.org00dbccd2016-04-15 07:24:43 +00001305 cmd = ['git', 'config', '--bool', 'gerrit.skip-ensure-authenticated']
tandrii@chromium.org28253532016-04-14 13:46:56 +00001306 if skip_auth_check:
1307 return [((cmd, ), 'true')]
1308
tandrii5d48c322016-08-18 16:19:37 -07001309 calls = [((cmd, ), CERR1)]
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001310 if issue:
1311 calls.extend([
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001312 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001313 ])
1314 calls.extend([
1315 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
1316 ((['git', 'config', 'branch.master.remote'],), 'origin'),
1317 ((['git', 'config', 'remote.origin.url'],),
1318 'https://chromium.googlesource.com/my/repo'),
1319 ((['git', 'config', 'remote.origin.url'],),
1320 'https://chromium.googlesource.com/my/repo'),
1321 ])
1322 return calls
1323
1324 @classmethod
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001325 def _gerrit_base_calls(cls, issue=None, fetched_description=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001326 fetched_status=None, other_cl_owner=None):
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001327 calls = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001328 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001329 ((['git', 'config', 'branch.master.git-cl-similarity'],),
tandrii5d48c322016-08-18 16:19:37 -07001330 CERR1),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001331 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii5d48c322016-08-18 16:19:37 -07001332 ((['git', 'config', '--bool', 'branch.master.git-find-copies'],),
1333 CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001334 ]
1335 calls += cls._is_gerrit_calls(True)
1336 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001337 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07001338 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1339 ((['git', 'config', 'branch.master.gerritissue'],),
tandrii5d48c322016-08-18 16:19:37 -07001340 CERR1 if issue is None else str(issue)),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001341 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001342 ((['git', 'config', 'branch.master.remote'],), 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001343 ((['get_or_create_merge_base', 'master',
1344 'refs/remotes/origin/master'],),
iannucci@chromium.org9e849272014-04-04 00:31:55 +00001345 'fake_ancestor_sha'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001346 # Calls to verify branch point is ancestor
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001347 ]
1348 calls += cls._gerrit_ensure_auth_calls(issue=issue)
1349
1350 if issue:
1351 calls += [
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001352 (('GetChangeDetail', 'chromium-review.googlesource.com',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001353 '123456',
1354 ['DETAILED_ACCOUNTS', 'CURRENT_REVISION', 'CURRENT_COMMIT']),
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001355 {
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001356 'owner': {'email': (other_cl_owner or 'owner@example.com')},
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001357 'change_id': '123456789',
1358 'current_revision': 'sha1_of_current_revision',
1359 'revisions': { 'sha1_of_current_revision': {
1360 'commit': {'message': fetched_description},
1361 }},
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001362 'status': fetched_status or 'NEW',
Andrii Shyshkalov3e631422017-02-16 17:46:44 +01001363 }),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001364 ]
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001365 if fetched_status == 'ABANDONED':
1366 calls += [
1367 (('DieWithError', 'Change https://chromium-review.googlesource.com/'
1368 '123456 has been abandoned, new uploads are not '
1369 'allowed'), SystemExitMock()),
1370 ]
1371 return calls
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001372 if other_cl_owner:
1373 calls += [
1374 (('ask_for_data', 'Press Enter to upload, or Ctrl+C to abort'), ''),
1375 ]
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001376
1377 calls += cls._git_sanity_checks('fake_ancestor_sha', 'master',
1378 get_remote_branch=False)
1379 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001380 ((['git', 'rev-parse', '--show-cdup'],), ''),
1381 ((['git', 'rev-parse', 'HEAD'],), '12345'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001382
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001383 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +00001384 'diff', '--name-status', '--no-renames', '-r',
1385 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001386 'M\t.gitignore\n'),
tandrii33a46ff2016-08-23 05:53:40 -07001387 ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001388 ]
1389
1390 if not issue:
1391 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001392 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +00001393 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +00001394 'foo'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001395 ]
1396
1397 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001398 ((['git', 'config', 'user.email'],), 'me@example.com'),
1399 ((['git',
scottmgb84b5e32016-11-10 09:25:33 -08001400 'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
1401 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001402 '+dat'),
Andrii Shyshkalov02939562017-02-16 17:47:17 +01001403 ]
1404 return calls
ukai@chromium.orge8077812012-02-03 03:41:46 +00001405
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001406 @classmethod
1407 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandriia60502f2016-06-20 02:01:53 -07001408 squash_mode='default',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001409 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001410 ref_suffix='', title=None, notify=False,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001411 post_amend_description=None, issue=None, cc=None,
1412 git_mirror=None):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001413 if post_amend_description is None:
1414 post_amend_description = description
tandriia60502f2016-06-20 02:01:53 -07001415 calls = []
bradnelsond975b302016-10-23 12:20:23 -07001416 cc = cc or []
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001417
tandriia60502f2016-06-20 02:01:53 -07001418 if squash_mode == 'default':
1419 calls.extend([
1420 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],), ''),
1421 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), ''),
1422 ])
1423 elif squash_mode in ('override_squash', 'override_nosquash'):
1424 calls.extend([
1425 ((['git', 'config', '--bool', 'gerrit.override-squash-uploads'],),
1426 'true' if squash_mode == 'override_squash' else 'false'),
1427 ])
1428 else:
1429 assert squash_mode in ('squash', 'nosquash')
1430
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001431 # If issue is given, then description is fetched from Gerrit instead.
1432 if issue is None:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001433 calls += [
1434 ((['git', 'log', '--pretty=format:%s\n\n%b',
1435 'fake_ancestor_sha..HEAD'],),
1436 description)]
Aaron Gableb56ad332017-01-06 15:24:31 -08001437 if squash:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001438 title = 'Initial_upload'
Aaron Gableb56ad332017-01-06 15:24:31 -08001439 else:
1440 if not title:
1441 calls += [
1442 ((['git', 'show', '-s', '--format=%s', 'HEAD'],), ''),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001443 (('ask_for_data', 'Title for patchset []: '), 'User input'),
Aaron Gableb56ad332017-01-06 15:24:31 -08001444 ]
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001445 title = 'User_input'
tandrii@chromium.org57d86542016-03-04 16:11:32 +00001446 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001447 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +00001448 # DownloadGerritHook(False)
1449 ((False, ),
1450 ''),
1451 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001452 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001453 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001454 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001455 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001456 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +00001457 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +00001458 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +00001459 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001460 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001461 if squash:
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001462 if not issue:
1463 # Prompting to edit description on first upload.
1464 calls += [
1465 ((['git', 'config', 'core.editor'],), ''),
1466 ((['RunEditor'],), description),
1467 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001468 ref_to_push = 'abcdef0123456789'
1469 calls += [
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001470 ((['git', 'config', 'branch.master.merge'],),
1471 'refs/heads/master'),
1472 ((['git', 'config', 'branch.master.remote'],),
1473 'origin'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001474 ((['get_or_create_merge_base', 'master',
1475 'refs/remotes/origin/master'],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001476 'origin/master'),
1477 ((['git', 'rev-parse', 'HEAD:'],),
1478 '0123456789abcdef'),
1479 ((['git', 'commit-tree', '0123456789abcdef', '-p',
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001480 'origin/master', '-m', description],),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001481 ref_to_push),
1482 ]
1483 else:
1484 ref_to_push = 'HEAD'
1485
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001486 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +00001487 ((['git', 'rev-list',
1488 expected_upstream_ref + '..' + ref_to_push],), ''),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001489 ]
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001490
Aaron Gable9b713dd2016-12-14 16:04:21 -08001491 if title:
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001492 if ref_suffix:
1493 ref_suffix += ',m=' + title
1494 else:
1495 ref_suffix = '%m=' + title
Aaron Gable9b713dd2016-12-14 16:04:21 -08001496
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001497 notify_suffix = 'notify=%s' % ('ALL' if notify else 'NONE')
1498 if ref_suffix:
1499 ref_suffix += ',' + notify_suffix
1500 else:
1501 ref_suffix = '%' + notify_suffix
1502
1503 if reviewers:
1504 ref_suffix += ',' + ','.join('r=%s' % email
1505 for email in sorted(reviewers))
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001506
1507 if git_mirror is None:
1508 calls += [
1509 ((['git', 'config', 'remote.origin.url'],),
1510 'https://chromium.googlesource.com/yyy/zzz'),
1511 ]
1512 else:
1513 calls += [
1514 ((['git', 'config', 'remote.origin.url'],),
1515 '/cache/this-dir-exists'),
1516 (('os.path.isdir', '/cache/this-dir-exists'),
1517 True),
1518 # Runs in /cache/this-dir-exists.
1519 ((['git', 'config', 'remote.origin.url'],),
1520 'https://chromium.googlesource.com/yyy/zzz'),
1521 ]
1522
ukai@chromium.orge8077812012-02-03 03:41:46 +00001523 calls += [
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001524 ((['git', 'push',
1525 'https://chromium.googlesource.com/yyy/zzz',
1526 ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +00001527 ('remote:\n'
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001528 'remote: Processing changes: (\)\n'
1529 'remote: Processing changes: (|)\n'
1530 'remote: Processing changes: (/)\n'
1531 'remote: Processing changes: (-)\n'
1532 'remote: Processing changes: new: 1 (/)\n'
1533 'remote: Processing changes: new: 1, done\n'
1534 'remote:\n'
1535 'remote: New Changes:\n'
1536 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
1537 'remote:\n'
1538 'To https://chromium.googlesource.com/yyy/zzz\n'
1539 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +00001540 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001541 if squash:
1542 calls += [
tandrii33a46ff2016-08-23 05:53:40 -07001543 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07001544 ''),
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001545 ((['git', 'config', 'branch.master.gerritserver',
tandrii5d48c322016-08-18 16:19:37 -07001546 'https://chromium-review.googlesource.com'],), ''),
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001547 ((['git', 'config', 'branch.master.gerritsquashhash',
1548 'abcdef0123456789'],), ''),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00001549 ]
tandrii88189772016-09-29 04:29:57 -07001550 calls += [
1551 ((['git', 'config', 'rietveld.cc'],), ''),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001552 (('AddReviewers', 'chromium-review.googlesource.com',
tandrii88189772016-09-29 04:29:57 -07001553 123456 if squash else None,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001554 ['joe@example.com'] + cc, False, notify), ''),
tandrii88189772016-09-29 04:29:57 -07001555 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +00001556 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +00001557 return calls
1558
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001559 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001560 self,
1561 upload_args,
1562 description,
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001563 reviewers=None,
tandriia60502f2016-06-20 02:01:53 -07001564 squash=True,
1565 squash_mode=None,
tandrii@chromium.org10625002016-03-04 20:03:47 +00001566 expected_upstream_ref='origin/refs/heads/master',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001567 ref_suffix='',
Aaron Gable9b713dd2016-12-14 16:04:21 -08001568 title=None,
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001569 notify=False,
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001570 post_amend_description=None,
bradnelsond975b302016-10-23 12:20:23 -07001571 issue=None,
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001572 cc=None,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001573 git_mirror=None,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001574 fetched_status=None,
1575 other_cl_owner=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001576 """Generic gerrit upload test framework."""
tandriia60502f2016-06-20 02:01:53 -07001577 if squash_mode is None:
1578 if '--no-squash' in upload_args:
1579 squash_mode = 'nosquash'
1580 elif '--squash' in upload_args:
1581 squash_mode = 'squash'
1582 else:
1583 squash_mode = 'default'
1584
tandrii@chromium.orgbf766ba2016-04-13 12:51:23 +00001585 reviewers = reviewers or []
bradnelsond975b302016-10-23 12:20:23 -07001586 cc = cc or []
tandrii@chromium.org28253532016-04-14 13:46:56 +00001587 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii16e0b4e2016-06-07 10:34:28 -07001588 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001589 CookiesAuthenticatorMockFactory(
1590 same_auth=('git-owner.example.com', '', 'pass')))
tandrii16e0b4e2016-06-07 10:34:28 -07001591 self.mock(git_cl._GerritChangelistImpl, '_GerritCommitMsgHookCheck',
1592 lambda _, offer_removal: None)
tandriia60502f2016-06-20 02:01:53 -07001593 self.mock(git_cl.gclient_utils, 'RunEditor',
1594 lambda *_, **__: self._mocked_call(['RunEditor']))
1595 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
1596
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001597 original_os_path_isdir = os.path.isdir
1598 def selective_os_path_isdir_mock(path):
1599 if path == '/cache/this-dir-exists':
1600 return self._mocked_call('os.path.isdir', path)
1601 return original_os_path_isdir(path)
1602 self.mock(os.path, 'isdir', selective_os_path_isdir_mock)
1603
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001604 self.calls = self._gerrit_base_calls(
1605 issue=issue,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001606 fetched_description=description,
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001607 fetched_status=fetched_status,
1608 other_cl_owner=other_cl_owner)
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001609 if fetched_status != 'ABANDONED':
1610 self.calls += self._gerrit_upload_calls(
1611 description, reviewers, squash,
1612 squash_mode=squash_mode,
1613 expected_upstream_ref=expected_upstream_ref,
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001614 ref_suffix=ref_suffix, title=title, notify=notify,
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001615 post_amend_description=post_amend_description,
1616 issue=issue, cc=cc, git_mirror=git_mirror)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001617 # Uncomment when debugging.
1618 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +00001619 git_cl.main(['upload'] + upload_args)
1620
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001621 def test_gerrit_upload_without_change_id(self):
tandriia60502f2016-06-20 02:01:53 -07001622 self._run_gerrit_upload_test(
1623 ['--no-squash'],
1624 'desc\n\nBUG=\n',
1625 [],
1626 squash=False,
1627 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
1628
1629 def test_gerrit_upload_without_change_id_override_nosquash(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +00001630 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001631 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001632 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +00001633 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001634 [],
tandriia60502f2016-06-20 02:01:53 -07001635 squash=False,
1636 squash_mode='override_nosquash',
tandrii@chromium.org10625002016-03-04 20:03:47 +00001637 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001638
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001639 def test_gerrit_no_reviewer(self):
1640 self._run_gerrit_upload_test(
1641 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001642 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001643 [],
1644 squash=False,
1645 squash_mode='override_nosquash')
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001646
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001647 def test_gerrit_patchset_title_bad_chars(self):
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001648 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
1649 self._run_gerrit_upload_test(
1650 ['-f', '-t', 'Don\'t put bad cha,.rs'],
1651 'desc\n\nBUG=\n\nChange-Id: I123456789',
1652 squash=False,
1653 squash_mode='override_nosquash',
1654 title='Dont_put_bad_chars')
1655 self.assertIn(
1656 'WARNING: Patchset title may only contain alphanumeric chars '
1657 'and spaces. You can edit it in the UI. See https://crbug.com/663787.\n'
1658 'Cleaned up title: Dont put bad chars\n',
1659 git_cl.sys.stdout.getvalue())
1660
ukai@chromium.orge8077812012-02-03 03:41:46 +00001661 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001662 self._run_gerrit_upload_test(
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001663 ['-r', 'foo@example.com', '--send-mail'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001664 'desc\n\nBUG=\n\nChange-Id: I123456789',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001665 ['foo@example.com'],
tandriia60502f2016-06-20 02:01:53 -07001666 squash=False,
1667 squash_mode='override_nosquash',
tandrii@chromium.org8da45402016-05-24 23:11:03 +00001668 notify=True)
ukai@chromium.orge8077812012-02-03 03:41:46 +00001669
1670 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +00001671 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +00001672 [],
bradnelsond975b302016-10-23 12:20:23 -07001673 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n'
1674 'CC=more@example.com,people@example.com\n\n'
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +00001675 'Change-Id: 123456789\n',
tandriia60502f2016-06-20 02:01:53 -07001676 ['reviewer@example.com', 'another@example.com'],
1677 squash=False,
tandrii99a72f22016-08-17 14:33:24 -07001678 squash_mode='override_nosquash',
Andrii Shyshkalovfebbae92017-04-05 15:05:20 +00001679 ref_suffix='%l=Code-Review+1',
bradnelsond975b302016-10-23 12:20:23 -07001680 cc=['more@example.com', 'people@example.com'])
tandriia60502f2016-06-20 02:01:53 -07001681
1682 def test_gerrit_upload_squash_first_is_default(self):
tandriia60502f2016-06-20 02:01:53 -07001683 self._run_gerrit_upload_test(
1684 [],
1685 'desc\nBUG=\n\nChange-Id: 123456789',
1686 [],
1687 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001688
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001689 def test_gerrit_upload_squash_first(self):
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001690 self._run_gerrit_upload_test(
1691 ['--squash'],
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001692 'desc\nBUG=\n\nChange-Id: 123456789',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001693 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +00001694 squash=True,
1695 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +00001696
Andrii Shyshkalove9c78ff2017-02-06 15:53:13 +01001697 def test_gerrit_upload_squash_first_with_mirror(self):
1698 self._run_gerrit_upload_test(
1699 ['--squash'],
1700 'desc\nBUG=\n\nChange-Id: 123456789',
1701 [],
1702 squash=True,
1703 expected_upstream_ref='origin/master',
1704 git_mirror='https://chromium.googlesource.com/yyy/zzz')
1705
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001706 def test_gerrit_upload_squash_reupload(self):
1707 description = 'desc\nBUG=\n\nChange-Id: 123456789'
tandrii@chromium.org512d79c2016-03-31 12:55:28 +00001708 self._run_gerrit_upload_test(
1709 ['--squash'],
1710 description,
1711 [],
1712 squash=True,
1713 expected_upstream_ref='origin/master',
1714 issue=123456)
1715
Andrii Shyshkalov5c3d0b32017-02-16 17:47:31 +01001716 def test_gerrit_upload_squash_reupload_to_abandoned(self):
1717 self.mock(git_cl, 'DieWithError',
1718 lambda msg, change=None: self._mocked_call('DieWithError', msg))
1719 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1720 with self.assertRaises(SystemExitMock):
1721 self._run_gerrit_upload_test(
1722 ['--squash'],
1723 description,
1724 [],
1725 squash=True,
1726 expected_upstream_ref='origin/master',
1727 issue=123456,
1728 fetched_status='ABANDONED')
1729
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01001730 def test_gerrit_upload_squash_reupload_to_not_owned(self):
1731 self.mock(git_cl.gerrit_util, 'GetAccountDetails',
1732 lambda *_, **__: {'email': 'yet-another@example.com'})
1733 description = 'desc\nBUG=\n\nChange-Id: 123456789'
1734 self._run_gerrit_upload_test(
1735 ['--squash'],
1736 description,
1737 [],
1738 squash=True,
1739 expected_upstream_ref='origin/master',
1740 issue=123456,
1741 other_cl_owner='other@example.com')
1742 self.assertIn(
1743 'WARNING: change 123456 is owned by other@example.com, but you '
1744 'authenticate to Gerrit as yet-another@example.com.\n'
1745 'Uploading may fail due to lack of permissions',
1746 git_cl.sys.stdout.getvalue())
1747
rmistry@google.com2dd99862015-06-22 12:22:18 +00001748 def test_upload_branch_deps(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001749 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
rmistry@google.com2dd99862015-06-22 12:22:18 +00001750 def mock_run_git(*args, **_kwargs):
1751 if args[0] == ['for-each-ref',
1752 '--format=%(refname:short) %(upstream:short)',
1753 'refs/heads']:
1754 # Create a local branch dependency tree that looks like this:
1755 # test1 -> test2 -> test3 -> test4 -> test5
1756 # -> test3.1
1757 # test6 -> test0
1758 branch_deps = [
1759 'test2 test1', # test1 -> test2
1760 'test3 test2', # test2 -> test3
1761 'test3.1 test2', # test2 -> test3.1
1762 'test4 test3', # test3 -> test4
1763 'test5 test4', # test4 -> test5
1764 'test6 test0', # test0 -> test6
1765 'test7', # test7
1766 ]
1767 return '\n'.join(branch_deps)
1768 self.mock(git_cl, 'RunGit', mock_run_git)
1769
1770 class RecordCalls:
1771 times_called = 0
1772 record_calls = RecordCalls()
1773 def mock_CMDupload(*args, **_kwargs):
1774 record_calls.times_called += 1
1775 return 0
1776 self.mock(git_cl, 'CMDupload', mock_CMDupload)
1777
1778 self.calls = [
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01001779 (('ask_for_data', 'This command will checkout all dependent branches '
1780 'and run "git cl upload". Press Enter to continue, '
1781 'or Ctrl+C to abort'), ''),
1782 ]
rmistry@google.com2dd99862015-06-22 12:22:18 +00001783
1784 class MockChangelist():
1785 def __init__(self):
1786 pass
1787 def GetBranch(self):
1788 return 'test1'
1789 def GetIssue(self):
1790 return '123'
1791 def GetPatchset(self):
1792 return '1001'
tandrii@chromium.org4c72b082016-03-31 22:26:35 +00001793 def IsGerrit(self):
1794 return False
rmistry@google.com2dd99862015-06-22 12:22:18 +00001795
1796 ret = git_cl.upload_branch_deps(MockChangelist(), [])
1797 # CMDupload should have been called 5 times because of 5 dependent branches.
1798 self.assertEquals(5, record_calls.times_called)
1799 self.assertEquals(0, ret)
1800
tandrii@chromium.org65874e12016-03-04 12:03:02 +00001801 def test_gerrit_change_id(self):
1802 self.calls = [
1803 ((['git', 'write-tree'], ),
1804 'hashtree'),
1805 ((['git', 'rev-parse', 'HEAD~0'], ),
1806 'branch-parent'),
1807 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
1808 'A B <a@b.org> 1456848326 +0100'),
1809 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
1810 'C D <c@d.org> 1456858326 +0100'),
1811 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
1812 'hashchange'),
1813 ]
1814 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
1815 self.assertEqual(change_id, 'Ihashchange')
1816
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00001817 def test_desecription_append_footer(self):
1818 for init_desc, footer_line, expected_desc in [
1819 # Use unique desc first lines for easy test failure identification.
1820 ('foo', 'R=one', 'foo\n\nR=one'),
1821 ('foo\n\nR=one', 'BUG=', 'foo\n\nR=one\nBUG='),
1822 ('foo\n\nR=one', 'Change-Id: Ixx', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1823 ('foo\n\nChange-Id: Ixx', 'R=one', 'foo\n\nR=one\n\nChange-Id: Ixx'),
1824 ('foo\n\nR=one\n\nChange-Id: Ixx', 'TBR=two',
1825 'foo\n\nR=one\nTBR=two\n\nChange-Id: Ixx'),
1826 ('foo\n\nR=one\n\nChange-Id: Ixx', 'Foo-Bar: baz',
1827 'foo\n\nR=one\n\nChange-Id: Ixx\nFoo-Bar: baz'),
1828 ('foo\n\nChange-Id: Ixx', 'Foo-Bak: baz',
1829 'foo\n\nChange-Id: Ixx\nFoo-Bak: baz'),
1830 ('foo', 'Change-Id: Ixx', 'foo\n\nChange-Id: Ixx'),
1831 ]:
1832 desc = git_cl.ChangeDescription(init_desc)
1833 desc.append_footer(footer_line)
1834 self.assertEqual(desc.description, expected_desc)
1835
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001836 def test_update_reviewers(self):
1837 data = [
1838 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001839 ('foo\nR=xx', [], 'foo\nR=xx'),
1840 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001841 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001842 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
1843 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
1844 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001845 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +00001846 ('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 +00001847 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001848 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1849 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
1850 # Same as the line before, but full of whitespaces.
1851 (
1852 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
1853 'foo\nBar\n\nR=c@c\n BUG =',
1854 ),
1855 # Whitespaces aren't interpreted as new lines.
1856 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001857 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001858 expected = [i[2] for i in data]
1859 actual = []
1860 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001861 obj = git_cl.ChangeDescription(orig)
1862 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +00001863 actual.append(obj.description)
1864 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +00001865
wittman@chromium.org455dc922015-01-26 20:15:50 +00001866 def test_get_target_ref(self):
1867 # Check remote or remote branch not present.
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001868 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master'))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001869 self.assertEqual(None, git_cl.GetTargetRef(None,
1870 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001871 'master'))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +00001872
wittman@chromium.org455dc922015-01-26 20:15:50 +00001873 # Check default target refs for branches.
1874 self.assertEqual('refs/heads/master',
1875 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001876 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001877 self.assertEqual('refs/heads/master',
1878 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001879 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001880 self.assertEqual('refs/heads/master',
1881 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001882 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001883 self.assertEqual('refs/branch-heads/123',
1884 git_cl.GetTargetRef('origin',
1885 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001886 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001887 self.assertEqual('refs/diff/test',
1888 git_cl.GetTargetRef('origin',
1889 'refs/remotes/origin/refs/diff/test',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001890 None))
rmistry@google.comc68112d2015-03-03 12:48:06 +00001891 self.assertEqual('refs/heads/chrome/m42',
1892 git_cl.GetTargetRef('origin',
1893 'refs/remotes/origin/chrome/m42',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001894 None))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001895
1896 # Check target refs for user-specified target branch.
1897 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
1898 'refs/remotes/branch-heads/123'):
1899 self.assertEqual('refs/branch-heads/123',
1900 git_cl.GetTargetRef('origin',
1901 'refs/remotes/origin/master',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001902 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001903 for branch in ('origin/master', 'remotes/origin/master',
1904 'refs/remotes/origin/master'):
1905 self.assertEqual('refs/heads/master',
1906 git_cl.GetTargetRef('origin',
1907 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001908 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001909 for branch in ('master', 'heads/master', 'refs/heads/master'):
1910 self.assertEqual('refs/heads/master',
1911 git_cl.GetTargetRef('origin',
1912 'refs/remotes/branch-heads/123',
Andrii Shyshkalovf3a20ae2017-01-24 21:23:57 +01001913 branch))
wittman@chromium.org455dc922015-01-26 20:15:50 +00001914
wychen@chromium.orga872e752015-04-28 23:42:18 +00001915 def test_patch_when_dirty(self):
1916 # Patch when local tree is dirty
1917 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1918 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
1919
1920 def test_diff_when_dirty(self):
1921 # Do 'git cl diff' when local tree is dirty
1922 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
1923 self.assertNotEqual(git_cl.main(['diff']), 0)
1924
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001925 @staticmethod
1926 def _get_gerrit_codereview_server_calls(branch, value=None,
1927 git_short_host='host',
1928 detect_branch=True):
1929 """Returns calls executed by _GerritChangelistImpl.GetCodereviewServer.
1930
1931 If value is given, branch.<BRANCH>.gerritcodereview is already set.
1932 """
1933 calls = []
1934 if detect_branch:
1935 calls.append(((['git', 'symbolic-ref', 'HEAD'],), branch))
1936 calls.append(((['git', 'config', 'branch.' + branch + '.gerritserver'],),
1937 CERR1 if value is None else value))
1938 if value is None:
1939 calls += [
1940 ((['git', 'config', 'branch.' + branch + '.merge'],),
1941 'refs/heads' + branch),
1942 ((['git', 'config', 'branch.' + branch + '.remote'],),
1943 'origin'),
1944 ((['git', 'config', 'remote.origin.url'],),
1945 'https://%s.googlesource.com/my/repo' % git_short_host),
1946 ]
1947 return calls
1948
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001949 def _patch_common(self, default_codereview=None, force_codereview=False,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001950 new_branch=False, git_short_host='host',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001951 detect_gerrit_server=True,
1952 actual_codereview=None):
tandrii@chromium.org28253532016-04-14 13:46:56 +00001953 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgaa5ced12016-03-29 09:41:14 +00001954 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
1955 lambda x: '60001')
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001956 self.mock(git_cl._RietveldChangelistImpl, 'FetchDescription',
Kenneth Russell61e2ed42017-02-15 11:47:13 -08001957 lambda *a, **kw: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +00001958 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
1959
tandriidf09a462016-08-18 16:23:55 -07001960 if new_branch:
1961 self.calls = [((['git', 'new-branch', 'master'],), ''),]
1962 else:
1963 self.calls = [((['git', 'symbolic-ref', 'HEAD'],), 'master')]
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001964
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001965 if default_codereview:
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001966 if not force_codereview:
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001967 # These calls detect codereview to use.
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001968 self.calls += [
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001969 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
1970 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
1971 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
1972 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00001973 ]
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001974 if default_codereview == 'gerrit':
1975 if not force_codereview:
1976 self.calls += [
1977 ((['git', 'config', 'gerrit.host'],), 'true'),
1978 ]
1979 if detect_gerrit_server:
1980 self.calls += self._get_gerrit_codereview_server_calls(
1981 'master', git_short_host=git_short_host,
1982 detect_branch=not new_branch and force_codereview)
1983 actual_codereview = 'gerrit'
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01001984
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02001985 elif default_codereview == 'rietveld':
1986 self.calls += [
1987 ((['git', 'config', 'gerrit.host'],), CERR1),
1988 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
1989 ((['git', 'config', 'branch.master.rietveldserver',],), CERR1),
1990 ]
1991 actual_codereview = 'rietveld'
1992
1993 if actual_codereview == 'rietveld':
1994 self.calls += [
1995 ((['git', 'rev-parse', '--show-cdup'],), ''),
1996 ]
1997 if not default_codereview:
1998 self.calls += [
1999 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2000 ]
2001 elif actual_codereview == 'gerrit':
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002002 self.calls += [
2003 (('GetChangeDetail', git_short_host + '-review.googlesource.com',
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002004 '123456', ['ALL_REVISIONS', 'CURRENT_COMMIT']),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002005 {
2006 'current_revision': '7777777777',
2007 'revisions': {
2008 '1111111111': {
2009 '_number': 1,
2010 'fetch': {'http': {
2011 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2012 'ref': 'refs/changes/56/123456/1',
2013 }},
2014 },
2015 '7777777777': {
2016 '_number': 7,
2017 'fetch': {'http': {
2018 'url': 'https://%s.googlesource.com/my/repo' % git_short_host,
2019 'ref': 'refs/changes/56/123456/7',
2020 }},
2021 },
2022 },
2023 }),
2024 ]
wychen@chromium.orga872e752015-04-28 23:42:18 +00002025
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002026 def _common_patch_rietveld_successful(self, **kwargs):
2027 self._patch_common(**kwargs)
wychen@chromium.orga872e752015-04-28 23:42:18 +00002028 self.calls += [
tandrii33a46ff2016-08-23 05:53:40 -07002029 ((['git', 'config', 'branch.master.rietveldissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002030 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002031 ((['git', 'config', 'branch.master.rietveldserver',
2032 'https://codereview.example.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002033 ((['git', 'config', 'branch.master.rietveldpatchset', '60001'],),
tandrii5d48c322016-08-18 16:19:37 -07002034 ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002035 ((['git', 'commit', '-m',
2036 'Description\n\n' +
2037 'patch from issue 123456 at patchset 60001 ' +
2038 '(http://crrev.com/123456#ps60001)'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +00002039 ]
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002040
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002041 def test_patch_rietveld_default(self):
2042 self._common_patch_rietveld_successful(default_codereview='rietveld')
wychen@chromium.orga872e752015-04-28 23:42:18 +00002043 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2044
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002045 def test_patch_rietveld_successful_new_branch(self):
2046 self._common_patch_rietveld_successful(default_codereview='rietveld',
2047 new_branch=True)
tandrii@chromium.orgc2786d92016-05-31 19:53:50 +00002048 self.assertEqual(git_cl.main(['patch', '-b', 'master', '123456']), 0)
2049
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002050 def test_patch_rietveld_guess_by_url(self):
2051 self._common_patch_rietveld_successful(
2052 default_codereview=None, # It doesn't matter.
2053 actual_codereview='rietveld')
2054 self.assertEqual(git_cl.main(
2055 ['patch', 'https://codereview.example.com/123456']), 0)
2056
2057 def test_patch_rietveld_conflict(self):
2058 self._patch_common(default_codereview='rietveld')
skobes6468b902016-10-24 08:45:10 -07002059 GitCheckoutMock.conflict = True
wychen@chromium.orga872e752015-04-28 23:42:18 +00002060 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +00002061
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002062 def test_patch_gerrit_default(self):
2063 self._patch_common(default_codereview='gerrit', git_short_host='chromium',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002064 detect_gerrit_server=True)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002065 self.calls += [
2066 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
2067 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002068 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002069 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002070 ((['git', 'config', 'branch.master.gerritserver',
2071 'https://chromium-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002072 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002073 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002074 ]
2075 self.assertEqual(git_cl.main(['patch', '123456']), 0)
2076
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002077 def test_patch_gerrit_force(self):
2078 self._patch_common(default_codereview='gerrit', force_codereview=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002079 git_short_host='host', detect_gerrit_server=True)
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002080 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002081 ((['git', 'fetch', 'https://host.googlesource.com/my/repo',
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002082 'refs/changes/56/123456/7'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002083 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002084 ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002085 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002086 'https://host-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002087 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002088 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgdde64622016-04-13 17:11:21 +00002089 ]
2090 self.assertEqual(git_cl.main(['patch', '--gerrit', '123456']), 0)
2091
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002092 def test_patch_gerrit_guess_by_url(self):
2093 self._patch_common(
2094 default_codereview=None, # It doesn't matter what's default.
2095 actual_codereview='gerrit',
2096 git_short_host='else', detect_gerrit_server=False)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002097 self.calls += [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002098 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002099 'refs/changes/56/123456/1'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002100 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii33a46ff2016-08-23 05:53:40 -07002101 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
tandrii5d48c322016-08-18 16:19:37 -07002102 ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002103 ((['git', 'config', 'branch.master.gerritserver',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002104 'https://else-review.googlesource.com'],), ''),
tandrii33a46ff2016-08-23 05:53:40 -07002105 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002106 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002107 ]
2108 self.assertEqual(git_cl.main(
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002109 ['patch', 'https://else-review.googlesource.com/#/c/123456/1']), 0)
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002110
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002111 def test_patch_gerrit_guess_by_url_like_rietveld(self):
2112 self._patch_common(
2113 default_codereview=None, # It doesn't matter what's default.
2114 actual_codereview='gerrit',
2115 git_short_host='else', detect_gerrit_server=False)
2116 self.calls += [
2117 ((['git', 'fetch', 'https://else.googlesource.com/my/repo',
2118 'refs/changes/56/123456/1'],), ''),
2119 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2120 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2121 ''),
2122 ((['git', 'config', 'branch.master.gerritserver',
2123 'https://else-review.googlesource.com'],), ''),
2124 ((['git', 'config', 'branch.master.gerritpatchset', '1'],), ''),
2125 ((['git', 'cherry-pick', 'FETCH_HEAD'],), ''),
2126 ]
2127 self.assertEqual(git_cl.main(
2128 ['patch', 'https://else-review.googlesource.com/123456/1']), 0)
2129
2130 def test_patch_gerrit_conflict(self):
2131 self._patch_common(default_codereview='gerrit', detect_gerrit_server=True,
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002132 git_short_host='chromium')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002133 self.calls += [
2134 ((['git', 'fetch', 'https://chromium.googlesource.com/my/repo',
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002135 'refs/changes/56/123456/7'],), ''),
Aaron Gabled343c632017-03-15 11:02:26 -07002136 ((['git', 'config', 'branch.master.gerritissue', '123456'],),
2137 ''),
2138 ((['git', 'config', 'branch.master.gerritserver',
2139 'https://chromium-review.googlesource.com'],), ''),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002140 ((['git', 'config', 'branch.master.gerritpatchset', '7'],), ''),
tandrii5d48c322016-08-18 16:19:37 -07002141 ((['git', 'cherry-pick', 'FETCH_HEAD'],), CERR1),
2142 ((['DieWithError', 'Command "git cherry-pick FETCH_HEAD" failed.\n'],),
2143 SystemExitMock()),
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002144 ]
2145 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002146 git_cl.main(['patch', '123456'])
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00002147
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002148 def test_patch_gerrit_not_exists(self):
Andrii Shyshkalovc6c8b4c2016-11-09 20:51:20 +01002149 def notExists(_issue, *_, **kwargs):
2150 self.assertFalse(kwargs['ignore_404'])
2151 raise git_cl.gerrit_util.GerritError(404, '')
2152 self.mock(git_cl.gerrit_util, 'GetChangeDetail', notExists)
2153
tandriic2405f52016-10-10 08:13:15 -07002154 self.calls = [
2155 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2156 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2157 ((['git', 'config', 'branch.master.rietveldissue'],), CERR1),
2158 ((['git', 'config', 'branch.master.gerritissue'],), CERR1),
2159 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2160 ((['git', 'config', 'gerrit.host'],), 'true'),
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002161 ((['git', 'config', 'branch.master.gerritserver'],), CERR1),
2162 ((['git', 'config', 'branch.master.merge'],), 'refs/heads/master'),
2163 ((['git', 'config', 'branch.master.remote'],), 'origin'),
2164 ((['git', 'config', 'remote.origin.url'],),
2165 'https://chromium.googlesource.com/my/repo'),
2166 ((['DieWithError',
2167 'change 123456 at https://chromium-review.googlesource.com does not '
2168 'exist or you have no access to it'],), SystemExitMock()),
tandriic2405f52016-10-10 08:13:15 -07002169 ]
2170 with self.assertRaises(SystemExitMock):
Andrii Shyshkalovc9712392017-04-11 13:35:21 +02002171 self.assertEqual(1, git_cl.main(['patch', '123456']))
tandriic2405f52016-10-10 08:13:15 -07002172
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002173 def _checkout_calls(self):
2174 return [
2175 ((['git', 'config', '--local', '--get-regexp',
2176 'branch\\..*\\.rietveldissue'], ),
2177 ('branch.retrying.rietveldissue 1111111111\n'
2178 'branch.some-fix.rietveldissue 2222222222\n')),
2179 ((['git', 'config', '--local', '--get-regexp',
2180 'branch\\..*\\.gerritissue'], ),
2181 ('branch.ger-branch.gerritissue 123456\n'
2182 'branch.gbranch654.gerritissue 654321\n')),
2183 ]
2184
2185 def test_checkout_gerrit(self):
2186 """Tests git cl checkout <issue>."""
2187 self.calls = self._checkout_calls()
2188 self.calls += [((['git', 'checkout', 'ger-branch'], ), '')]
2189 self.assertEqual(0, git_cl.main(['checkout', '123456']))
2190
2191 def test_checkout_rietveld(self):
2192 """Tests git cl checkout <issue>."""
2193 self.calls = self._checkout_calls()
2194 self.calls += [((['git', 'checkout', 'some-fix'], ), '')]
2195 self.assertEqual(0, git_cl.main(['checkout', '2222222222']))
2196
2197 def test_checkout_not_found(self):
2198 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002199 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org5df290f2016-04-11 16:12:29 +00002200 self.calls = self._checkout_calls()
2201 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2202
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002203 def test_checkout_no_branch_issues(self):
2204 """Tests git cl checkout <issue>."""
tandrii@chromium.org28253532016-04-14 13:46:56 +00002205 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002206 self.calls = [
2207 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002208 'branch\\..*\\.rietveldissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002209 ((['git', 'config', '--local', '--get-regexp',
tandrii5d48c322016-08-18 16:19:37 -07002210 'branch\\..*\\.gerritissue'], ), CERR1),
tandrii@chromium.org26c8fd22016-04-11 21:33:21 +00002211 ]
2212 self.assertEqual(1, git_cl.main(['checkout', '99999']))
2213
tandrii@chromium.org28253532016-04-14 13:46:56 +00002214 def _test_gerrit_ensure_authenticated_common(self, auth,
2215 skip_auth_check=False):
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002216 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
2217 CookiesAuthenticatorMockFactory(hosts_with_creds=auth))
2218 self.mock(git_cl, 'DieWithError',
Christopher Lamf732cd52017-01-24 12:40:11 +11002219 lambda msg, change=None: self._mocked_call(['DieWithError', msg]))
tandrii@chromium.org28253532016-04-14 13:46:56 +00002220 self.calls = self._gerrit_ensure_auth_calls(skip_auth_check=skip_auth_check)
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002221 cl = git_cl.Changelist(codereview='gerrit')
tandrii@chromium.org28253532016-04-14 13:46:56 +00002222 cl.branch = 'master'
2223 cl.branchref = 'refs/heads/master'
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002224 cl.lookedup_issue = True
2225 return cl
2226
2227 def test_gerrit_ensure_authenticated_missing(self):
2228 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002229 'chromium.googlesource.com': ('git-is.ok', '', 'but gerrit is missing'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002230 })
2231 self.calls.append(
2232 ((['DieWithError',
2233 'Credentials for the following hosts are required:\n'
2234 ' chromium-review.googlesource.com\n'
2235 'These are read from ~/.gitcookies (or legacy ~/.netrc)\n'
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01002236 'You can (re)generate your credentials by visiting '
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002237 'https://chromium-review.googlesource.com/new-password'],), ''),)
2238 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2239
2240 def test_gerrit_ensure_authenticated_conflict(self):
tandrii@chromium.org28253532016-04-14 13:46:56 +00002241 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002242 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002243 'chromium.googlesource.com':
2244 ('git-one.example.com', None, 'secret1'),
2245 'chromium-review.googlesource.com':
2246 ('git-other.example.com', None, 'secret2'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002247 })
2248 self.calls.append(
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002249 (('ask_for_data', 'If you know what you are doing '
2250 'press Enter to continue, or Ctrl+C to abort'), ''))
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002251 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2252
2253 def test_gerrit_ensure_authenticated_ok(self):
2254 cl = self._test_gerrit_ensure_authenticated_common(auth={
Andrii Shyshkalovbb86fbb2017-03-24 14:59:28 +01002255 'chromium.googlesource.com':
2256 ('git-same.example.com', None, 'secret'),
2257 'chromium-review.googlesource.com':
2258 ('git-same.example.com', None, 'secret'),
tandrii@chromium.orgfe30f182016-04-13 12:15:04 +00002259 })
2260 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2261
tandrii@chromium.org28253532016-04-14 13:46:56 +00002262 def test_gerrit_ensure_authenticated_skipped(self):
2263 cl = self._test_gerrit_ensure_authenticated_common(
2264 auth={}, skip_auth_check=True)
2265 self.assertIsNone(cl.EnsureAuthenticated(force=False))
2266
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002267 def test_cmd_set_commit_rietveld(self):
tandrii4d843592016-07-27 08:22:56 -07002268 self.mock(git_cl._RietveldChangelistImpl, 'SetFlags',
2269 lambda _, v: self._mocked_call(['SetFlags', v]))
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002270 self.calls = [
2271 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002272 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002273 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2274 ((['git', 'config', 'rietveld.server'],), ''),
2275 ((['git', 'config', 'rietveld.server'],), ''),
2276 ((['git', 'config', 'branch.feature.rietveldserver'],),
2277 'https://codereview.chromium.org'),
tandrii4d843592016-07-27 08:22:56 -07002278 ((['SetFlags', {'commit': '1', 'cq_dry_run': '0'}], ), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002279 ]
2280 self.assertEqual(0, git_cl.main(['set-commit']))
2281
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002282 def _cmd_set_commit_gerrit_common(self, vote, notify=None):
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002283 self.mock(git_cl.gerrit_util, 'SetReview',
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002284 lambda h, i, labels, notify=None:
2285 self._mocked_call(['SetReview', h, i, labels, notify]))
2286
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002287 self.calls = [
2288 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002289 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2290 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002291 ((['git', 'config', 'branch.feature.gerritserver'],),
2292 'https://chromium-review.googlesource.com'),
2293 ((['SetReview', 'chromium-review.googlesource.com', 123,
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002294 {'Commit-Queue': vote}, notify],), ''),
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002295 ]
tandriid9e5ce52016-07-13 02:32:59 -07002296
2297 def test_cmd_set_commit_gerrit_clear(self):
2298 self._cmd_set_commit_gerrit_common(0)
2299 self.assertEqual(0, git_cl.main(['set-commit', '-c']))
2300
2301 def test_cmd_set_commit_gerrit_dry(self):
Andrii Shyshkalov828701b2016-12-09 10:46:47 +01002302 self._cmd_set_commit_gerrit_common(1, notify='NONE')
tandrii@chromium.orgfa330e82016-04-13 17:09:52 +00002303 self.assertEqual(0, git_cl.main(['set-commit', '-d']))
2304
tandriid9e5ce52016-07-13 02:32:59 -07002305 def test_cmd_set_commit_gerrit(self):
2306 self._cmd_set_commit_gerrit_common(2)
2307 self.assertEqual(0, git_cl.main(['set-commit']))
2308
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002309 def test_description_display(self):
2310 out = StringIO.StringIO()
2311 self.mock(git_cl.sys, 'stdout', out)
2312
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002313 self.mock(git_cl, 'Changelist', ChangelistMock)
2314 ChangelistMock.desc = 'foo\n'
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002315
2316 self.assertEqual(0, git_cl.main(['description', '-d']))
2317 self.assertEqual('foo\n', out.getvalue())
2318
2319 def test_description_rietveld(self):
2320 out = StringIO.StringIO()
2321 self.mock(git_cl.sys, 'stdout', out)
martiniss6eda05f2016-06-30 10:18:35 -07002322 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'foobar')
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002323
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002324 self.assertEqual(0, git_cl.main([
Andrii Shyshkalov28d840e2017-04-10 15:45:09 +02002325 'description', '-d', '--rietveld', 'https://code.review.org/123123']))
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002326 self.assertEqual('foobar\n', out.getvalue())
2327
iannucci3c972b92016-08-17 13:24:10 -07002328 def test_StatusFieldOverrideIssueMissingArgs(self):
2329 out = StringIO.StringIO()
2330 self.mock(git_cl.sys, 'stderr', out)
2331
2332 try:
2333 self.assertEqual(git_cl.main(['status', '--issue', '1']), 0)
2334 except SystemExit as ex:
2335 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002336 self.assertRegexpMatches(out.getvalue(), r'--issue must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002337
2338 out = StringIO.StringIO()
2339 self.mock(git_cl.sys, 'stderr', out)
2340
2341 try:
2342 self.assertEqual(git_cl.main(['status', '--issue', '1', '--rietveld']), 0)
2343 except SystemExit as ex:
2344 self.assertEqual(ex.code, 2)
iannuccie53c9352016-08-17 14:40:40 -07002345 self.assertRegexpMatches(out.getvalue(), r'--field must be specified')
iannucci3c972b92016-08-17 13:24:10 -07002346
2347 def test_StatusFieldOverrideIssue(self):
2348 out = StringIO.StringIO()
2349 self.mock(git_cl.sys, 'stdout', out)
2350
2351 def assertIssue(cl_self, *_args):
2352 self.assertEquals(cl_self.issue, 1)
2353 return 'foobar'
2354
2355 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2356 self.calls = [
2357 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2358 ((['git', 'config', 'rietveld.server'],), ''),
2359 ((['git', 'config', 'rietveld.server'],), ''),
2360 ]
iannuccie53c9352016-08-17 14:40:40 -07002361 self.assertEqual(
2362 git_cl.main(['status', '--issue', '1', '--rietveld', '--field', 'desc']),
2363 0)
iannucci3c972b92016-08-17 13:24:10 -07002364 self.assertEqual(out.getvalue(), 'foobar\n')
2365
iannuccie53c9352016-08-17 14:40:40 -07002366 def test_SetCloseOverrideIssue(self):
2367 def assertIssue(cl_self, *_args):
2368 self.assertEquals(cl_self.issue, 1)
2369 return 'foobar'
2370
2371 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2372 self.mock(git_cl.Changelist, 'CloseIssue', lambda *_: None)
2373 self.calls = [
2374 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2375 ((['git', 'config', 'rietveld.server'],), ''),
2376 ((['git', 'config', 'rietveld.server'],), ''),
2377 ]
2378 self.assertEqual(
2379 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2380
2381 def test_SetCommitOverrideIssue(self):
2382 def assertIssue(cl_self, *_args):
2383 self.assertEquals(cl_self.issue, 1)
2384 return 'foobar'
2385
2386 self.mock(git_cl.Changelist, 'GetDescription', assertIssue)
2387 self.mock(git_cl.Changelist, 'SetCQState', lambda *_: None)
2388 self.calls = [
2389 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2390 ((['git', 'config', 'rietveld.server'],), ''),
2391 ((['git', 'config', 'rietveld.server'],), ''),
2392 ((['git', 'symbolic-ref', 'HEAD'],), ''),
2393 ((['git', 'config', 'rietveld.server'],), ''),
2394 ((['git', 'config', 'rietveld.server'],), ''),
2395 ]
2396 self.assertEqual(
2397 git_cl.main(['set-close', '--issue', '1', '--rietveld']), 0)
2398
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002399 def test_description_gerrit(self):
2400 out = StringIO.StringIO()
2401 self.mock(git_cl.sys, 'stdout', out)
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002402 self.calls = [
Andrii Shyshkalov8039be72017-01-26 09:38:18 +01002403 (('GetChangeDetail', 'code.review.org',
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002404 '123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
2405 {
2406 'current_revision': 'sha1',
2407 'revisions': {'sha1': {
2408 'commit': {'message': 'foobar'},
2409 }},
2410 }),
2411 ]
martiniss@chromium.org2b55fe32016-04-26 20:28:54 +00002412 self.assertEqual(0, git_cl.main([
2413 'description', 'https://code.review.org/123123', '-d', '--gerrit']))
2414 self.assertEqual('foobar\n', out.getvalue())
2415
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002416 def test_description_set_raw(self):
2417 out = StringIO.StringIO()
2418 self.mock(git_cl.sys, 'stdout', out)
2419
2420 self.mock(git_cl, 'Changelist', ChangelistMock)
2421 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
2422
2423 self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
2424 self.assertEqual('hihi', ChangelistMock.desc)
2425
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002426 def test_description_appends_bug_line(self):
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002427 current_desc = 'Some.\n\nChange-Id: xxx'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002428
2429 def RunEditor(desc, _, **kwargs):
2430 self.assertEquals(
2431 '# Enter a description of the change.\n'
2432 '# This will be displayed on the codereview site.\n'
2433 '# The first line will also be used as the subject of the review.\n'
2434 '#--------------------This line is 72 characters long'
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002435 '--------------------\n'
Aaron Gable3a16ed12017-03-23 10:51:55 -07002436 'Some.\n\nChange-Id: xxx\nBug: ',
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002437 desc)
tandrii@chromium.org601e1d12016-06-03 13:03:54 +00002438 # Simulate user changing something.
Aaron Gable3a16ed12017-03-23 10:51:55 -07002439 return 'Some.\n\nChange-Id: xxx\nBug: 123'
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002440
dsansomee2d6fd92016-09-08 00:10:47 -07002441 def UpdateDescriptionRemote(_, desc, force=False):
Aaron Gable3a16ed12017-03-23 10:51:55 -07002442 self.assertEquals(desc, 'Some.\n\nChange-Id: xxx\nBug: 123')
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002443
2444 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2445 self.mock(git_cl.Changelist, 'GetDescription',
2446 lambda *args: current_desc)
2447 self.mock(git_cl._GerritChangelistImpl, 'UpdateDescriptionRemote',
2448 UpdateDescriptionRemote)
2449 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
2450
2451 self.calls = [
2452 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002453 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii5d48c322016-08-18 16:19:37 -07002454 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2455 ((['git', 'config', 'rietveld.bug-prefix'],), CERR1),
tandrii@chromium.orgd605a512016-06-03 09:55:00 +00002456 ((['git', 'config', 'core.editor'],), 'vi'),
2457 ]
2458 self.assertEqual(0, git_cl.main(['description', '--gerrit']))
2459
martiniss@chromium.orgd6648e22016-04-29 19:22:16 +00002460 def test_description_set_stdin(self):
2461 out = StringIO.StringIO()
2462 self.mock(git_cl.sys, 'stdout', out)
2463
2464 self.mock(git_cl, 'Changelist', ChangelistMock)
2465 self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
2466
2467 self.assertEqual(0, git_cl.main(['description', '-n', '-']))
2468 self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
2469
kmarshall3bff56b2016-06-06 18:31:47 -07002470 def test_archive(self):
tandrii1c67da62016-06-10 07:35:53 -07002471 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2472
kmarshall3bff56b2016-06-06 18:31:47 -07002473 self.calls = \
2474 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2475 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
tandrii33a46ff2016-08-23 05:53:40 -07002476 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002477 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2478 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
tandrii33a46ff2016-08-23 05:53:40 -07002479 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2480 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2481 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
kmarshall3bff56b2016-06-06 18:31:47 -07002482 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2483 ((['git', 'tag', 'git-cl-archived-456-foo', 'foo'],), ''),
2484 ((['git', 'branch', '-D', 'foo'],), '')]
2485
kmarshall3bff56b2016-06-06 18:31:47 -07002486 self.mock(git_cl, 'get_cl_statuses',
2487 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002488 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2489 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2490 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002491
2492 self.assertEqual(0, git_cl.main(['archive', '-f']))
2493
2494 def test_archive_current_branch_fails(self):
tandrii1c67da62016-06-10 07:35:53 -07002495 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
kmarshall3bff56b2016-06-06 18:31:47 -07002496 self.calls = \
2497 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2498 'refs/heads/master'),
tandrii33a46ff2016-08-23 05:53:40 -07002499 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
tandrii5d48c322016-08-18 16:19:37 -07002500 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2501 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
kmarshall3bff56b2016-06-06 18:31:47 -07002502 ((['git', 'symbolic-ref', 'HEAD'],), 'master')]
2503
kmarshall9249e012016-08-23 12:02:16 -07002504 self.mock(git_cl, 'get_cl_statuses',
2505 lambda branches, fine_grained, max_processes:
2506 [(MockChangelistWithBranchAndIssue('master', 1), 'closed')])
2507
2508 self.assertEqual(1, git_cl.main(['archive', '-f']))
2509
2510 def test_archive_dry_run(self):
2511 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2512
2513 self.calls = \
2514 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2515 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2516 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2517 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2518 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2519 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2520 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2521 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2522 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),]
kmarshall3bff56b2016-06-06 18:31:47 -07002523
2524 self.mock(git_cl, 'get_cl_statuses',
2525 lambda branches, fine_grained, max_processes:
kmarshall9249e012016-08-23 12:02:16 -07002526 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2527 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2528 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
kmarshall3bff56b2016-06-06 18:31:47 -07002529
kmarshall9249e012016-08-23 12:02:16 -07002530 self.assertEqual(0, git_cl.main(['archive', '-f', '--dry-run']))
2531
2532 def test_archive_no_tags(self):
2533 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2534
2535 self.calls = \
2536 [((['git', 'for-each-ref', '--format=%(refname)', 'refs/heads'],),
2537 'refs/heads/master\nrefs/heads/foo\nrefs/heads/bar'),
2538 ((['git', 'config', 'branch.master.rietveldissue'],), '1'),
2539 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2540 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
2541 ((['git', 'config', 'branch.foo.rietveldissue'],), '456'),
2542 ((['git', 'config', 'branch.bar.rietveldissue'],), CERR1),
2543 ((['git', 'config', 'branch.bar.gerritissue'],), '789'),
2544 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
2545 ((['git', 'branch', '-D', 'foo'],), '')]
2546
2547 self.mock(git_cl, 'get_cl_statuses',
2548 lambda branches, fine_grained, max_processes:
2549 [(MockChangelistWithBranchAndIssue('master', 1), 'open'),
2550 (MockChangelistWithBranchAndIssue('foo', 456), 'closed'),
2551 (MockChangelistWithBranchAndIssue('bar', 789), 'open')])
2552
2553 self.assertEqual(0, git_cl.main(['archive', '-f', '--notags']))
kmarshall3bff56b2016-06-06 18:31:47 -07002554
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002555 def test_cmd_issue_erase_existing(self):
2556 out = StringIO.StringIO()
2557 self.mock(git_cl.sys, 'stdout', out)
2558 self.calls = [
2559 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002560 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2561 ((['git', 'config', 'branch.feature.gerritissue'],), '123'),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002562 # Let this command raise exception (retcode=1) - it should be ignored.
2563 ((['git', 'config', '--unset', 'branch.feature.last-upload-hash'],),
tandrii5d48c322016-08-18 16:19:37 -07002564 CERR1),
2565 ((['git', 'config', '--unset', 'branch.feature.gerritissue'],), ''),
2566 ((['git', 'config', '--unset', 'branch.feature.gerritpatchset'],), ''),
tandrii@chromium.org9b7fd712016-06-01 13:45:20 +00002567 ((['git', 'config', '--unset', 'branch.feature.gerritserver'],), ''),
2568 ((['git', 'config', '--unset', 'branch.feature.gerritsquashhash'],),
2569 ''),
2570 ]
2571 self.assertEqual(0, git_cl.main(['issue', '0']))
2572
phajdan.jre328cf92016-08-22 04:12:17 -07002573 def test_cmd_issue_json(self):
2574 out = StringIO.StringIO()
2575 self.mock(git_cl.sys, 'stdout', out)
2576 self.calls = [
2577 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002578 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
phajdan.jre328cf92016-08-22 04:12:17 -07002579 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2580 ((['git', 'config', 'rietveld.server'],),
2581 'https://codereview.chromium.org'),
2582 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2583 (('write_json', 'output.json',
2584 {'issue': 123, 'issue_url': 'https://codereview.chromium.org/123'}),
2585 ''),
2586 ]
2587 self.assertEqual(0, git_cl.main(['issue', '--json', 'output.json']))
2588
tandriide281ae2016-10-12 06:02:30 -07002589 def test_git_cl_try_default_cq_dry_run(self):
tandrii9de9ec62016-07-13 03:01:59 -07002590 self.mock(git_cl.Changelist, 'GetChange',
2591 lambda _, *a: (
2592 self._mocked_call(['GetChange']+list(a))))
2593 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2594 lambda *_, **__: (
2595 self._mocked_call(['DoGetTryMasters'])))
tandrii9de9ec62016-07-13 03:01:59 -07002596 self.mock(git_cl._RietveldChangelistImpl, 'SetCQState',
2597 lambda _, s: self._mocked_call(['SetCQState', s]))
2598 self.calls = [
2599 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
tandrii33a46ff2016-08-23 05:53:40 -07002600 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
tandrii9de9ec62016-07-13 03:01:59 -07002601 ((['git', 'config', 'rietveld.autoupdate'],), ''),
2602 ((['git', 'config', 'rietveld.server'],),
2603 'https://codereview.chromium.org'),
2604 ((['git', 'config', 'branch.feature.rietveldserver'],), ''),
2605 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2606 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2607 ((['get_or_create_merge_base', 'feature', 'feature'],),
2608 'fake_ancestor_sha'),
2609 ((['GetChange', 'fake_ancestor_sha', None], ),
2610 git_cl.presubmit_support.GitChange(
2611 '', '', '', '', '', '', '', '')),
2612 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2613 ((['DoGetTryMasters'], ), None),
tandrii9de9ec62016-07-13 03:01:59 -07002614 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2615 ]
2616 out = StringIO.StringIO()
2617 self.mock(git_cl.sys, 'stdout', out)
2618 self.assertEqual(0, git_cl.main(['try']))
2619 self.assertEqual(
2620 out.getvalue(),
2621 'scheduled CQ Dry Run on https://codereview.chromium.org/123\n')
2622
tandrii8c5a3532016-11-04 07:52:02 -07002623 def test_git_cl_try_default_cq_dry_run_gerrit(self):
2624 self.mock(git_cl.Changelist, 'GetChange',
2625 lambda _, *a: (
2626 self._mocked_call(['GetChange']+list(a))))
2627 self.mock(git_cl.presubmit_support, 'DoGetTryMasters',
2628 lambda *_, **__: (
2629 self._mocked_call(['DoGetTryMasters'])))
2630 self.mock(git_cl._GerritChangelistImpl, 'SetCQState',
2631 lambda _, s: self._mocked_call(['SetCQState', s]))
2632
tandrii8c5a3532016-11-04 07:52:02 -07002633 self.calls = [
2634 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2635 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2636 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2637 ((['git', 'config', 'branch.feature.gerritserver'],),
2638 'https://chromium-review.googlesource.com'),
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002639 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
2640 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
2641 'project': 'depot_tools',
2642 'status': 'OPEN',
2643 'owner': {'email': 'owner@e.mail'},
2644 'revisions': {
2645 'deadbeaf': {
2646 '_number': 6,
2647 },
2648 'beeeeeef': {
2649 '_number': 7,
2650 'fetch': {'http': {
2651 'url': 'https://chromium.googlesource.com/depot_tools',
2652 'ref': 'refs/changes/56/123456/7'
2653 }},
2654 },
2655 },
2656 }),
tandrii8c5a3532016-11-04 07:52:02 -07002657 ((['git', 'config', 'branch.feature.merge'],), 'feature'),
2658 ((['git', 'config', 'branch.feature.remote'],), 'origin'),
2659 ((['get_or_create_merge_base', 'feature', 'feature'],),
2660 'fake_ancestor_sha'),
2661 ((['GetChange', 'fake_ancestor_sha', None], ),
2662 git_cl.presubmit_support.GitChange(
2663 '', '', '', '', '', '', '', '')),
2664 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2665 ((['DoGetTryMasters'], ), None),
2666 ((['SetCQState', git_cl._CQState.DRY_RUN], ), None),
2667 ]
2668 out = StringIO.StringIO()
2669 self.mock(git_cl.sys, 'stdout', out)
2670 self.assertEqual(0, git_cl.main(['try']))
2671 self.assertEqual(
2672 out.getvalue(),
2673 'scheduled CQ Dry Run on '
2674 'https://chromium-review.googlesource.com/123456\n')
2675
2676 def test_git_cl_try_buildbucket_with_properties_rietveld(self):
2677 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2678 lambda _: {
2679 'owner_email': 'owner@e.mail',
2680 'private': False,
2681 'closed': False,
2682 'project': 'depot_tools',
2683 'patchsets': [20001],
2684 })
tandriide281ae2016-10-12 06:02:30 -07002685 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2686 self.calls = [
2687 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2688 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2689 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2690 ((['git', 'config', 'rietveld.server'],),
2691 'https://codereview.chromium.org'),
tandriide281ae2016-10-12 06:02:30 -07002692 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002693 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
tandriide281ae2016-10-12 06:02:30 -07002694 ]
2695
2696 def _buildbucket_retry(*_, **kw):
2697 # self.maxDiff = 10000
2698 body = json.loads(kw['body'])
2699 self.assertEqual(len(body['builds']), 1)
2700 build = body['builds'][0]
2701 params = json.loads(build.pop('parameters_json'))
2702 self.assertEqual(params, {
2703 u'builder_name': u'win',
2704 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2705 u'revision': None}],
2706 u'properties': {
2707 u'category': u'git_cl_try',
2708 u'issue': 123,
2709 u'key': u'val',
2710 u'json': [{u'a': 1}, None],
2711 u'master': u'tryserver.chromium',
2712 u'patch_project': u'depot_tools',
2713 u'patch_storage': u'rietveld',
2714 u'patchset': 20001,
tandriide281ae2016-10-12 06:02:30 -07002715 u'rietveld': u'https://codereview.chromium.org',
2716 }
2717 })
2718 self.assertEqual(build, {
2719 u'bucket': u'master.tryserver.chromium',
2720 u'client_operation_id': u'uuid4',
2721 u'tags': [u'builder:win',
2722 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
borenet6c0efe62016-10-19 08:13:29 -07002723 u'user_agent:git_cl_try',
2724 u'master:tryserver.chromium'],
tandriide281ae2016-10-12 06:02:30 -07002725 })
2726
2727 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2728
2729 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2730 self.assertEqual(0, git_cl.main([
2731 'try', '-m', 'tryserver.chromium', '-b', 'win',
2732 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2733 self.assertRegexpMatches(
2734 git_cl.sys.stdout.getvalue(),
borenet6c0efe62016-10-19 08:13:29 -07002735 'Tried jobs on:\nBucket: master.tryserver.chromium')
2736
tandrii8c5a3532016-11-04 07:52:02 -07002737 def test_git_cl_try_buildbucket_with_properties_gerrit(self):
2738 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 7)
2739 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2740
tandrii8c5a3532016-11-04 07:52:02 -07002741 self.calls = [
2742 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2743 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
2744 ((['git', 'config', 'branch.feature.gerritissue'],), '123456'),
2745 ((['git', 'config', 'branch.feature.gerritserver'],),
2746 'https://chromium-review.googlesource.com'),
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01002747 (('GetChangeDetail', 'chromium-review.googlesource.com', '123456',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002748 ['DETAILED_ACCOUNTS', 'ALL_REVISIONS', 'CURRENT_COMMIT']), {
tandrii8c5a3532016-11-04 07:52:02 -07002749 'project': 'depot_tools',
Andrii Shyshkaloveadad922017-01-26 09:38:30 +01002750 'status': 'OPEN',
2751 'owner': {'email': 'owner@e.mail'},
tandrii8c5a3532016-11-04 07:52:02 -07002752 'revisions': {
2753 'deadbeaf': {
2754 '_number': 6,
2755 },
2756 'beeeeeef': {
2757 '_number': 7,
2758 'fetch': {'http': {
2759 'url': 'https://chromium.googlesource.com/depot_tools',
2760 'ref': 'refs/changes/56/123456/7'
2761 }},
2762 },
2763 },
2764 }),
2765 ]
2766
2767 def _buildbucket_retry(*_, **kw):
2768 # self.maxDiff = 10000
2769 body = json.loads(kw['body'])
2770 self.assertEqual(len(body['builds']), 1)
2771 build = body['builds'][0]
2772 params = json.loads(build.pop('parameters_json'))
2773 self.assertEqual(params, {
2774 u'builder_name': u'win',
2775 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2776 u'revision': None}],
2777 u'properties': {
2778 u'category': u'git_cl_try',
2779 u'key': u'val',
2780 u'json': [{u'a': 1}, None],
2781 u'master': u'tryserver.chromium',
2782
2783 u'patch_gerrit_url':
2784 u'https://chromium-review.googlesource.com',
2785 u'patch_issue': 123456,
2786 u'patch_project': u'depot_tools',
2787 u'patch_ref': u'refs/changes/56/123456/7',
2788 u'patch_repository_url':
2789 u'https://chromium.googlesource.com/depot_tools',
2790 u'patch_set': 7,
2791 u'patch_storage': u'gerrit',
2792 }
2793 })
2794 self.assertEqual(build, {
2795 u'bucket': u'master.tryserver.chromium',
2796 u'client_operation_id': u'uuid4',
2797 u'tags': [
2798 u'builder:win',
2799 u'buildset:patch/gerrit/chromium-review.googlesource.com/123456/7',
2800 u'user_agent:git_cl_try',
2801 u'master:tryserver.chromium'],
2802 })
2803
2804 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2805
2806 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2807 self.assertEqual(0, git_cl.main([
2808 'try', '-m', 'tryserver.chromium', '-b', 'win',
2809 '-p', 'key=val', '-p', 'json=[{"a":1}, null]']))
2810 self.assertRegexpMatches(
2811 git_cl.sys.stdout.getvalue(),
2812 'Tried jobs on:\nBucket: master.tryserver.chromium')
2813
borenet6c0efe62016-10-19 08:13:29 -07002814 def test_git_cl_try_buildbucket_bucket_flag(self):
tandrii8c5a3532016-11-04 07:52:02 -07002815 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties',
2816 lambda _: {
2817 'owner_email': 'owner@e.mail',
2818 'private': False,
2819 'closed': False,
2820 'project': 'depot_tools',
2821 'patchsets': [20001],
2822 })
borenet6c0efe62016-10-19 08:13:29 -07002823 self.mock(git_cl.uuid, 'uuid4', lambda: 'uuid4')
2824 self.calls = [
2825 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2826 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2827 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2828 ((['git', 'config', 'rietveld.server'],),
2829 'https://codereview.chromium.org'),
borenet6c0efe62016-10-19 08:13:29 -07002830 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
tandrii8c5a3532016-11-04 07:52:02 -07002831 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
borenet6c0efe62016-10-19 08:13:29 -07002832 ]
2833
2834 def _buildbucket_retry(*_, **kw):
borenet6c0efe62016-10-19 08:13:29 -07002835 body = json.loads(kw['body'])
2836 self.assertEqual(len(body['builds']), 1)
2837 build = body['builds'][0]
2838 params = json.loads(build.pop('parameters_json'))
2839 self.assertEqual(params, {
2840 u'builder_name': u'win',
2841 u'changes': [{u'author': {u'email': u'owner@e.mail'},
2842 u'revision': None}],
2843 u'properties': {
2844 u'category': u'git_cl_try',
2845 u'issue': 123,
2846 u'patch_project': u'depot_tools',
2847 u'patch_storage': u'rietveld',
2848 u'patchset': 20001,
borenet6c0efe62016-10-19 08:13:29 -07002849 u'rietveld': u'https://codereview.chromium.org',
2850 }
2851 })
2852 self.assertEqual(build, {
2853 u'bucket': u'test.bucket',
2854 u'client_operation_id': u'uuid4',
2855 u'tags': [u'builder:win',
2856 u'buildset:patch/rietveld/codereview.chromium.org/123/20001',
2857 u'user_agent:git_cl_try'],
2858 })
2859
2860 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2861
2862 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2863 self.assertEqual(0, git_cl.main([
2864 'try', '-B', 'test.bucket', '-b', 'win']))
2865 self.assertRegexpMatches(
2866 git_cl.sys.stdout.getvalue(),
2867 'Tried jobs on:\nBucket: test.bucket')
tandriide281ae2016-10-12 06:02:30 -07002868
qyearsley123a4682016-10-26 09:12:17 -07002869 def test_git_cl_try_bots_on_multiple_masters(self):
2870 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda _: 20001)
2871 self.calls = [
2872 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2873 ((['git', 'config', 'branch.feature.rietveldissue'],), '123'),
2874 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
2875 ((['git', 'config', 'rietveld.server'],),
tandrii8c5a3532016-11-04 07:52:02 -07002876 'https://codereview.chromium.org'),
qyearsley123a4682016-10-26 09:12:17 -07002877 ((['git', 'config', 'branch.feature.rietveldserver'],), CERR1),
2878 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
2879 ]
2880
2881 def _buildbucket_retry(*_, **kw):
2882 body = json.loads(kw['body'])
2883 self.assertEqual(len(body['builds']), 2)
2884
2885 first_build_params = json.loads(body['builds'][0]['parameters_json'])
2886 self.assertEqual(first_build_params['builder_name'], 'builder1')
2887 self.assertEqual(first_build_params['properties']['master'], 'master1')
2888
2889 first_build_params = json.loads(body['builds'][1]['parameters_json'])
2890 self.assertEqual(first_build_params['builder_name'], 'builder2')
2891 self.assertEqual(first_build_params['properties']['master'], 'master2')
2892
2893 self.mock(git_cl, '_buildbucket_retry', _buildbucket_retry)
2894
2895 self.mock(git_cl.urllib2, 'urlopen', lambda _: StringIO.StringIO(
2896 json.dumps({'builder1': ['master1'], 'builder2': ['master2']})))
2897
2898 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2899 self.assertEqual(
2900 0, git_cl.main(['try', '-b', 'builder1', '-b', 'builder2']))
2901 self.assertEqual(
2902 git_cl.sys.stdout.getvalue(),
2903 'Tried jobs on:\n'
2904 'Bucket: master.master1\n'
2905 ' builder1: []\n'
2906 'Bucket: master.master2\n'
2907 ' builder2: []\n'
2908 'To see results here, run: git cl try-results\n'
2909 'To see results in browser, run: git cl web\n')
2910
tandrii16e0b4e2016-06-07 10:34:28 -07002911 def _common_GerritCommitMsgHookCheck(self):
2912 self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
2913 self.mock(git_cl.os.path, 'abspath',
2914 lambda path: self._mocked_call(['abspath', path]))
2915 self.mock(git_cl.os.path, 'exists',
2916 lambda path: self._mocked_call(['exists', path]))
2917 self.mock(git_cl.gclient_utils, 'FileRead',
2918 lambda path: self._mocked_call(['FileRead', path]))
2919 self.mock(git_cl.gclient_utils, 'rm_file_or_tree',
2920 lambda path: self._mocked_call(['rm_file_or_tree', path]))
2921 self.calls = [
2922 ((['git', 'rev-parse', '--show-cdup'],), '../'),
2923 ((['abspath', '../'],), '/abs/git_repo_root'),
2924 ]
2925 return git_cl.Changelist(codereview='gerrit', issue=123)
2926
2927 def test_GerritCommitMsgHookCheck_custom_hook(self):
2928 cl = self._common_GerritCommitMsgHookCheck()
2929 self.calls += [
2930 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2931 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2932 '#!/bin/sh\necho "custom hook"')
2933 ]
2934 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2935
2936 def test_GerritCommitMsgHookCheck_not_exists(self):
2937 cl = self._common_GerritCommitMsgHookCheck()
2938 self.calls += [
2939 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), False),
2940 ]
2941 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2942
2943 def test_GerritCommitMsgHookCheck(self):
2944 cl = self._common_GerritCommitMsgHookCheck()
2945 self.calls += [
2946 ((['exists', '/abs/git_repo_root/.git/hooks/commit-msg'],), True),
2947 ((['FileRead', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2948 '...\n# From Gerrit Code Review\n...\nadd_ChangeId()\n'),
Andrii Shyshkalovabc26ac2017-03-14 14:49:38 +01002949 (('ask_for_data', 'Do you want to remove it now? [Yes/No]: '), 'Yes'),
tandrii16e0b4e2016-06-07 10:34:28 -07002950 ((['rm_file_or_tree', '/abs/git_repo_root/.git/hooks/commit-msg'],),
2951 ''),
2952 ]
2953 cl._codereview_impl._GerritCommitMsgHookCheck(offer_removal=True)
2954
tandriic4344b52016-08-29 06:04:54 -07002955 def test_GerritCmdLand(self):
2956 self.calls += [
2957 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
2958 ((['git', 'config', 'branch.feature.gerritsquashhash'],),
2959 'deadbeaf'),
2960 ((['git', 'diff', 'deadbeaf'],), ''), # No diff.
2961 ((['git', 'config', 'branch.feature.gerritserver'],),
2962 'chromium-review.googlesource.com'),
2963 ]
2964 cl = git_cl.Changelist(issue=123, codereview='gerrit')
2965 cl._codereview_impl._GetChangeDetail = lambda _: {
2966 'labels': {},
2967 'current_revision': 'deadbeaf',
2968 }
agable32978d92016-11-01 12:55:02 -07002969 cl._codereview_impl._GetChangeCommit = lambda: {
2970 'commit': 'deadbeef',
Aaron Gable02cdbb42016-12-13 16:24:25 -08002971 'web_links': [{'name': 'gitiles',
agable32978d92016-11-01 12:55:02 -07002972 'url': 'https://git.googlesource.com/test/+/deadbeef'}],
2973 }
tandriic4344b52016-08-29 06:04:54 -07002974 cl._codereview_impl.SubmitIssue = lambda wait_for_merge: None
tandrii8da412c2016-09-07 16:01:07 -07002975 out = StringIO.StringIO()
2976 self.mock(sys, 'stdout', out)
tandriic4344b52016-08-29 06:04:54 -07002977 self.assertEqual(0, cl.CMDLand(force=True, bypass_hooks=True, verbose=True))
tandrii8da412c2016-09-07 16:01:07 -07002978 self.assertRegexpMatches(out.getvalue(), 'Issue.*123 has been submitted')
agable32978d92016-11-01 12:55:02 -07002979 self.assertRegexpMatches(out.getvalue(), 'Landed as .*deadbeef')
tandriic4344b52016-08-29 06:04:54 -07002980
tandrii221ab252016-10-06 08:12:04 -07002981 BUILDBUCKET_BUILDS_MAP = {
2982 '9000': {
2983 'id': '9000',
2984 'status': 'STARTED',
2985 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
2986 'result_details_json': '{"properties": {}}',
2987 'bucket': 'master.x.y',
2988 'created_by': 'user:someone@chromium.org',
2989 'created_ts': '147200002222000',
2990 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
2991 },
2992 '8000': {
2993 'id': '8000',
2994 'status': 'COMPLETED',
2995 'result': 'FAILURE',
2996 'failure_reason': 'BUILD_FAILURE',
2997 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
2998 'result_details_json': '{"properties": {}}',
2999 'bucket': 'master.x.y',
3000 'created_by': 'user:someone@chromium.org',
3001 'created_ts': '147200001111000',
3002 'parameters_json': '{"builder_name": "my-builder", "category": ""}',
3003 },
3004 }
3005
3006 def test_write_try_results_json(self):
3007 expected_output = [
3008 {
3009 'buildbucket_id': '8000',
3010 'bucket': 'master.x.y',
3011 'builder_name': 'my-builder',
3012 'status': 'COMPLETED',
3013 'result': 'FAILURE',
3014 'failure_reason': 'BUILD_FAILURE',
3015 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/1',
3016 },
3017 {
3018 'buildbucket_id': '9000',
3019 'bucket': 'master.x.y',
3020 'builder_name': 'my-builder',
3021 'status': 'STARTED',
3022 'result': None,
3023 'failure_reason': None,
3024 'url': 'http://build.cr.org/p/x.y/builders/my-builder/builds/2',
3025 }
3026 ]
3027 self.calls = [(('write_json', 'output.json', expected_output), '')]
3028 git_cl.write_try_results_json('output.json', self.BUILDBUCKET_BUILDS_MAP)
3029
tandrii45b2a582016-10-11 03:14:16 -07003030 def _setup_fetch_try_jobs(self, most_recent_patchset=20001):
tandrii221ab252016-10-06 08:12:04 -07003031 out = StringIO.StringIO()
3032 self.mock(sys, 'stdout', out)
tandrii45b2a582016-10-11 03:14:16 -07003033 self.mock(git_cl.Changelist, 'GetMostRecentPatchset',
3034 lambda *args: most_recent_patchset)
tandrii221ab252016-10-06 08:12:04 -07003035 self.mock(git_cl.auth, 'get_authenticator_for_host', lambda host, _cfg:
3036 self._mocked_call(['get_authenticator_for_host', host]))
3037 self.mock(git_cl, '_buildbucket_retry', lambda *_, **__:
3038 self._mocked_call(['_buildbucket_retry']))
tandrii45b2a582016-10-11 03:14:16 -07003039
3040 def _setup_fetch_try_jobs_rietveld(self, *request_results):
3041 self._setup_fetch_try_jobs(most_recent_patchset=20001)
tandrii221ab252016-10-06 08:12:04 -07003042 self.calls += [
3043 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3044 ((['git', 'config', 'branch.feature.rietveldissue'],), '1'),
3045 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3046 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
3047 ((['git', 'config', 'branch.feature.rietveldpatchset'],), '20001'),
3048 ((['git', 'config', 'branch.feature.rietveldserver'],),
3049 'codereview.example.com'),
3050 ((['get_authenticator_for_host', 'codereview.example.com'],),
3051 AuthenticatorMock()),
3052 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3053
3054 def test_fetch_try_jobs_none_rietveld(self):
3055 self._setup_fetch_try_jobs_rietveld({})
tandrii45b2a582016-10-11 03:14:16 -07003056 # Simulate that user isn't logged in.
3057 self.mock(AuthenticatorMock, 'has_cached_credentials', lambda _: False)
tandrii221ab252016-10-06 08:12:04 -07003058 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003059 self.assertRegexpMatches(sys.stdout.getvalue(),
3060 'Warning: Some results might be missing')
tandrii221ab252016-10-06 08:12:04 -07003061 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3062
3063 def test_fetch_try_jobs_some_rietveld(self):
3064 self._setup_fetch_try_jobs_rietveld({
3065 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3066 })
3067 self.assertEqual(0, git_cl.main(['try-results']))
tandrii45b2a582016-10-11 03:14:16 -07003068 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
3069 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3070 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3071
3072 def _setup_fetch_try_jobs_gerrit(self, *request_results):
3073 self._setup_fetch_try_jobs(most_recent_patchset=13)
3074 self.calls += [
3075 ((['git', 'symbolic-ref', 'HEAD'],), 'feature'),
3076 ((['git', 'config', 'branch.feature.rietveldissue'],), CERR1),
3077 ((['git', 'config', 'branch.feature.gerritissue'],), '1'),
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003078 # TODO(tandrii): Uncomment the below if we decide to support checking
3079 # patchsets for Gerrit.
tandrii45b2a582016-10-11 03:14:16 -07003080 # Simulate that Gerrit has more patchsets than local.
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003081 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'),
tandrii45b2a582016-10-11 03:14:16 -07003082 ((['git', 'config', 'branch.feature.gerritserver'],),
3083 'https://x-review.googlesource.com'),
3084 ((['get_authenticator_for_host', 'x-review.googlesource.com'],),
3085 AuthenticatorMock()),
3086 ] + [((['_buildbucket_retry'],), r) for r in request_results]
3087
3088 def test_fetch_try_jobs_none_gerrit(self):
3089 self._setup_fetch_try_jobs_gerrit({})
3090 self.assertEqual(0, git_cl.main(['try-results']))
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003091 # TODO(tandrii): Uncomment the below if we decide to support checking
3092 # patchsets for Gerrit.
3093 # self.assertRegexpMatches(
3094 # sys.stdout.getvalue(),
3095 # r'Warning: Codereview server has newer patchsets \(13\)')
tandrii45b2a582016-10-11 03:14:16 -07003096 self.assertRegexpMatches(sys.stdout.getvalue(), 'No try jobs')
3097
3098 def test_fetch_try_jobs_some_gerrit(self):
3099 self._setup_fetch_try_jobs_gerrit({
3100 'builds': self.BUILDBUCKET_BUILDS_MAP.values(),
3101 })
Ravi Mistryfda50ca2016-11-14 10:19:18 -05003102 # TODO(tandrii): Uncomment the below if we decide to support checking
3103 # patchsets for Gerrit.
3104 # self.calls.remove(
3105 # ((['git', 'config', 'branch.feature.gerritpatchset'],), '12'))
tandrii45b2a582016-10-11 03:14:16 -07003106 self.assertEqual(0, git_cl.main(['try-results', '--patchset', '5']))
3107
3108 # ... and doesn't result in warning.
3109 self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
3110 self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
tandrii221ab252016-10-06 08:12:04 -07003111 self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
3112 self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
3113
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003114 def _mock_gerrit_changes_for_detail_cache(self):
3115 self.mock(git_cl._GerritChangelistImpl, '_GetGerritHost', lambda _: 'host')
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003116
3117 def test_gerrit_change_detail_cache_normalize(self):
3118 self._mock_gerrit_changes_for_detail_cache()
3119 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003120 (('GetChangeDetail', 'host', '2', ['CASE']), 'b'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003121 ]
3122 cl = git_cl.Changelist(codereview='gerrit')
3123 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CaSe']), 'b')
3124 self.assertEqual(cl._GetChangeDetail(issue=2, options=['CASE']), 'b')
3125 self.assertEqual(cl._GetChangeDetail(issue='2'), 'b')
3126 self.assertEqual(cl._GetChangeDetail(issue=2), 'b')
3127
3128 def test_gerrit_change_detail_cache_simple(self):
3129 self._mock_gerrit_changes_for_detail_cache()
3130 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003131 (('GetChangeDetail', 'host', '1', []), 'a'),
3132 (('GetChangeDetail', 'host', '2', []), 'b'),
3133 (('GetChangeDetail', 'host', '2', []), 'b2'),
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003134 ]
3135 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3136 self.assertEqual(cl._GetChangeDetail(), 'a') # Miss.
3137 self.assertEqual(cl._GetChangeDetail(), 'a')
3138 self.assertEqual(cl._GetChangeDetail(issue=2), 'b') # Miss.
Andrii Shyshkalov18975322017-01-25 16:44:13 +01003139 self.assertEqual(cl._GetChangeDetail(issue=2, no_cache=True), 'b2') # Miss.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003140 self.assertEqual(cl._GetChangeDetail(), 'a')
3141 self.assertEqual(cl._GetChangeDetail(issue=2), 'b2')
3142
3143 def test_gerrit_change_detail_cache_options(self):
3144 self._mock_gerrit_changes_for_detail_cache()
3145 self.calls = [
Andrii Shyshkalov8fc0c1d2017-01-26 09:38:10 +01003146 (('GetChangeDetail', 'host', '1', ['C', 'A', 'B']), 'cab'),
3147 (('GetChangeDetail', 'host', '1', ['A', 'D']), 'ad'),
3148 (('GetChangeDetail', 'host', '1', ['A']), 'a'), # no_cache=True
3149 (('GetChangeDetail', 'host', '1', ['B']), 'b'), # no longer in cache.
Andrii Shyshkalov258e0a62017-01-24 16:50:57 +01003150 ]
3151 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3152 self.assertEqual(cl._GetChangeDetail(options=['C', 'A', 'B']), 'cab')
3153 self.assertEqual(cl._GetChangeDetail(options=['A', 'B', 'C']), 'cab')
3154 self.assertEqual(cl._GetChangeDetail(options=['B', 'A']), 'cab')
3155 self.assertEqual(cl._GetChangeDetail(options=['C']), 'cab')
3156 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3157 self.assertEqual(cl._GetChangeDetail(), 'cab')
3158
3159 self.assertEqual(cl._GetChangeDetail(options=['A', 'D']), 'ad')
3160 self.assertEqual(cl._GetChangeDetail(options=['A']), 'cab')
3161 self.assertEqual(cl._GetChangeDetail(options=['D']), 'ad')
3162 self.assertEqual(cl._GetChangeDetail(), 'cab')
3163
3164 # Finally, no_cache should invalidate all caches for given change.
3165 self.assertEqual(cl._GetChangeDetail(options=['A'], no_cache=True), 'a')
3166 self.assertEqual(cl._GetChangeDetail(options=['B']), 'b')
3167
Andrii Shyshkalov21fb8242017-02-15 21:09:27 +01003168 def test_gerrit_description_caching(self):
3169 def gen_detail(rev, desc):
3170 return {
3171 'current_revision': rev,
3172 'revisions': {rev: {'commit': {'message': desc}}}
3173 }
3174 self.calls = [
3175 (('GetChangeDetail', 'host', '1',
3176 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3177 gen_detail('rev1', 'desc1')),
3178 (('GetChangeDetail', 'host', '1',
3179 ['CURRENT_REVISION', 'CURRENT_COMMIT']),
3180 gen_detail('rev2', 'desc2')),
3181 ]
3182
3183 self._mock_gerrit_changes_for_detail_cache()
3184 cl = git_cl.Changelist(issue=1, codereview='gerrit')
3185 self.assertEqual(cl.GetDescription(), 'desc1')
3186 self.assertEqual(cl.GetDescription(), 'desc1') # cache hit.
3187 self.assertEqual(cl.GetDescription(force=True), 'desc2')
tandrii@chromium.orgf86c7d32016-04-01 19:27:30 +00003188
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003189 def test_print_current_creds(self):
3190 class CookiesAuthenticatorMock(object):
3191 def __init__(self):
3192 self.gitcookies = {
3193 'host.googlesource.com': ('user', 'pass'),
3194 'host-review.googlesource.com': ('user', 'pass'),
3195 }
3196 self.netrc = self
3197 self.netrc.hosts = {
3198 'github.com': ('user2', None, 'pass2'),
3199 'host2.googlesource.com': ('user3', None, 'pass'),
3200 }
3201 self.mock(git_cl.gerrit_util, 'CookiesAuthenticator',
3202 CookiesAuthenticatorMock)
3203 self.mock(sys, 'stdout', StringIO.StringIO())
3204 git_cl._GitCookiesChecker().print_current_creds(include_netrc=True)
3205 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3206 ' Host\t User\t Which file',
3207 '============================\t=====\t===========',
3208 'host-review.googlesource.com\t user\t.gitcookies',
3209 ' host.googlesource.com\t user\t.gitcookies',
3210 ' host2.googlesource.com\tuser3\t .netrc',
3211 ])
3212 sys.stdout.buf = ''
3213 git_cl._GitCookiesChecker().print_current_creds(include_netrc=False)
3214 self.assertEqual(list(sys.stdout.getvalue().splitlines()), [
3215 ' Host\tUser\t Which file',
3216 '============================\t====\t===========',
3217 'host-review.googlesource.com\tuser\t.gitcookies',
3218 ' host.googlesource.com\tuser\t.gitcookies',
3219 ])
3220
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003221 def _common_creds_check_mocks(self):
3222 def exists_mock(path):
3223 dirname = os.path.dirname(path)
3224 if dirname == os.path.expanduser('~'):
3225 dirname = '~'
3226 base = os.path.basename(path)
3227 if base in ('.netrc', '.gitcookies'):
3228 return self._mocked_call('os.path.exists', '%s/%s' % (dirname, base))
3229 # git cl also checks for existence other files not relevant to this test.
3230 return None
3231 self.mock(os.path, 'exists', exists_mock)
3232 self.mock(sys, 'stdout', StringIO.StringIO())
3233
3234 def test_creds_check_gitcookies_not_configured(self):
3235 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003236 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003237 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003238 self.calls = [
3239 ((['git', 'config', '--global', 'http.cookiefile'],), CERR1),
3240 (('os.path.exists', '~/.netrc'), True),
3241 (('ask_for_data', 'Press Enter to setup .gitcookies, '
3242 'or Ctrl+C to abort'), ''),
3243 ((['git', 'config', '--global', 'http.cookiefile',
3244 os.path.expanduser('~/.gitcookies')], ), ''),
3245 ]
3246 self.assertEqual(0, git_cl.main(['creds-check']))
3247 self.assertRegexpMatches(
3248 sys.stdout.getvalue(),
3249 '^You seem to be using outdated .netrc for git credentials:')
3250 self.assertRegexpMatches(
3251 sys.stdout.getvalue(),
3252 '\nConfigured git to use .gitcookies from')
3253
3254 def test_creds_check_gitcookies_configured_custom_broken(self):
3255 self._common_creds_check_mocks()
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003256 self.mock(git_cl._GitCookiesChecker, 'get_hosts_with_creds',
Andrii Shyshkalov0a0b0672017-03-16 16:27:48 +01003257 lambda _, include_netrc=False: [])
Andrii Shyshkalov353637c2017-03-14 16:52:18 +01003258 self.calls = [
3259 ((['git', 'config', '--global', 'http.cookiefile'],),
3260 '/custom/.gitcookies'),
3261 (('os.path.exists', '/custom/.gitcookies'), False),
3262 (('ask_for_data', 'Reconfigure git to use default .gitcookies? '
3263 'Press Enter to reconfigure, or Ctrl+C to abort'), ''),
3264 ((['git', 'config', '--global', 'http.cookiefile',
3265 os.path.expanduser('~/.gitcookies')], ), ''),
3266 ]
3267 self.assertEqual(0, git_cl.main(['creds-check']))
3268 self.assertRegexpMatches(
3269 sys.stdout.getvalue(),
3270 'WARNING: you have configured custom path to .gitcookies: ')
3271 self.assertRegexpMatches(
3272 sys.stdout.getvalue(),
3273 'However, your configured .gitcookies file is missing.')
3274
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003275 def test_git_cl_comment_add_rietveld(self):
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003276 self.mock(git_cl._RietveldChangelistImpl, 'AddComment',
3277 lambda _, message: self._mocked_call('AddComment', message))
3278 self.calls = [
3279 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3280 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3281 (('AddComment', 'msg'), ''),
3282 ]
Andrii Shyshkalov0d6b46e2017-03-17 22:23:22 +01003283 self.assertEqual(0, git_cl.main(['comment', '--rietveld',
3284 '-i', '10', '-a', 'msg']))
Andrii Shyshkalov625986d2017-03-16 00:24:37 +01003285
3286 def test_git_cl_comment_add_gerrit(self):
3287 self.mock(git_cl.gerrit_util, 'SetReview',
3288 lambda host, change, msg:
3289 self._mocked_call('SetReview', host, change, msg))
3290 self.calls = [
3291 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3292 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3293 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3294 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3295 'origin/master'),
3296 ((['git', 'config', 'remote.origin.url'],),
3297 'https://chromium.googlesource.com/infra/infra'),
3298 (('SetReview', 'chromium-review.googlesource.com', 10, 'msg'), None),
3299 ]
3300 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '10',
3301 '-a', 'msg']))
3302
Andrii Shyshkalovd8aa49f2017-03-17 16:05:49 +01003303 def test_git_cl_comments_fetch_rietveld(self):
3304 self.mock(sys, 'stdout', StringIO.StringIO())
3305 self.calls = [
3306 ((['git', 'config', 'rietveld.autoupdate'],), CERR1),
3307 ((['git', 'config', 'rietveld.server'],), 'codereview.chromium.org'),
3308 ] * 2
3309 self.mock(git_cl._RietveldChangelistImpl, 'GetIssueProperties', lambda _: {
3310 'messages': [
3311 {'text': 'lgtm', 'date': '2017-03-13 20:49:34.515270',
3312 'disapproval': False, 'approval': True, 'sender': 'r@example.com'},
3313 {'text': 'not lgtm', 'date': '2017-03-13 21:50:34.515270',
3314 'disapproval': True, 'approval': False, 'sender': 'r2@example.com'},
3315 # Intentionally wrong order here.
3316 {'text': 'PTAL', 'date': '2000-03-13 20:49:34.515270',
3317 'disapproval': False, 'approval': False,
3318 'sender': 'owner@example.com'},
3319 ],
3320 'owner_email': 'owner@example.com',
3321 })
3322 expected_comments_summary = [
3323 git_cl._CommentSummary(
3324 message='lgtm',
3325 date=datetime.datetime(2017, 3, 13, 20, 49, 34, 515270),
3326 disapproval=False, approval=True, sender='r@example.com'),
3327 git_cl._CommentSummary(
3328 message='not lgtm',
3329 date=datetime.datetime(2017, 3, 13, 21, 50, 34, 515270),
3330 disapproval=True, approval=False, sender='r2@example.com'),
3331 # Note: same order as in whatever Rietveld returns.
3332 git_cl._CommentSummary(
3333 message='PTAL',
3334 date=datetime.datetime(2000, 3, 13, 20, 49, 34, 515270),
3335 disapproval=False, approval=False, sender='owner@example.com'),
3336 ]
3337 cl = git_cl.Changelist(codereview='rietveld', issue=1)
3338 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3339
3340 with git_cl.gclient_utils.temporary_directory() as tempdir:
3341 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3342 self.assertEqual(0, git_cl.main(['comment', '--rietveld', '-i', '10',
3343 '-j', out_file]))
3344 with open(out_file) as f:
3345 read = json.load(f)
3346 self.assertEqual(len(read), 3)
3347 self.assertEqual(read[0], {
3348 'date': '2000-03-13 20:49:34.515270',
3349 'message': 'PTAL',
3350 'approval': False,
3351 'disapproval': False,
3352 'sender': 'owner@example.com'})
3353 self.assertEqual(read[1]['date'], '2017-03-13 20:49:34.515270')
3354 self.assertEqual(read[2]['date'], '2017-03-13 21:50:34.515270')
3355
Andrii Shyshkalov5a0cf202017-03-17 16:14:59 +01003356 def test_git_cl_comments_fetch_gerrit(self):
3357 self.mock(sys, 'stdout', StringIO.StringIO())
3358 self.calls = [
3359 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3360 ((['git', 'symbolic-ref', 'HEAD'],), CERR1),
3361 ((['git', 'config', 'rietveld.upstream-branch'],), CERR1),
3362 ((['git', 'branch', '-r'],), 'origin/HEAD -> origin/master\n'
3363 'origin/master'),
3364 ((['git', 'config', 'remote.origin.url'],),
3365 'https://chromium.googlesource.com/infra/infra'),
3366 (('GetChangeDetail', 'chromium-review.googlesource.com', '1',
3367 ['MESSAGES', 'DETAILED_ACCOUNTS']), {
3368 'owner': {'email': 'owner@example.com'},
3369 'messages': [
3370 {
3371 u'_revision_number': 1,
3372 u'author': {
3373 u'_account_id': 1111084,
3374 u'email': u'commit-bot@chromium.org',
3375 u'name': u'Commit Bot'
3376 },
3377 u'date': u'2017-03-15 20:08:45.000000000',
3378 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046dc50b',
3379 u'message': u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3380 u'tag': u'autogenerated:cq:dry-run'
3381 },
3382 {
3383 u'_revision_number': 2,
3384 u'author': {
3385 u'_account_id': 11151243,
3386 u'email': u'owner@example.com',
3387 u'name': u'owner'
3388 },
3389 u'date': u'2017-03-16 20:00:41.000000000',
3390 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d1234',
3391 u'message': u'PTAL',
3392 },
3393 {
3394 u'_revision_number': 2,
3395 u'author': {
3396 u'_account_id': 148512 ,
3397 u'email': u'reviewer@example.com',
3398 u'name': u'reviewer'
3399 },
3400 u'date': u'2017-03-17 05:19:37.500000000',
3401 u'id': u'f5a6c25ecbd3b3b54a43ae418ed97eff046d4568',
3402 u'message': u'Patch Set 2: Code-Review+1',
3403 },
3404 ]
3405 })
3406 ] * 2
3407 expected_comments_summary = [
3408 git_cl._CommentSummary(
3409 message=u'Patch Set 1:\n\nDry run: CQ is trying da patch...',
3410 date=datetime.datetime(2017, 3, 15, 20, 8, 45, 0),
3411 disapproval=False, approval=False, sender=u'commit-bot@chromium.org'),
3412 git_cl._CommentSummary(
3413 message=u'PTAL',
3414 date=datetime.datetime(2017, 3, 16, 20, 0, 41, 0),
3415 disapproval=False, approval=False, sender=u'owner@example.com'),
3416 git_cl._CommentSummary(
3417 message=u'Patch Set 2: Code-Review+1',
3418 date=datetime.datetime(2017, 3, 17, 5, 19, 37, 500000),
3419 disapproval=False, approval=False, sender=u'reviewer@example.com'),
3420 ]
3421 cl = git_cl.Changelist(codereview='gerrit', issue=1)
3422 self.assertEqual(cl.GetCommentsSummary(), expected_comments_summary)
3423
3424 with git_cl.gclient_utils.temporary_directory() as tempdir:
3425 out_file = os.path.abspath(os.path.join(tempdir, 'out.json'))
3426 self.assertEqual(0, git_cl.main(['comment', '--gerrit', '-i', '1',
3427 '-j', out_file]))
3428 with open(out_file) as f:
3429 read = json.load(f)
3430 self.assertEqual(len(read), 3)
3431 self.assertEqual(read[0]['date'], u'2017-03-15 20:08:45.000000')
3432 self.assertEqual(read[1]['date'], u'2017-03-16 20:00:41.000000')
3433 self.assertEqual(read[2], {
3434 u'date': u'2017-03-17 05:19:37.500000',
3435 u'message': u'Patch Set 2: Code-Review+1',
3436 u'approval': False,
3437 u'disapproval': False,
3438 u'sender': u'reviewer@example.com'})
Andrii Shyshkalov34924cd2017-03-15 17:08:32 +01003439
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003440if __name__ == '__main__':
Andrii Shyshkalov18df0cd2017-01-25 15:22:20 +01003441 logging.basicConfig(
3442 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +00003443 unittest.main()