blob: b276b0a72d43b24baba89870d17e9ef857457545 [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
8import os
maruel@chromium.orga3353652011-11-30 14:26:57 +00009import StringIO
ukai@chromium.org78c4b982012-02-14 02:20:26 +000010import stat
maruel@chromium.orgddd59412011-11-30 14:20:38 +000011import sys
12import unittest
13
14sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
15
16from testing_support.auto_stub import TestCase
17
18import git_cl
iannucci@chromium.org9e849272014-04-04 00:31:55 +000019import git_common
tandrii@chromium.org57d86542016-03-04 16:11:32 +000020import git_footers
maruel@chromium.orgddd59412011-11-30 14:20:38 +000021import subprocess2
maruel@chromium.orgddd59412011-11-30 14:20:38 +000022
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000023class PresubmitMock(object):
24 def __init__(self, *args, **kwargs):
25 self.reviewers = []
26 @staticmethod
27 def should_continue():
28 return True
29
30
31class RietveldMock(object):
32 def __init__(self, *args, **kwargs):
33 pass
maruel@chromium.org78936cb2013-04-11 00:17:52 +000034
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000035 @staticmethod
36 def get_description(issue):
37 return 'Issue: %d' % issue
38
maruel@chromium.org78936cb2013-04-11 00:17:52 +000039 @staticmethod
40 def get_issue_properties(_issue, _messages):
41 return {
42 'reviewers': ['joe@chromium.org', 'john@chromium.org'],
43 'messages': [
44 {
45 'approval': True,
46 'sender': 'john@chromium.org',
47 },
48 ],
49 }
50
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000051
52class WatchlistsMock(object):
53 def __init__(self, _):
54 pass
55 @staticmethod
56 def GetWatchersForPaths(_):
57 return ['joe@example.com']
58
59
ukai@chromium.org78c4b982012-02-14 02:20:26 +000060class CodereviewSettingsFileMock(object):
61 def __init__(self):
62 pass
63 # pylint: disable=R0201
64 def read(self):
65 return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" +
andybons@chromium.org11f46eb2016-02-02 19:26:51 +000066 "GERRIT_HOST: True\n")
ukai@chromium.org78c4b982012-02-14 02:20:26 +000067
68
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +000069class AuthenticatorMock(object):
70 def __init__(self, *_args):
71 pass
72 def has_cached_credentials(self):
73 return True
74
75
maruel@chromium.orgddd59412011-11-30 14:20:38 +000076class TestGitCl(TestCase):
77 def setUp(self):
78 super(TestGitCl, self).setUp()
79 self.calls = []
80 self._calls_done = 0
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000081 self.mock(subprocess2, 'call', self._mocked_call)
82 self.mock(subprocess2, 'check_call', self._mocked_call)
83 self.mock(subprocess2, 'check_output', self._mocked_call)
84 self.mock(subprocess2, 'communicate', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +000085 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +000086 self.mock(git_common, 'get_or_create_merge_base',
87 lambda *a: (
88 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +000089 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000090 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000091 self.mock(git_cl, 'ask_for_data', self._mocked_call)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000092 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000093 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +000094 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000095 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000096 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +000097 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000098 # It's important to reset settings to not have inter-tests interference.
99 git_cl.settings = None
100
101 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000102 try:
103 if not self.has_failed():
104 self.assertEquals([], self.calls)
105 finally:
106 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000107
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000108 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000109 self.assertTrue(
110 self.calls,
111 '@%d Expected: <Missing> Actual: %r' % (self._calls_done, args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000112 top = self.calls.pop(0)
113 if len(top) > 2 and top[2]:
114 raise top[2]
115 expected_args, result = top
116
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000117 # Also logs otherwise it could get caught in a try/finally and be hard to
118 # diagnose.
119 if expected_args != args:
120 msg = '@%d Expected: %r Actual: %r' % (
121 self._calls_done, expected_args, args)
122 git_cl.logging.error(msg)
123 self.fail(msg)
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000124 self._calls_done += 1
125 return result
126
maruel@chromium.orga3353652011-11-30 14:26:57 +0000127 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000128 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000129 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000130 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000131
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000132 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000133 def _upload_no_rev_calls(cls, similarity, find_copies):
134 return (cls._git_base_calls(similarity, find_copies) +
135 cls._git_upload_no_rev_calls())
136
137 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000138 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000139 if similarity is None:
140 similarity = '50'
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000141 similarity_call = ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000142 'branch.master.git-cl-similarity'],), '')
143 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000144 similarity_call = ((['git', 'config', '--int',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000145 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000146
147 if find_copies is None:
148 find_copies = True
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000149 find_copies_call = ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000150 'branch.master.git-find-copies'],), '')
151 else:
152 val = str(int(find_copies))
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000153 find_copies_call = ((['git', 'config', '--int',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000154 'branch.master.git-find-copies', val],), '')
155
156 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000157 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000158 '--find-copies-harder', '-l100000', '-C'+similarity,
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000159 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000160 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000161 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000162 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000163
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000164 return [
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000165 ((['git', 'config', 'rietveld.autoupdate'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000166 ((['git', 'config', 'rietveld.server'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000167 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000168 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000169 similarity_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000170 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000171 find_copies_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000172 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
173 ((['git', 'config', 'branch.master.merge'],), 'master'),
174 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000175 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000176 'fake_ancestor_sha'),
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +0000177 ((['git', 'config', 'gerrit.host'],), ''),
vadimsh@chromium.org19f3fe62015-04-20 17:03:10 +0000178 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000179 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000180 ((['git', 'rev-parse', '--show-cdup'],), ''),
181 ((['git', 'rev-parse', 'HEAD'],), '12345'),
182 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000183 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000184 'M\t.gitignore\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000185 ((['git', 'config', 'branch.master.rietveldpatchset'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000186 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000187 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000188 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000189 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000190 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000191 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000192 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000193 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000194 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000195 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000196 ]
197
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000198 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000199 def _git_upload_no_rev_calls(cls):
200 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000201 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000202 ]
203
204 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000205 def _git_upload_calls(cls, private):
206 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000207 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000208 private_call = []
209 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000210 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000211 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000212 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000213
maruel@chromium.orga3353652011-11-30 14:26:57 +0000214 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000215 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000216 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000217 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000218 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000219 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000220 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
221 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000222 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000223 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000224 ((['git', 'config', 'rietveld.project'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000225 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000226 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000227 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000228 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000229 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000230 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000231 ] + cls._git_post_upload_calls()
232
233 @classmethod
234 def _git_post_upload_calls(cls):
235 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000236 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
237 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
238 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000239 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000240 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000241 ]
242
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000243 @staticmethod
244 def _git_sanity_checks(diff_base, working_branch):
245 fake_ancestor = 'fake_ancestor'
246 fake_cl = 'fake_cl_for_patch'
247 return [
248 # Calls to verify branch point is ancestor
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000249 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000250 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000251 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000252 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000253 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000254 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000255 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000256 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000257 'config', 'gitcl.remotebranch'],), (('', None), 1)),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000258 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000259 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000260 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000261 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000262 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000263 'config', 'branch.%s.remote' % working_branch],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000264 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000265 'refs/remotes/origin/master'],), ''),
266 ]
267
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000268 @classmethod
269 def _dcommit_calls_1(cls):
270 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000271 ((['git', 'config', 'rietveld.autoupdate'],),
272 ''),
273 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
274 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000275 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000276 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000277 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
278 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
279 None),
280 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000281 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000282 'config', 'rietveld.server'],), 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000283 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
284 ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000285 'branch.working.git-cl-similarity'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000286 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
287 ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000288 'branch.working.git-find-copies'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000289 ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
290 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000291 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000292 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000293 ((['git', 'config', 'branch.working.merge'],),
294 'refs/heads/master'),
295 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000296 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000297 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000298 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000299 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000300 'refs/remotes/origin/master'],),
301 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000302 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000303 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000304 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000305 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000306 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000307 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000308 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000309 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000310 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000311 ]
312
313 @classmethod
314 def _dcommit_calls_normal(cls):
315 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000316 ((['git', 'rev-parse', '--show-cdup'],), ''),
317 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000318 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000319 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000320 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000321 '.'],),
322 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000323 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000324 'config', 'branch.working.rietveldissue'],), '12345'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000325 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000326 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000327 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000328 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000329 ((['git', 'config', 'user.email'],), 'author@example.com'),
330 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000331 ]
332
333 @classmethod
334 def _dcommit_calls_bypassed(cls):
335 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000336 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000337 'config', 'branch.working.rietveldissue'],), '12345'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000338 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000339 'codereview.example.com'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000340 ]
341
342 @classmethod
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000343 def _dcommit_calls_3(cls):
344 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000345 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000346 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000347 '-l100000', '-C50', 'fake_ancestor_sha',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000348 'refs/heads/working'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000349 (' PRESUBMIT.py | 2 +-\n'
350 ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000351 ((['git', 'show-ref', '--quiet', '--verify',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000352 'refs/heads/git-cl-commit'],),
353 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000354 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
355 ((['git', 'show-ref', '--quiet', '--verify',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000356 'refs/heads/git-cl-cherry-pick'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000357 ((['git', 'rev-parse', '--show-cdup'],), '\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000358 ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
359 ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
360 ((['git', 'commit', '-m',
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000361 'Issue: 12345\n\nR=john@chromium.org\n\n'
sergiyb@chromium.org4b39c5f2015-07-07 10:33:12 +0000362 'Review URL: https://codereview.example.com/12345 .'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000363 ''),
kjellander@chromium.org6abc6522014-12-02 07:34:49 +0000364 ((['git', 'config', 'rietveld.force-https-commit-url'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000365 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000366 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000367 (('', None), 0)),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000368 ((['git', 'checkout', '-q', 'working'],), ''),
369 ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000370 ]
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000371
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000372 @staticmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000373 def _cmd_line(description, args, similarity, find_copies, private):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000374 """Returns the upload command line passed to upload.RealMain()."""
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000375 return [
376 'upload', '--assume_yes', '--server',
maruel@chromium.orgeb5edbc2012-01-16 17:03:28 +0000377 'https://codereview.example.com',
maruel@chromium.org71e12a92012-02-14 02:34:15 +0000378 '--message', description
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000379 ] + args + [
380 '--cc', 'joe@example.com',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000381 ] + (['--private'] if private else []) + [
iannucci@chromium.org79540052012-10-19 23:15:26 +0000382 '--git_similarity', similarity or '50'
383 ] + (['--git_no_find_copies'] if find_copies == False else []) + [
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000384 'fake_ancestor_sha', 'HEAD'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000385 ]
386
387 def _run_reviewer_test(
388 self,
389 upload_args,
390 expected_description,
391 returned_description,
392 final_description,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000393 reviewers,
394 private=False):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000395 """Generic reviewer test framework."""
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000396 try:
397 similarity = upload_args[upload_args.index('--similarity')+1]
398 except ValueError:
399 similarity = None
iannucci@chromium.org79540052012-10-19 23:15:26 +0000400
401 if '--find-copies' in upload_args:
402 find_copies = True
403 elif '--no-find-copies' in upload_args:
404 find_copies = False
405 else:
406 find_copies = None
407
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000408 private = '--private' in upload_args
409
410 self.calls = self._upload_calls(similarity, find_copies, private)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000411
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000412 def RunEditor(desc, _, **kwargs):
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000413 self.assertEquals(
414 '# Enter a description of the change.\n'
janx@chromium.org104b2db2013-04-18 12:58:40 +0000415 '# This will be displayed on the codereview site.\n'
alancutter@chromium.org63a4d7f2013-05-31 02:22:45 +0000416 '# The first line will also be used as the subject of the review.\n'
alancutter@chromium.orgbd1073e2013-06-01 00:34:38 +0000417 '#--------------------This line is 72 characters long'
418 '--------------------\n' +
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000419 expected_description,
420 desc)
421 return returned_description
422 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000423
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000424 def check_upload(args):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000425 cmd_line = self._cmd_line(final_description, reviewers, similarity,
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000426 find_copies, private)
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000427 self.assertEquals(cmd_line, args)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000428 return 1, 2
429 self.mock(git_cl.upload, 'RealMain', check_upload)
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000430
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000431 git_cl.main(['upload'] + upload_args)
432
433 def test_no_reviewer(self):
434 self._run_reviewer_test(
435 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000436 'desc\n\nBUG=',
437 '# Blah blah comment.\ndesc\n\nBUG=',
438 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000439 [])
440
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000441 def test_keep_similarity(self):
442 self._run_reviewer_test(
443 ['--similarity', '70'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000444 'desc\n\nBUG=',
445 '# Blah blah comment.\ndesc\n\nBUG=',
446 'desc\n\nBUG=',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000447 [])
448
iannucci@chromium.org79540052012-10-19 23:15:26 +0000449 def test_keep_find_copies(self):
450 self._run_reviewer_test(
451 ['--no-find-copies'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000452 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000453 '# Blah blah comment.\ndesc\n\nBUG=\n',
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000454 'desc\n\nBUG=',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000455 [])
456
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000457 def test_private(self):
458 self._run_reviewer_test(
459 ['--private'],
460 'desc\n\nBUG=',
461 '# Blah blah comment.\ndesc\n\nBUG=\n',
462 'desc\n\nBUG=',
463 [])
464
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000465 def test_reviewers_cmd_line(self):
466 # Reviewer is passed as-is
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000467 description = 'desc\n\nR=foo@example.com\nBUG='
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000468 self._run_reviewer_test(
469 ['-r' 'foo@example.com'],
470 description,
471 '\n%s\n' % description,
472 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000473 ['--reviewers=foo@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000474
475 def test_reviewer_tbr_overriden(self):
476 # Reviewer is overriden with TBR
477 # Also verifies the regexp work without a trailing LF
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000478 description = 'Foo Bar\n\nTBR=reviewer@example.com'
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000479 self._run_reviewer_test(
480 ['-r' 'foo@example.com'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000481 'desc\n\nR=foo@example.com\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000482 description.strip('\n'),
483 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000484 ['--reviewers=reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000485
486 def test_reviewer_multiple(self):
487 # Handles multiple R= or TBR= lines.
488 description = (
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000489 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com')
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000490 self._run_reviewer_test(
491 [],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000492 'desc\n\nBUG=',
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000493 description,
494 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000495 ['--reviewers=another@example.com,reviewer@example.com'])
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000496
maruel@chromium.orga3353652011-11-30 14:26:57 +0000497 def test_reviewer_send_mail(self):
498 # --send-mail can be used without -r if R= is used
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000499 description = 'Foo Bar\nR=reviewer@example.com'
maruel@chromium.orga3353652011-11-30 14:26:57 +0000500 self._run_reviewer_test(
501 ['--send-mail'],
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000502 'desc\n\nBUG=',
maruel@chromium.orga3353652011-11-30 14:26:57 +0000503 description.strip('\n'),
504 description,
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000505 ['--reviewers=reviewer@example.com', '--send_mail'])
maruel@chromium.orga3353652011-11-30 14:26:57 +0000506
507 def test_reviewer_send_mail_no_rev(self):
508 # Fails without a reviewer.
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000509 stdout = StringIO.StringIO()
510 stderr = StringIO.StringIO()
maruel@chromium.orga3353652011-11-30 14:26:57 +0000511 try:
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000512 self.calls = self._upload_no_rev_calls(None, None)
513 def RunEditor(desc, _, **kwargs):
maruel@chromium.orga3353652011-11-30 14:26:57 +0000514 return desc
515 self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000516 self.mock(sys, 'stdout', stdout)
517 self.mock(sys, 'stderr', stderr)
maruel@chromium.orga3353652011-11-30 14:26:57 +0000518 git_cl.main(['upload', '--send-mail'])
519 self.fail()
520 except SystemExit:
maruel@chromium.org2e23ce32013-05-07 12:42:28 +0000521 self.assertEqual(
522 'Using 50% similarity for rename/copy detection. Override with '
523 '--similarity.\n',
524 stdout.getvalue())
525 self.assertEqual(
526 'Must specify reviewers to send email.\n', stderr.getvalue())
maruel@chromium.orga3353652011-11-30 14:26:57 +0000527
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000528 def test_dcommit(self):
529 self.calls = (
530 self._dcommit_calls_1() +
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000531 self._git_sanity_checks('fake_ancestor_sha', 'working') +
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000532 self._dcommit_calls_normal() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000533 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000534 git_cl.main(['dcommit'])
535
536 def test_dcommit_bypass_hooks(self):
537 self.calls = (
538 self._dcommit_calls_1() +
539 self._dcommit_calls_bypassed() +
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000540 self._dcommit_calls_3())
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000541 git_cl.main(['dcommit', '--bypass-hooks'])
542
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000543
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000544 @classmethod
545 def _gerrit_base_calls(cls):
ukai@chromium.orge8077812012-02-03 03:41:46 +0000546 return [
pgervais@chromium.org87884cc2014-01-03 22:23:41 +0000547 ((['git', 'config', 'rietveld.autoupdate'],),
548 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000549 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000550 'config', 'rietveld.server'],), 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000551 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
552 ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000553 'branch.master.git-cl-similarity'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000554 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
555 ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000556 'branch.master.git-find-copies'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000557 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
558 ((['git', 'config', 'branch.master.merge'],), 'master'),
559 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000560 ((['get_or_create_merge_base', 'master', 'master'],),
561 'fake_ancestor_sha'),
andybons@chromium.org11f46eb2016-02-02 19:26:51 +0000562 ((['git', 'config', 'gerrit.host'],), 'True'),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000563 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000564 ((['git', 'rev-parse', '--show-cdup'],), ''),
565 ((['git', 'rev-parse', 'HEAD'],), '12345'),
566 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000567 'diff', '--name-status', '--no-renames', '-r',
568 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000569 'M\t.gitignore\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000570 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
571 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000572 'config', 'branch.master.rietveldpatchset'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000573 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000574 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000575 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000576 ((['git', 'config', 'user.email'],), 'me@example.com'),
577 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000578 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000579 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000580 '+dat'),
581 ]
582
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000583 @classmethod
584 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000585 expected_upstream_ref='origin/refs/heads/master',
586 post_amend_description=None):
587 if post_amend_description is None:
588 post_amend_description = description
ukai@chromium.orge8077812012-02-03 03:41:46 +0000589 calls = [
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000590 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000591 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000592 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000593 description)
594 ]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000595 if not git_footers.get_footer_change_id(description) and not squash:
tandrii@chromium.org10625002016-03-04 20:03:47 +0000596 # TODOOOOO
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000597 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000598 # DownloadGerritHook(False)
599 ((False, ),
600 ''),
601 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000602 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000603 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000604 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000605 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000606 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000607 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000608 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000609 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000610 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000611 if squash:
612 ref_to_push = 'abcdef0123456789'
613 calls += [
bauerb@chromium.org13502e02016-02-18 10:18:29 +0000614 ((['git', 'show', '--format=%B', '-s',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000615 'refs/heads/git_cl_uploads/master'],),
616 (description, 0)),
617 ((['git', 'config', 'branch.master.merge'],),
618 'refs/heads/master'),
619 ((['git', 'config', 'branch.master.remote'],),
620 'origin'),
621 ((['get_or_create_merge_base', 'master', 'master'],),
622 'origin/master'),
623 ((['git', 'rev-parse', 'HEAD:'],),
624 '0123456789abcdef'),
625 ((['git', 'commit-tree', '0123456789abcdef', '-p',
626 'origin/master', '-m', 'd'],),
627 ref_to_push),
628 ]
629 else:
630 ref_to_push = 'HEAD'
631
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000632 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000633 ((['git', 'rev-list',
634 expected_upstream_ref + '..' + ref_to_push],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000635 ((['git', 'config', 'rietveld.cc'],), '')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000636 ]
ukai@chromium.org19bbfa22012-02-03 16:18:11 +0000637 receive_pack = '--receive-pack=git receive-pack '
ukai@chromium.orge8077812012-02-03 03:41:46 +0000638 receive_pack += '--cc=joe@example.com' # from watch list
639 if reviewers:
640 receive_pack += ' '
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000641 receive_pack += ' '.join(
642 '--reviewer=' + email for email in sorted(reviewers))
ukai@chromium.org19bbfa22012-02-03 16:18:11 +0000643 receive_pack += ''
ukai@chromium.orge8077812012-02-03 03:41:46 +0000644 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000645 ((['git',
luqui@chromium.org609f3952015-05-04 22:47:04 +0000646 'push', receive_pack, 'origin',
647 ref_to_push + ':refs/for/refs/heads/master'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000648 '')
649 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000650 if squash:
651 calls += [
652 ((['git', 'rev-parse', 'HEAD'],), 'abcdef0123456789'),
653 ((['git', 'update-ref', '-m', 'Uploaded abcdef0123456789',
654 'refs/heads/git_cl_uploads/master', 'abcdef0123456789'],),
655 '')
656 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000657 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000658 return calls
659
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000660 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000661 self,
662 upload_args,
663 description,
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000664 reviewers,
luqui@chromium.org609f3952015-05-04 22:47:04 +0000665 squash=False,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000666 expected_upstream_ref='origin/refs/heads/master',
667 post_amend_description=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000668 """Generic gerrit upload test framework."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000669 self.calls = self._gerrit_base_calls()
luqui@chromium.org609f3952015-05-04 22:47:04 +0000670 self.calls += self._gerrit_upload_calls(
671 description, reviewers, squash,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000672 expected_upstream_ref=expected_upstream_ref,
673 post_amend_description=post_amend_description)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000674 # Uncomment when debugging.
675 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000676 git_cl.main(['upload'] + upload_args)
677
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000678 def test_gerrit_upload_without_change_id(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000679 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000680 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000681 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +0000682 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000683 [],
684 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000685
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000686 def test_gerrit_no_reviewer(self):
687 self._run_gerrit_upload_test(
688 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000689 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000690 [])
691
ukai@chromium.orge8077812012-02-03 03:41:46 +0000692 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000693 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000694 ['-r', 'foo@example.com'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000695 'desc\n\nBUG=\n\nChange-Id: I123456789',
ukai@chromium.orge8077812012-02-03 03:41:46 +0000696 ['foo@example.com'])
697
698 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000699 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000700 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000701 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n'
702 'Change-Id: 123456789\n',
ukai@chromium.orge8077812012-02-03 03:41:46 +0000703 ['reviewer@example.com', 'another@example.com'])
704
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000705 def test_gerrit_upload_squash(self):
706 self._run_gerrit_upload_test(
707 ['--squash'],
708 'desc\n\nBUG=\nChange-Id:123456789\n',
709 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +0000710 squash=True,
711 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000712
rmistry@google.com2dd99862015-06-22 12:22:18 +0000713 def test_upload_branch_deps(self):
714 def mock_run_git(*args, **_kwargs):
715 if args[0] == ['for-each-ref',
716 '--format=%(refname:short) %(upstream:short)',
717 'refs/heads']:
718 # Create a local branch dependency tree that looks like this:
719 # test1 -> test2 -> test3 -> test4 -> test5
720 # -> test3.1
721 # test6 -> test0
722 branch_deps = [
723 'test2 test1', # test1 -> test2
724 'test3 test2', # test2 -> test3
725 'test3.1 test2', # test2 -> test3.1
726 'test4 test3', # test3 -> test4
727 'test5 test4', # test4 -> test5
728 'test6 test0', # test0 -> test6
729 'test7', # test7
730 ]
731 return '\n'.join(branch_deps)
732 self.mock(git_cl, 'RunGit', mock_run_git)
733
andybons@chromium.org962f9462016-02-03 20:00:42 +0000734 git_cl.settings = git_cl.Settings()
735 self.mock(git_cl.settings, 'GetIsGerrit', lambda: False)
736
rmistry@google.com2dd99862015-06-22 12:22:18 +0000737 class RecordCalls:
738 times_called = 0
739 record_calls = RecordCalls()
740 def mock_CMDupload(*args, **_kwargs):
741 record_calls.times_called += 1
742 return 0
743 self.mock(git_cl, 'CMDupload', mock_CMDupload)
744
745 self.calls = [
746 (('[Press enter to continue or ctrl-C to quit]',), ''),
747 ]
748
749 class MockChangelist():
750 def __init__(self):
751 pass
752 def GetBranch(self):
753 return 'test1'
754 def GetIssue(self):
755 return '123'
756 def GetPatchset(self):
757 return '1001'
758
759 ret = git_cl.upload_branch_deps(MockChangelist(), [])
760 # CMDupload should have been called 5 times because of 5 dependent branches.
761 self.assertEquals(5, record_calls.times_called)
762 self.assertEquals(0, ret)
763
tandrii@chromium.org65874e12016-03-04 12:03:02 +0000764 def test_gerrit_change_id(self):
765 self.calls = [
766 ((['git', 'write-tree'], ),
767 'hashtree'),
768 ((['git', 'rev-parse', 'HEAD~0'], ),
769 'branch-parent'),
770 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
771 'A B <a@b.org> 1456848326 +0100'),
772 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
773 'C D <c@d.org> 1456858326 +0100'),
774 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
775 'hashchange'),
776 ]
777 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
778 self.assertEqual(change_id, 'Ihashchange')
779
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000780 def test_update_reviewers(self):
781 data = [
782 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +0000783 ('foo\nR=xx', [], 'foo\nR=xx'),
784 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000785 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +0000786 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
787 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
788 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000789 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +0000790 ('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 +0000791 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +0000792 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
793 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
794 # Same as the line before, but full of whitespaces.
795 (
796 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
797 'foo\nBar\n\nR=c@c\n BUG =',
798 ),
799 # Whitespaces aren't interpreted as new lines.
800 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000801 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +0000802 expected = [i[2] for i in data]
803 actual = []
804 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000805 obj = git_cl.ChangeDescription(orig)
806 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +0000807 actual.append(obj.description)
808 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000809
wittman@chromium.org455dc922015-01-26 20:15:50 +0000810 def test_get_target_ref(self):
811 # Check remote or remote branch not present.
812 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
813 self.assertEqual(None, git_cl.GetTargetRef(None,
814 'refs/remotes/origin/master',
815 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000816
wittman@chromium.org455dc922015-01-26 20:15:50 +0000817 # Check default target refs for branches.
818 self.assertEqual('refs/heads/master',
819 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
820 None, None))
821 self.assertEqual('refs/heads/master',
822 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
823 None, None))
824 self.assertEqual('refs/heads/master',
825 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
826 None, None))
827 self.assertEqual('refs/branch-heads/123',
828 git_cl.GetTargetRef('origin',
829 'refs/remotes/branch-heads/123',
830 None, None))
831 self.assertEqual('refs/diff/test',
832 git_cl.GetTargetRef('origin',
833 'refs/remotes/origin/refs/diff/test',
834 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +0000835 self.assertEqual('refs/heads/chrome/m42',
836 git_cl.GetTargetRef('origin',
837 'refs/remotes/origin/chrome/m42',
838 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +0000839
840 # Check target refs for user-specified target branch.
841 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
842 'refs/remotes/branch-heads/123'):
843 self.assertEqual('refs/branch-heads/123',
844 git_cl.GetTargetRef('origin',
845 'refs/remotes/origin/master',
846 branch, None))
847 for branch in ('origin/master', 'remotes/origin/master',
848 'refs/remotes/origin/master'):
849 self.assertEqual('refs/heads/master',
850 git_cl.GetTargetRef('origin',
851 'refs/remotes/branch-heads/123',
852 branch, None))
853 for branch in ('master', 'heads/master', 'refs/heads/master'):
854 self.assertEqual('refs/heads/master',
855 git_cl.GetTargetRef('origin',
856 'refs/remotes/branch-heads/123',
857 branch, None))
858
859 # Check target refs for pending prefix.
860 self.assertEqual('prefix/heads/master',
861 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
862 None, 'prefix/'))
863
wychen@chromium.orga872e752015-04-28 23:42:18 +0000864 def test_patch_when_dirty(self):
865 # Patch when local tree is dirty
866 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
867 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
868
869 def test_diff_when_dirty(self):
870 # Do 'git cl diff' when local tree is dirty
871 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
872 self.assertNotEqual(git_cl.main(['diff']), 0)
873
874 def _patch_common(self):
875 self.mock(git_cl.Changelist, 'GetMostRecentPatchset', lambda x: '60001')
876 self.mock(git_cl.Changelist, 'GetPatchSetDiff', lambda *args: None)
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +0000877 self.mock(git_cl.Changelist, 'GetDescription', lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +0000878 self.mock(git_cl.Changelist, 'SetIssue', lambda *args: None)
879 self.mock(git_cl.Changelist, 'SetPatchset', lambda *args: None)
880 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
881
882 self.calls = [
883 ((['git', 'config', 'rietveld.autoupdate'],), ''),
884 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
885 ((['git', 'rev-parse', '--show-cdup'],), ''),
886 ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
887 ]
888
889 def test_patch_successful(self):
890 self._patch_common()
891 self.calls += [
892 ((['git', 'apply', '--index', '-p0', '--3way'],), ''),
893 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +0000894 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +0000895 'patch from issue 123456 at patchset 60001 ' +
896 '(http://crrev.com/123456#ps60001)'],), ''),
897 ]
898 self.assertEqual(git_cl.main(['patch', '123456']), 0)
899
900 def test_patch_conflict(self):
901 self._patch_common()
902 self.calls += [
903 ((['git', 'apply', '--index', '-p0', '--3way'],), '',
904 subprocess2.CalledProcessError(1, '', '', '', '')),
905 ]
906 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +0000907
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000908if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000909 git_cl.logging.basicConfig(
910 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000911 unittest.main()