blob: e89b4cc1e5324212d8ad68c2c37f974853ccffe9 [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)
tandrii@chromium.orga342c922016-03-16 07:08:25 +000085 self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call)
sbc@chromium.org71437c02015-04-09 19:29:40 +000086 self.mock(git_common, 'is_dirty_git_tree', lambda x: False)
iannucci@chromium.org9e849272014-04-04 00:31:55 +000087 self.mock(git_common, 'get_or_create_merge_base',
88 lambda *a: (
89 self._mocked_call(['get_or_create_merge_base']+list(a))))
pgervais@chromium.org8ba38ff2015-06-11 21:41:25 +000090 self.mock(git_cl, 'BranchExists', lambda _: True)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000091 self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '')
maruel@chromium.org2e72bb12012-01-17 15:18:35 +000092 self.mock(git_cl, 'ask_for_data', self._mocked_call)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000093 self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000094 self.mock(git_cl.rietveld, 'Rietveld', RietveldMock)
maruel@chromium.org4bac4b52012-11-27 20:33:52 +000095 self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000096 self.mock(git_cl.upload, 'RealMain', self.fail)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000097 self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
vadimsh@chromium.orgeed4df32015-04-10 21:30:20 +000098 self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
maruel@chromium.orgddd59412011-11-30 14:20:38 +000099 # It's important to reset settings to not have inter-tests interference.
100 git_cl.settings = None
101
102 def tearDown(self):
wychen@chromium.org445c8962015-04-28 23:30:05 +0000103 try:
104 if not self.has_failed():
105 self.assertEquals([], self.calls)
106 finally:
107 super(TestGitCl, self).tearDown()
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000108
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000109 def _mocked_call(self, *args, **_kwargs):
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000110 self.assertTrue(
111 self.calls,
112 '@%d Expected: <Missing> Actual: %r' % (self._calls_done, args))
wychen@chromium.orga872e752015-04-28 23:42:18 +0000113 top = self.calls.pop(0)
114 if len(top) > 2 and top[2]:
115 raise top[2]
116 expected_args, result = top
117
maruel@chromium.orge52678e2013-04-26 18:34:44 +0000118 # Also logs otherwise it could get caught in a try/finally and be hard to
119 # diagnose.
120 if expected_args != args:
121 msg = '@%d Expected: %r Actual: %r' % (
122 self._calls_done, expected_args, args)
123 git_cl.logging.error(msg)
124 self.fail(msg)
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000125 self._calls_done += 1
126 return result
127
maruel@chromium.orga3353652011-11-30 14:26:57 +0000128 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000129 def _upload_calls(cls, similarity, find_copies, private):
iannucci@chromium.org79540052012-10-19 23:15:26 +0000130 return (cls._git_base_calls(similarity, find_copies) +
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000131 cls._git_upload_calls(private))
maruel@chromium.orga3353652011-11-30 14:26:57 +0000132
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000133 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000134 def _upload_no_rev_calls(cls, similarity, find_copies):
135 return (cls._git_base_calls(similarity, find_copies) +
136 cls._git_upload_no_rev_calls())
137
138 @classmethod
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000139 def _git_base_calls(cls, similarity, find_copies):
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000140 if similarity is None:
141 similarity = '50'
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000142 similarity_call = ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000143 'branch.master.git-cl-similarity'],), '')
144 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000145 similarity_call = ((['git', 'config', '--int',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000146 'branch.master.git-cl-similarity', similarity],), '')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000147
148 if find_copies is None:
149 find_copies = True
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000150 find_copies_call = ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000151 'branch.master.git-find-copies'],), '')
152 else:
153 val = str(int(find_copies))
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000154 find_copies_call = ((['git', 'config', '--int',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000155 'branch.master.git-find-copies', val],), '')
156
157 if find_copies:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000158 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000159 '--find-copies-harder', '-l100000', '-C'+similarity,
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000160 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000161 else:
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000162 stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000163 '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
iannucci@chromium.org79540052012-10-19 23:15:26 +0000164
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000165 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000166 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org87985d22016-03-24 17:33:33 +0000167 similarity_call,
168 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
169 find_copies_call,
170 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org278a25d2016-03-29 09:24:59 +0000171 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
172 ((['git', 'config', 'branch.master.gerritissue'],), ''),
173 ((['git', 'config', 'rietveld.autoupdate'],), ''),
174 ((['git', 'config', 'gerrit.host'],), ''),
175 ((['git', 'config', 'rietveld.server'],),
176 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000177 ((['git', 'config', 'branch.master.merge'],), 'master'),
178 ((['git', 'config', 'branch.master.remote'],), 'origin'),
iannucci@chromium.org9e849272014-04-04 00:31:55 +0000179 ((['get_or_create_merge_base', 'master', 'master'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000180 'fake_ancestor_sha'),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000181 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000182 ((['git', 'rev-parse', '--show-cdup'],), ''),
183 ((['git', 'rev-parse', 'HEAD'],), '12345'),
184 ((['git', 'diff', '--name-status', '--no-renames', '-r',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000185 'fake_ancestor_sha...', '.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000186 'M\t.gitignore\n'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000187 ((['git', 'config', 'branch.master.rietveldpatchset'],),
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000188 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000189 ((['git', 'log', '--pretty=format:%s%n%n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000190 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000191 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000192 ((['git', 'config', 'user.email'],), 'me@example.com'),
iannucci@chromium.org79540052012-10-19 23:15:26 +0000193 stat_call,
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000194 ((['git', 'log', '--pretty=format:%s\n\n%b',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000195 'fake_ancestor_sha..HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000196 'desc\n'),
rmistry@google.com90752582014-01-14 21:04:50 +0000197 ((['git', 'config', 'rietveld.bug-prefix'],), ''),
maruel@chromium.orga3353652011-11-30 14:26:57 +0000198 ]
199
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000200 @classmethod
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000201 def _git_upload_no_rev_calls(cls):
202 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000203 ((['git', 'config', 'core.editor'],), ''),
jbroman@chromium.org615a2622013-05-03 13:20:14 +0000204 ]
205
206 @classmethod
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000207 def _git_upload_calls(cls, private):
208 if private:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000209 cc_call = []
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000210 private_call = []
211 else:
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000212 cc_call = [((['git', 'config', 'rietveld.cc'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000213 private_call = [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000214 ((['git', 'config', 'rietveld.private'],), '')]
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000215
maruel@chromium.orga3353652011-11-30 14:26:57 +0000216 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000217 ((['git', 'config', 'core.editor'],), ''),
tyoshino@chromium.org99918ab2013-09-30 06:17:28 +0000218 ] + cc_call + private_call + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000219 ((['git', 'config', 'branch.master.base-url'],), ''),
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000220 ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000221 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000222 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
223 (('', None), 0)),
thestig@chromium.org7a54e812014-02-11 19:57:22 +0000224 ((['git', 'rev-parse', '--show-cdup'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000225 ((['git', 'svn', 'info'],), ''),
sheyang@chromium.org152cf832014-06-11 21:37:49 +0000226 ((['git', 'config', 'rietveld.project'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000227 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000228 'config', 'branch.master.rietveldissue', '1'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000229 ((['git', 'config', 'branch.master.rietveldserver',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000230 'https://codereview.example.com'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000231 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000232 'config', 'branch.master.rietveldpatchset', '2'],), ''),
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000233 ] + cls._git_post_upload_calls()
234
235 @classmethod
236 def _git_post_upload_calls(cls):
237 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000238 ((['git', 'rev-parse', 'HEAD'],), 'hash'),
239 ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
240 ((['git',
tyoshino@chromium.orgc1737d02013-05-29 14:17:28 +0000241 'config', 'branch.hash.last-upload-hash', 'hash'],), ''),
rmistry@google.com5626a922015-02-26 14:03:30 +0000242 ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''),
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000243 ]
244
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000245 @staticmethod
246 def _git_sanity_checks(diff_base, working_branch):
247 fake_ancestor = 'fake_ancestor'
248 fake_cl = 'fake_cl_for_patch'
249 return [
250 # Calls to verify branch point is ancestor
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000251 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000252 'rev-parse', '--verify', diff_base],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000253 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000254 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000255 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000256 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000257 # Mock a config miss (error code 1)
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000258 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000259 'config', 'gitcl.remotebranch'],), (('', None), 1)),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000260 # Call to GetRemoteBranch()
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000261 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000262 'config', 'branch.%s.merge' % working_branch],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000263 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000264 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000265 'config', 'branch.%s.remote' % working_branch],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000266 ((['git', 'rev-list', '^' + fake_ancestor,
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000267 'refs/remotes/origin/master'],), ''),
268 ]
269
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000270 @classmethod
271 def _dcommit_calls_1(cls):
272 return [
vadimsh@chromium.org566a02a2014-08-22 01:34:13 +0000273 ((['git', 'config', 'rietveld.autoupdate'],),
274 ''),
275 ((['git', 'config', 'rietveld.pending-ref-prefix'],),
276 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000277 ((['git',
bratell@opera.com05fb9112014-07-07 09:30:23 +0000278 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000279 ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
280 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
281 None),
282 0)),
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',
tandrii@chromium.org278a25d2016-03-29 09:24:59 +0000291 'config', 'branch.working.rietveldissue'],), '12345'),
292 ((['git',
293 'config', 'rietveld.server'],), 'codereview.example.com'),
294 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000295 'config', 'branch.working.merge'],), 'refs/heads/master'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000296 ((['git', 'config', 'branch.working.remote'],), 'origin'),
iannucci@chromium.org5724c962014-04-11 09:32:56 +0000297 ((['git', 'config', 'branch.working.merge'],),
298 'refs/heads/master'),
299 ((['git', 'config', 'branch.working.remote'],), 'origin'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000300 ((['git', 'rev-list', '--merges',
szager@chromium.orge84b7542012-06-15 21:26:58 +0000301 '--grep=^SVN changes up to revision [0-9]*$',
szager@chromium.org9bb85e22012-06-13 20:28:23 +0000302 'refs/remotes/origin/master^!'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000303 ((['git', 'rev-list', '^refs/heads/working',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000304 'refs/remotes/origin/master'],),
305 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000306 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000307 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000308 '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000309 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000310 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000311 'refs/remotes/origin/master'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000312 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000313 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000314 'fake_ancestor_sha'),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000315 ]
316
317 @classmethod
318 def _dcommit_calls_normal(cls):
319 return [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000320 ((['git', 'rev-parse', '--show-cdup'],), ''),
321 ((['git', 'rev-parse', 'HEAD'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000322 '00ff397798ea57439712ed7e04ab96e13969ef40'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000323 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000324 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...',
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000325 '.'],),
326 'M\tPRESUBMIT.py'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000327 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000328 'config', 'branch.working.rietveldpatchset'],), '31137'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000329 ((['git', 'config', 'branch.working.rietveldserver'],),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000330 'codereview.example.com'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000331 ((['git', 'config', 'user.email'],), 'author@example.com'),
332 ((['git', 'config', 'rietveld.tree-status-url'],), ''),
maruel@chromium.org2e72bb12012-01-17 15:18:35 +0000333 ]
334
335 @classmethod
336 def _dcommit_calls_bypassed(cls):
337 return [
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 [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000547 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
548 ((['git', 'config', '--int', '--get',
iannucci@chromium.org53937ba2012-10-02 18:20:43 +0000549 'branch.master.git-cl-similarity'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000550 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
551 ((['git', 'config', '--int', '--get',
iannucci@chromium.org79540052012-10-19 23:15:26 +0000552 'branch.master.git-find-copies'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000553 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
tandrii@chromium.org278a25d2016-03-29 09:24:59 +0000554 ((['git', 'config', 'branch.master.rietveldissue'],), ''),
555 ((['git', 'config', 'branch.master.gerritissue'],), ''),
556 ((['git', 'config', 'rietveld.autoupdate'],), ''),
557 ((['git', 'config', 'gerrit.host'],), 'True'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000558 ((['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'),
tandrii@chromium.org278a25d2016-03-29 09:24:59 +0000562 ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000563 ((['git', 'rev-parse', '--show-cdup'],), ''),
564 ((['git', 'rev-parse', 'HEAD'],), '12345'),
565 ((['git',
mcgrathr@chromium.org9249f642013-06-03 21:36:18 +0000566 'diff', '--name-status', '--no-renames', '-r',
567 'fake_ancestor_sha...', '.'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000568 'M\t.gitignore\n'),
tandrii@chromium.org278a25d2016-03-29 09:24:59 +0000569 ((['git', 'config', 'branch.master.gerritpatchset'],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000570 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000571 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
ilevy@chromium.org0f58fa82012-11-05 01:45:20 +0000572 'foo'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000573 ((['git', 'config', 'user.email'],), 'me@example.com'),
574 ((['git',
bratell@opera.comf267b0e2013-05-02 09:11:43 +0000575 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000576 '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000577 '+dat'),
tandrii@chromium.org278a25d2016-03-29 09:24:59 +0000578 ]
ukai@chromium.orge8077812012-02-03 03:41:46 +0000579
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000580 @classmethod
581 def _gerrit_upload_calls(cls, description, reviewers, squash,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000582 expected_upstream_ref='origin/refs/heads/master',
583 post_amend_description=None):
584 if post_amend_description is None:
585 post_amend_description = description
ukai@chromium.orge8077812012-02-03 03:41:46 +0000586 calls = [
bauerb@chromium.org54b400c2016-01-14 10:08:25 +0000587 ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000588 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000589 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000590 description)
591 ]
tandrii@chromium.org57d86542016-03-04 16:11:32 +0000592 if not git_footers.get_footer_change_id(description) and not squash:
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000593 calls += [
tandrii@chromium.org10625002016-03-04 20:03:47 +0000594 # DownloadGerritHook(False)
595 ((False, ),
596 ''),
597 # Amending of commit message to get the Change-Id.
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000598 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000599 'fake_ancestor_sha..HEAD'],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000600 description),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000601 ((['git', 'commit', '--amend', '-m', description],),
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000602 ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000603 ((['git', 'log', '--pretty=format:%s\n\n%b',
sbc@chromium.org5e07e062013-02-28 23:55:44 +0000604 'fake_ancestor_sha..HEAD'],),
tandrii@chromium.org10625002016-03-04 20:03:47 +0000605 post_amend_description)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000606 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000607 if squash:
608 ref_to_push = 'abcdef0123456789'
609 calls += [
bauerb@chromium.org13502e02016-02-18 10:18:29 +0000610 ((['git', 'show', '--format=%B', '-s',
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000611 'refs/heads/git_cl_uploads/master'],),
612 (description, 0)),
613 ((['git', 'config', 'branch.master.merge'],),
614 'refs/heads/master'),
615 ((['git', 'config', 'branch.master.remote'],),
616 'origin'),
617 ((['get_or_create_merge_base', 'master', 'master'],),
618 'origin/master'),
619 ((['git', 'rev-parse', 'HEAD:'],),
620 '0123456789abcdef'),
621 ((['git', 'commit-tree', '0123456789abcdef', '-p',
622 'origin/master', '-m', 'd'],),
623 ref_to_push),
624 ]
625 else:
626 ref_to_push = 'HEAD'
627
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000628 calls += [
luqui@chromium.org609f3952015-05-04 22:47:04 +0000629 ((['git', 'rev-list',
630 expected_upstream_ref + '..' + ref_to_push],), ''),
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000631 ((['git', 'config', 'rietveld.cc'],), '')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000632 ]
ukai@chromium.org19bbfa22012-02-03 16:18:11 +0000633 receive_pack = '--receive-pack=git receive-pack '
ukai@chromium.orge8077812012-02-03 03:41:46 +0000634 receive_pack += '--cc=joe@example.com' # from watch list
635 if reviewers:
636 receive_pack += ' '
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000637 receive_pack += ' '.join(
638 '--reviewer=' + email for email in sorted(reviewers))
ukai@chromium.org19bbfa22012-02-03 16:18:11 +0000639 receive_pack += ''
ukai@chromium.orge8077812012-02-03 03:41:46 +0000640 calls += [
bratell@opera.com82b91cd2013-07-09 06:33:41 +0000641 ((['git',
luqui@chromium.org609f3952015-05-04 22:47:04 +0000642 'push', receive_pack, 'origin',
643 ref_to_push + ':refs/for/refs/heads/master'],),
tandrii@chromium.orga342c922016-03-16 07:08:25 +0000644 ('remote:\n'
645 'remote: Processing changes: (\)\n'
646 'remote: Processing changes: (|)\n'
647 'remote: Processing changes: (/)\n'
648 'remote: Processing changes: (-)\n'
649 'remote: Processing changes: new: 1 (/)\n'
650 'remote: Processing changes: new: 1, done\n'
651 'remote:\n'
652 'remote: New Changes:\n'
653 'remote: https://chromium-review.googlesource.com/123456 XXX.\n'
654 'remote:\n'
655 'To https://chromium.googlesource.com/yyy/zzz\n'
656 ' * [new branch] hhhh -> refs/for/refs/heads/master\n')),
ukai@chromium.orge8077812012-02-03 03:41:46 +0000657 ]
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000658 if squash:
659 calls += [
tandrii@chromium.org278a25d2016-03-29 09:24:59 +0000660 ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''),
661 ((['git', 'config', 'branch.master.gerritserver'],), ''),
662 ((['git', 'config', 'remote.origin.url'],),
663 'https://chromium.googlesource.com/my/repo.git'),
664 ((['git', 'config', 'branch.master.gerritserver',
665 'https://chromium-review.googlesource.com'],), ''),
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000666 ((['git', 'rev-parse', 'HEAD'],), 'abcdef0123456789'),
667 ((['git', 'update-ref', '-m', 'Uploaded abcdef0123456789',
668 'refs/heads/git_cl_uploads/master', 'abcdef0123456789'],),
669 '')
670 ]
tandrii@chromium.org1e67bb72016-02-11 12:15:49 +0000671 calls += cls._git_post_upload_calls()
ukai@chromium.orge8077812012-02-03 03:41:46 +0000672 return calls
673
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000674 def _run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000675 self,
676 upload_args,
677 description,
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000678 reviewers,
luqui@chromium.org609f3952015-05-04 22:47:04 +0000679 squash=False,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000680 expected_upstream_ref='origin/refs/heads/master',
681 post_amend_description=None):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000682 """Generic gerrit upload test framework."""
ukai@chromium.orge8077812012-02-03 03:41:46 +0000683 self.calls = self._gerrit_base_calls()
luqui@chromium.org609f3952015-05-04 22:47:04 +0000684 self.calls += self._gerrit_upload_calls(
685 description, reviewers, squash,
tandrii@chromium.org10625002016-03-04 20:03:47 +0000686 expected_upstream_ref=expected_upstream_ref,
687 post_amend_description=post_amend_description)
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000688 # Uncomment when debugging.
689 # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls)))
ukai@chromium.orge8077812012-02-03 03:41:46 +0000690 git_cl.main(['upload'] + upload_args)
691
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000692 def test_gerrit_upload_without_change_id(self):
tandrii@chromium.org10625002016-03-04 20:03:47 +0000693 self.mock(git_cl, 'DownloadGerritHook', self._mocked_call)
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000694 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000695 [],
jamesr@chromium.org35d1a842012-07-27 00:20:43 +0000696 'desc\n\nBUG=\n',
tandrii@chromium.org10625002016-03-04 20:03:47 +0000697 [],
698 post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000699
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000700 def test_gerrit_no_reviewer(self):
701 self._run_gerrit_upload_test(
702 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000703 'desc\n\nBUG=\n\nChange-Id: I123456789\n',
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000704 [])
705
ukai@chromium.orge8077812012-02-03 03:41:46 +0000706 def test_gerrit_reviewers_cmd_line(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000707 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000708 ['-r', 'foo@example.com'],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000709 'desc\n\nBUG=\n\nChange-Id: I123456789',
ukai@chromium.orge8077812012-02-03 03:41:46 +0000710 ['foo@example.com'])
711
712 def test_gerrit_reviewer_multiple(self):
sivachandra@chromium.orgaebe87f2012-10-22 20:34:21 +0000713 self._run_gerrit_upload_test(
ukai@chromium.orge8077812012-02-03 03:41:46 +0000714 [],
tandrii@chromium.org09d7a6a2016-03-04 15:44:48 +0000715 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n'
716 'Change-Id: 123456789\n',
ukai@chromium.orge8077812012-02-03 03:41:46 +0000717 ['reviewer@example.com', 'another@example.com'])
718
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000719 def test_gerrit_upload_squash(self):
720 self._run_gerrit_upload_test(
721 ['--squash'],
722 'desc\n\nBUG=\nChange-Id:123456789\n',
723 [],
luqui@chromium.org609f3952015-05-04 22:47:04 +0000724 squash=True,
725 expected_upstream_ref='origin/master')
ukai@chromium.orge8077812012-02-03 03:41:46 +0000726
rmistry@google.com2dd99862015-06-22 12:22:18 +0000727 def test_upload_branch_deps(self):
728 def mock_run_git(*args, **_kwargs):
729 if args[0] == ['for-each-ref',
730 '--format=%(refname:short) %(upstream:short)',
731 'refs/heads']:
732 # Create a local branch dependency tree that looks like this:
733 # test1 -> test2 -> test3 -> test4 -> test5
734 # -> test3.1
735 # test6 -> test0
736 branch_deps = [
737 'test2 test1', # test1 -> test2
738 'test3 test2', # test2 -> test3
739 'test3.1 test2', # test2 -> test3.1
740 'test4 test3', # test3 -> test4
741 'test5 test4', # test4 -> test5
742 'test6 test0', # test0 -> test6
743 'test7', # test7
744 ]
745 return '\n'.join(branch_deps)
746 self.mock(git_cl, 'RunGit', mock_run_git)
747
andybons@chromium.org962f9462016-02-03 20:00:42 +0000748 git_cl.settings = git_cl.Settings()
749 self.mock(git_cl.settings, 'GetIsGerrit', lambda: False)
750
rmistry@google.com2dd99862015-06-22 12:22:18 +0000751 class RecordCalls:
752 times_called = 0
753 record_calls = RecordCalls()
754 def mock_CMDupload(*args, **_kwargs):
755 record_calls.times_called += 1
756 return 0
757 self.mock(git_cl, 'CMDupload', mock_CMDupload)
758
759 self.calls = [
760 (('[Press enter to continue or ctrl-C to quit]',), ''),
761 ]
762
763 class MockChangelist():
764 def __init__(self):
765 pass
766 def GetBranch(self):
767 return 'test1'
768 def GetIssue(self):
769 return '123'
770 def GetPatchset(self):
771 return '1001'
772
773 ret = git_cl.upload_branch_deps(MockChangelist(), [])
774 # CMDupload should have been called 5 times because of 5 dependent branches.
775 self.assertEquals(5, record_calls.times_called)
776 self.assertEquals(0, ret)
777
tandrii@chromium.org65874e12016-03-04 12:03:02 +0000778 def test_gerrit_change_id(self):
779 self.calls = [
780 ((['git', 'write-tree'], ),
781 'hashtree'),
782 ((['git', 'rev-parse', 'HEAD~0'], ),
783 'branch-parent'),
784 ((['git', 'var', 'GIT_AUTHOR_IDENT'], ),
785 'A B <a@b.org> 1456848326 +0100'),
786 ((['git', 'var', 'GIT_COMMITTER_IDENT'], ),
787 'C D <c@d.org> 1456858326 +0100'),
788 ((['git', 'hash-object', '-t', 'commit', '--stdin'], ),
789 'hashchange'),
790 ]
791 change_id = git_cl.GenerateGerritChangeId('line1\nline2\n')
792 self.assertEqual(change_id, 'Ihashchange')
793
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000794 def test_update_reviewers(self):
795 data = [
796 ('foo', [], 'foo'),
agable@chromium.org42c20792013-09-12 17:34:49 +0000797 ('foo\nR=xx', [], 'foo\nR=xx'),
798 ('foo\nTBR=xx', [], 'foo\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000799 ('foo', ['a@c'], 'foo\n\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +0000800 ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'),
801 ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'),
802 ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000803 ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'),
agable@chromium.org42c20792013-09-12 17:34:49 +0000804 ('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 +0000805 ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'),
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +0000806 ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
807 ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='),
808 # Same as the line before, but full of whitespaces.
809 (
810 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'],
811 'foo\nBar\n\nR=c@c\n BUG =',
812 ),
813 # Whitespaces aren't interpreted as new lines.
814 ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'),
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000815 ]
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +0000816 expected = [i[2] for i in data]
817 actual = []
818 for orig, reviewers, _expected in data:
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000819 obj = git_cl.ChangeDescription(orig)
820 obj.update_reviewers(reviewers)
maruel@chromium.orgc6f60e82013-04-19 17:01:57 +0000821 actual.append(obj.description)
822 self.assertEqual(expected, actual)
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000823
wittman@chromium.org455dc922015-01-26 20:15:50 +0000824 def test_get_target_ref(self):
825 # Check remote or remote branch not present.
826 self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None))
827 self.assertEqual(None, git_cl.GetTargetRef(None,
828 'refs/remotes/origin/master',
829 'master', None))
bauerb@chromium.org27386dd2015-02-16 10:45:39 +0000830
wittman@chromium.org455dc922015-01-26 20:15:50 +0000831 # Check default target refs for branches.
832 self.assertEqual('refs/heads/master',
833 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
834 None, None))
835 self.assertEqual('refs/heads/master',
836 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr',
837 None, None))
838 self.assertEqual('refs/heads/master',
839 git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr',
840 None, None))
841 self.assertEqual('refs/branch-heads/123',
842 git_cl.GetTargetRef('origin',
843 'refs/remotes/branch-heads/123',
844 None, None))
845 self.assertEqual('refs/diff/test',
846 git_cl.GetTargetRef('origin',
847 'refs/remotes/origin/refs/diff/test',
848 None, None))
rmistry@google.comc68112d2015-03-03 12:48:06 +0000849 self.assertEqual('refs/heads/chrome/m42',
850 git_cl.GetTargetRef('origin',
851 'refs/remotes/origin/chrome/m42',
852 None, None))
wittman@chromium.org455dc922015-01-26 20:15:50 +0000853
854 # Check target refs for user-specified target branch.
855 for branch in ('branch-heads/123', 'remotes/branch-heads/123',
856 'refs/remotes/branch-heads/123'):
857 self.assertEqual('refs/branch-heads/123',
858 git_cl.GetTargetRef('origin',
859 'refs/remotes/origin/master',
860 branch, None))
861 for branch in ('origin/master', 'remotes/origin/master',
862 'refs/remotes/origin/master'):
863 self.assertEqual('refs/heads/master',
864 git_cl.GetTargetRef('origin',
865 'refs/remotes/branch-heads/123',
866 branch, None))
867 for branch in ('master', 'heads/master', 'refs/heads/master'):
868 self.assertEqual('refs/heads/master',
869 git_cl.GetTargetRef('origin',
870 'refs/remotes/branch-heads/123',
871 branch, None))
872
873 # Check target refs for pending prefix.
874 self.assertEqual('prefix/heads/master',
875 git_cl.GetTargetRef('origin', 'refs/remotes/origin/master',
876 None, 'prefix/'))
877
wychen@chromium.orga872e752015-04-28 23:42:18 +0000878 def test_patch_when_dirty(self):
879 # Patch when local tree is dirty
880 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
881 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
882
883 def test_diff_when_dirty(self):
884 # Do 'git cl diff' when local tree is dirty
885 self.mock(git_common, 'is_dirty_git_tree', lambda x: True)
886 self.assertNotEqual(git_cl.main(['diff']), 0)
887
888 def _patch_common(self):
tandrii@chromium.org278a25d2016-03-29 09:24:59 +0000889 self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset',
890 lambda x: '60001')
891 self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff',
892 lambda *args: None)
893 self.mock(git_cl.Changelist, 'GetDescription',
894 lambda *args: 'Description')
wychen@chromium.orga872e752015-04-28 23:42:18 +0000895 self.mock(git_cl.Changelist, 'SetIssue', lambda *args: None)
896 self.mock(git_cl.Changelist, 'SetPatchset', lambda *args: None)
897 self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True)
898
899 self.calls = [
900 ((['git', 'config', 'rietveld.autoupdate'],), ''),
901 ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
902 ((['git', 'rev-parse', '--show-cdup'],), ''),
903 ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''),
904 ]
905
906 def test_patch_successful(self):
907 self._patch_common()
908 self.calls += [
909 ((['git', 'apply', '--index', '-p0', '--3way'],), ''),
910 ((['git', 'commit', '-m',
wychen@chromium.org5b3bebb2015-05-28 21:41:43 +0000911 'Description\n\n' +
wychen@chromium.orga872e752015-04-28 23:42:18 +0000912 'patch from issue 123456 at patchset 60001 ' +
913 '(http://crrev.com/123456#ps60001)'],), ''),
tandrii@chromium.org278a25d2016-03-29 09:24:59 +0000914 ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
915 ((['git', 'config', 'branch.master.rietveldserver'],), ''),
wychen@chromium.orga872e752015-04-28 23:42:18 +0000916 ]
917 self.assertEqual(git_cl.main(['patch', '123456']), 0)
918
919 def test_patch_conflict(self):
920 self._patch_common()
921 self.calls += [
922 ((['git', 'apply', '--index', '-p0', '--3way'],), '',
923 subprocess2.CalledProcessError(1, '', '', '', '')),
924 ]
925 self.assertNotEqual(git_cl.main(['patch', '123456']), 0)
wittman@chromium.org455dc922015-01-26 20:15:50 +0000926
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000927if __name__ == '__main__':
maruel@chromium.org78936cb2013-04-11 00:17:52 +0000928 git_cl.logging.basicConfig(
929 level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
maruel@chromium.orgddd59412011-11-30 14:20:38 +0000930 unittest.main()