maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 1 | #!/usr/bin/env python |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 2 | # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 3 | # Use of this source code is governed by a BSD-style license that can be |
| 4 | # found in the LICENSE file. |
| 5 | |
| 6 | """Unit tests for git_cl.py.""" |
| 7 | |
| 8 | import os |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 9 | import StringIO |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 10 | import stat |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 11 | import sys |
| 12 | import unittest |
| 13 | |
| 14 | sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) |
| 15 | |
| 16 | from testing_support.auto_stub import TestCase |
| 17 | |
| 18 | import git_cl |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 19 | import git_common |
tandrii@chromium.org | 57d8654 | 2016-03-04 16:11:32 +0000 | [diff] [blame] | 20 | import git_footers |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 21 | import subprocess2 |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 22 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 23 | class PresubmitMock(object): |
| 24 | def __init__(self, *args, **kwargs): |
| 25 | self.reviewers = [] |
| 26 | @staticmethod |
| 27 | def should_continue(): |
| 28 | return True |
| 29 | |
| 30 | |
| 31 | class RietveldMock(object): |
| 32 | def __init__(self, *args, **kwargs): |
| 33 | pass |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 34 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 35 | @staticmethod |
| 36 | def get_description(issue): |
| 37 | return 'Issue: %d' % issue |
| 38 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 39 | @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.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 51 | |
| 52 | class WatchlistsMock(object): |
| 53 | def __init__(self, _): |
| 54 | pass |
| 55 | @staticmethod |
| 56 | def GetWatchersForPaths(_): |
| 57 | return ['joe@example.com'] |
| 58 | |
| 59 | |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 60 | class 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.org | 11f46eb | 2016-02-02 19:26:51 +0000 | [diff] [blame] | 66 | "GERRIT_HOST: True\n") |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 67 | |
| 68 | |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 69 | class AuthenticatorMock(object): |
| 70 | def __init__(self, *_args): |
| 71 | pass |
| 72 | def has_cached_credentials(self): |
| 73 | return True |
| 74 | |
| 75 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 76 | class TestGitCl(TestCase): |
| 77 | def setUp(self): |
| 78 | super(TestGitCl, self).setUp() |
| 79 | self.calls = [] |
| 80 | self._calls_done = 0 |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 81 | 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.org | a342c92 | 2016-03-16 07:08:25 +0000 | [diff] [blame] | 85 | self.mock(git_cl.gclient_utils, 'CheckCallAndFilter', self._mocked_call) |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 86 | self.mock(git_common, 'is_dirty_git_tree', lambda x: False) |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 87 | 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.org | 8ba38ff | 2015-06-11 21:41:25 +0000 | [diff] [blame] | 90 | self.mock(git_cl, 'BranchExists', lambda _: True) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 91 | self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '') |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 92 | self.mock(git_cl, 'ask_for_data', self._mocked_call) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 93 | self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 94 | self.mock(git_cl.rietveld, 'Rietveld', RietveldMock) |
maruel@chromium.org | 4bac4b5 | 2012-11-27 20:33:52 +0000 | [diff] [blame] | 95 | self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 96 | self.mock(git_cl.upload, 'RealMain', self.fail) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 97 | self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock) |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 98 | self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 99 | # It's important to reset settings to not have inter-tests interference. |
| 100 | git_cl.settings = None |
| 101 | |
| 102 | def tearDown(self): |
wychen@chromium.org | 445c896 | 2015-04-28 23:30:05 +0000 | [diff] [blame] | 103 | try: |
| 104 | if not self.has_failed(): |
| 105 | self.assertEquals([], self.calls) |
| 106 | finally: |
| 107 | super(TestGitCl, self).tearDown() |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 108 | |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 109 | def _mocked_call(self, *args, **_kwargs): |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 110 | self.assertTrue( |
| 111 | self.calls, |
| 112 | '@%d Expected: <Missing> Actual: %r' % (self._calls_done, args)) |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 113 | 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.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 118 | # 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.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 125 | self._calls_done += 1 |
| 126 | return result |
| 127 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 128 | @classmethod |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 129 | def _is_gerrit_calls(cls, gerrit=False): |
| 130 | return [((['git', 'config', 'rietveld.autoupdate'],), ''), |
| 131 | ((['git', 'config', 'gerrit.host'],), 'True' if gerrit else '')] |
| 132 | |
| 133 | @classmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 134 | def _upload_calls(cls, similarity, find_copies, private): |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 135 | return (cls._git_base_calls(similarity, find_copies) + |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 136 | cls._git_upload_calls(private)) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 137 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 138 | @classmethod |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 139 | def _upload_no_rev_calls(cls, similarity, find_copies): |
| 140 | return (cls._git_base_calls(similarity, find_copies) + |
| 141 | cls._git_upload_no_rev_calls()) |
| 142 | |
| 143 | @classmethod |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 144 | def _git_base_calls(cls, similarity, find_copies): |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 145 | if similarity is None: |
| 146 | similarity = '50' |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 147 | similarity_call = ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 148 | 'branch.master.git-cl-similarity'],), '') |
| 149 | else: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 150 | similarity_call = ((['git', 'config', '--int', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 151 | 'branch.master.git-cl-similarity', similarity],), '') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 152 | |
| 153 | if find_copies is None: |
| 154 | find_copies = True |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 155 | find_copies_call = ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 156 | 'branch.master.git-find-copies'],), '') |
| 157 | else: |
| 158 | val = str(int(find_copies)) |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 159 | find_copies_call = ((['git', 'config', '--int', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 160 | 'branch.master.git-find-copies', val],), '') |
| 161 | |
| 162 | if find_copies: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 163 | stat_call = ((['git', 'diff', '--no-ext-diff', '--stat', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 164 | '--find-copies-harder', '-l100000', '-C'+similarity, |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 165 | 'fake_ancestor_sha', 'HEAD'],), '+dat') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 166 | else: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 167 | stat_call = ((['git', 'diff', '--no-ext-diff', '--stat', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 168 | '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 169 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 170 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 171 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 172 | similarity_call, |
| 173 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 174 | find_copies_call, |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 175 | ] + cls._is_gerrit_calls() + [ |
tandrii@chromium.org | 87985d2 | 2016-03-24 17:33:33 +0000 | [diff] [blame] | 176 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 177 | ((['git', 'config', 'branch.master.rietveldissue'],), ''), |
| 178 | ((['git', 'config', 'branch.master.gerritissue'],), ''), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 179 | ((['git', 'config', 'rietveld.server'],), |
| 180 | 'codereview.example.com'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 181 | ((['git', 'config', 'branch.master.merge'],), 'master'), |
| 182 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 183 | ((['get_or_create_merge_base', 'master', 'master'],), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 184 | 'fake_ancestor_sha'), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 185 | ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 186 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 187 | ((['git', 'rev-parse', 'HEAD'],), '12345'), |
| 188 | ((['git', 'diff', '--name-status', '--no-renames', '-r', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 189 | 'fake_ancestor_sha...', '.'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 190 | 'M\t.gitignore\n'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 191 | ((['git', 'config', 'branch.master.rietveldpatchset'],), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 192 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 193 | ((['git', 'log', '--pretty=format:%s%n%n%b', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 194 | 'fake_ancestor_sha...'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 195 | 'foo'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 196 | ((['git', 'config', 'user.email'],), 'me@example.com'), |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 197 | stat_call, |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 198 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 199 | 'fake_ancestor_sha..HEAD'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 200 | 'desc\n'), |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 201 | ((['git', 'config', 'rietveld.bug-prefix'],), ''), |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 202 | ] |
| 203 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 204 | @classmethod |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 205 | def _git_upload_no_rev_calls(cls): |
| 206 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 207 | ((['git', 'config', 'core.editor'],), ''), |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 208 | ] |
| 209 | |
| 210 | @classmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 211 | def _git_upload_calls(cls, private): |
| 212 | if private: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 213 | cc_call = [] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 214 | private_call = [] |
| 215 | else: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 216 | cc_call = [((['git', 'config', 'rietveld.cc'],), '')] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 217 | private_call = [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 218 | ((['git', 'config', 'rietveld.private'],), '')] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 219 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 220 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 221 | ((['git', 'config', 'core.editor'],), ''), |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 222 | ] + cc_call + private_call + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 223 | ((['git', 'config', 'branch.master.base-url'],), ''), |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 224 | ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 225 | ((['git', |
bratell@opera.com | 05fb911 | 2014-07-07 09:30:23 +0000 | [diff] [blame] | 226 | 'config', '--local', '--get-regexp', '^svn-remote\\.'],), |
| 227 | (('', None), 0)), |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 228 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 229 | ((['git', 'svn', 'info'],), ''), |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 230 | ((['git', 'config', 'rietveld.project'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 231 | ((['git', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 232 | 'config', 'branch.master.rietveldissue', '1'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 233 | ((['git', 'config', 'branch.master.rietveldserver', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 234 | 'https://codereview.example.com'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 235 | ((['git', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 236 | 'config', 'branch.master.rietveldpatchset', '2'],), ''), |
tandrii@chromium.org | 1e67bb7 | 2016-02-11 12:15:49 +0000 | [diff] [blame] | 237 | ] + cls._git_post_upload_calls() |
| 238 | |
| 239 | @classmethod |
| 240 | def _git_post_upload_calls(cls): |
| 241 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 242 | ((['git', 'rev-parse', 'HEAD'],), 'hash'), |
| 243 | ((['git', 'symbolic-ref', 'HEAD'],), 'hash'), |
| 244 | ((['git', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 245 | 'config', 'branch.hash.last-upload-hash', 'hash'],), ''), |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 246 | ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''), |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 247 | ] |
| 248 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 249 | @staticmethod |
| 250 | def _git_sanity_checks(diff_base, working_branch): |
| 251 | fake_ancestor = 'fake_ancestor' |
| 252 | fake_cl = 'fake_cl_for_patch' |
| 253 | return [ |
| 254 | # Calls to verify branch point is ancestor |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 255 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 256 | 'rev-parse', '--verify', diff_base],), fake_ancestor), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 257 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 258 | 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 259 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 260 | 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 261 | # Mock a config miss (error code 1) |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 262 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 263 | 'config', 'gitcl.remotebranch'],), (('', None), 1)), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 264 | # Call to GetRemoteBranch() |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 265 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 266 | 'config', 'branch.%s.merge' % working_branch],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 267 | 'refs/heads/master'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 268 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 269 | 'config', 'branch.%s.remote' % working_branch],), 'origin'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 270 | ((['git', 'rev-list', '^' + fake_ancestor, |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 271 | 'refs/remotes/origin/master'],), ''), |
| 272 | ] |
| 273 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 274 | @classmethod |
| 275 | def _dcommit_calls_1(cls): |
| 276 | return [ |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 277 | ((['git', 'config', 'rietveld.autoupdate'],), |
| 278 | ''), |
| 279 | ((['git', 'config', 'rietveld.pending-ref-prefix'],), |
| 280 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 281 | ((['git', |
bratell@opera.com | 05fb911 | 2014-07-07 09:30:23 +0000 | [diff] [blame] | 282 | 'config', '--local', '--get-regexp', '^svn-remote\\.'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 283 | ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n' |
| 284 | 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'), |
| 285 | None), |
| 286 | 0)), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 287 | ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| 288 | ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 289 | 'branch.working.git-cl-similarity'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 290 | ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| 291 | ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 292 | 'branch.working.git-find-copies'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 293 | ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| 294 | ((['git', |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 295 | 'config', 'branch.working.rietveldissue'],), '12345'), |
| 296 | ((['git', |
| 297 | 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 298 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 299 | 'config', 'branch.working.merge'],), 'refs/heads/master'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 300 | ((['git', 'config', 'branch.working.remote'],), 'origin'), |
iannucci@chromium.org | 5724c96 | 2014-04-11 09:32:56 +0000 | [diff] [blame] | 301 | ((['git', 'config', 'branch.working.merge'],), |
| 302 | 'refs/heads/master'), |
| 303 | ((['git', 'config', 'branch.working.remote'],), 'origin'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 304 | ((['git', 'rev-list', '--merges', |
szager@chromium.org | e84b754 | 2012-06-15 21:26:58 +0000 | [diff] [blame] | 305 | '--grep=^SVN changes up to revision [0-9]*$', |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 306 | 'refs/remotes/origin/master^!'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 307 | ((['git', 'rev-list', '^refs/heads/working', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 308 | 'refs/remotes/origin/master'],), |
| 309 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 310 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 311 | 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 312 | '3fc18b62c4966193eb435baabe2d18a3810ec82e'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 313 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 314 | 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 315 | 'refs/remotes/origin/master'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 316 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 317 | 'merge-base', 'refs/remotes/origin/master', 'HEAD'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 318 | 'fake_ancestor_sha'), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 319 | ] |
| 320 | |
| 321 | @classmethod |
| 322 | def _dcommit_calls_normal(cls): |
| 323 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 324 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 325 | ((['git', 'rev-parse', 'HEAD'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 326 | '00ff397798ea57439712ed7e04ab96e13969ef40'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 327 | ((['git', |
mcgrathr@chromium.org | 9249f64 | 2013-06-03 21:36:18 +0000 | [diff] [blame] | 328 | 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 329 | '.'],), |
| 330 | 'M\tPRESUBMIT.py'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 331 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 332 | 'config', 'branch.working.rietveldpatchset'],), '31137'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 333 | ((['git', 'config', 'branch.working.rietveldserver'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 334 | 'codereview.example.com'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 335 | ((['git', 'config', 'user.email'],), 'author@example.com'), |
| 336 | ((['git', 'config', 'rietveld.tree-status-url'],), ''), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 337 | ] |
| 338 | |
| 339 | @classmethod |
| 340 | def _dcommit_calls_bypassed(cls): |
| 341 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 342 | ((['git', 'config', 'branch.working.rietveldserver'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 343 | 'codereview.example.com'), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 344 | ] |
| 345 | |
| 346 | @classmethod |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 347 | def _dcommit_calls_3(cls): |
| 348 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 349 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 350 | 'diff', '--no-ext-diff', '--stat', '--find-copies-harder', |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 351 | '-l100000', '-C50', 'fake_ancestor_sha', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 352 | 'refs/heads/working'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 353 | (' PRESUBMIT.py | 2 +-\n' |
| 354 | ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 355 | ((['git', 'show-ref', '--quiet', '--verify', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 356 | 'refs/heads/git-cl-commit'],), |
| 357 | (('', None), 0)), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 358 | ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
| 359 | ((['git', 'show-ref', '--quiet', '--verify', |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 360 | 'refs/heads/git-cl-cherry-pick'],), ''), |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 361 | ((['git', 'rev-parse', '--show-cdup'],), '\n'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 362 | ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''), |
| 363 | ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''), |
| 364 | ((['git', 'commit', '-m', |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 365 | 'Issue: 12345\n\nR=john@chromium.org\n\n' |
sergiyb@chromium.org | 4b39c5f | 2015-07-07 10:33:12 +0000 | [diff] [blame] | 366 | 'Review URL: https://codereview.example.com/12345 .'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 367 | ''), |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 368 | ((['git', 'config', 'rietveld.force-https-commit-url'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 369 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 370 | 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],), |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 371 | (('', None), 0)), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 372 | ((['git', 'checkout', '-q', 'working'],), ''), |
| 373 | ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 374 | ] |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 375 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 376 | @staticmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 377 | def _cmd_line(description, args, similarity, find_copies, private): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 378 | """Returns the upload command line passed to upload.RealMain().""" |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 379 | return [ |
| 380 | 'upload', '--assume_yes', '--server', |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 381 | 'https://codereview.example.com', |
maruel@chromium.org | 71e12a9 | 2012-02-14 02:34:15 +0000 | [diff] [blame] | 382 | '--message', description |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 383 | ] + args + [ |
| 384 | '--cc', 'joe@example.com', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 385 | ] + (['--private'] if private else []) + [ |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 386 | '--git_similarity', similarity or '50' |
| 387 | ] + (['--git_no_find_copies'] if find_copies == False else []) + [ |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 388 | 'fake_ancestor_sha', 'HEAD' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 389 | ] |
| 390 | |
| 391 | def _run_reviewer_test( |
| 392 | self, |
| 393 | upload_args, |
| 394 | expected_description, |
| 395 | returned_description, |
| 396 | final_description, |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 397 | reviewers, |
| 398 | private=False): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 399 | """Generic reviewer test framework.""" |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 400 | try: |
| 401 | similarity = upload_args[upload_args.index('--similarity')+1] |
| 402 | except ValueError: |
| 403 | similarity = None |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 404 | |
| 405 | if '--find-copies' in upload_args: |
| 406 | find_copies = True |
| 407 | elif '--no-find-copies' in upload_args: |
| 408 | find_copies = False |
| 409 | else: |
| 410 | find_copies = None |
| 411 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 412 | private = '--private' in upload_args |
| 413 | |
| 414 | self.calls = self._upload_calls(similarity, find_copies, private) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 415 | |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 416 | def RunEditor(desc, _, **kwargs): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 417 | self.assertEquals( |
| 418 | '# Enter a description of the change.\n' |
janx@chromium.org | 104b2db | 2013-04-18 12:58:40 +0000 | [diff] [blame] | 419 | '# This will be displayed on the codereview site.\n' |
alancutter@chromium.org | 63a4d7f | 2013-05-31 02:22:45 +0000 | [diff] [blame] | 420 | '# The first line will also be used as the subject of the review.\n' |
alancutter@chromium.org | bd1073e | 2013-06-01 00:34:38 +0000 | [diff] [blame] | 421 | '#--------------------This line is 72 characters long' |
| 422 | '--------------------\n' + |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 423 | expected_description, |
| 424 | desc) |
| 425 | return returned_description |
| 426 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 427 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 428 | def check_upload(args): |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 429 | cmd_line = self._cmd_line(final_description, reviewers, similarity, |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 430 | find_copies, private) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 431 | self.assertEquals(cmd_line, args) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 432 | return 1, 2 |
| 433 | self.mock(git_cl.upload, 'RealMain', check_upload) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 434 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 435 | git_cl.main(['upload'] + upload_args) |
| 436 | |
| 437 | def test_no_reviewer(self): |
| 438 | self._run_reviewer_test( |
| 439 | [], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 440 | 'desc\n\nBUG=', |
| 441 | '# Blah blah comment.\ndesc\n\nBUG=', |
| 442 | 'desc\n\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 443 | []) |
| 444 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 445 | def test_keep_similarity(self): |
| 446 | self._run_reviewer_test( |
| 447 | ['--similarity', '70'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 448 | 'desc\n\nBUG=', |
| 449 | '# Blah blah comment.\ndesc\n\nBUG=', |
| 450 | 'desc\n\nBUG=', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 451 | []) |
| 452 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 453 | def test_keep_find_copies(self): |
| 454 | self._run_reviewer_test( |
| 455 | ['--no-find-copies'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 456 | 'desc\n\nBUG=', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 457 | '# Blah blah comment.\ndesc\n\nBUG=\n', |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 458 | 'desc\n\nBUG=', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 459 | []) |
| 460 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 461 | def test_private(self): |
| 462 | self._run_reviewer_test( |
| 463 | ['--private'], |
| 464 | 'desc\n\nBUG=', |
| 465 | '# Blah blah comment.\ndesc\n\nBUG=\n', |
| 466 | 'desc\n\nBUG=', |
| 467 | []) |
| 468 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 469 | def test_reviewers_cmd_line(self): |
| 470 | # Reviewer is passed as-is |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 471 | description = 'desc\n\nR=foo@example.com\nBUG=' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 472 | self._run_reviewer_test( |
| 473 | ['-r' 'foo@example.com'], |
| 474 | description, |
| 475 | '\n%s\n' % description, |
| 476 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 477 | ['--reviewers=foo@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 478 | |
| 479 | def test_reviewer_tbr_overriden(self): |
| 480 | # Reviewer is overriden with TBR |
| 481 | # Also verifies the regexp work without a trailing LF |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 482 | description = 'Foo Bar\n\nTBR=reviewer@example.com' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 483 | self._run_reviewer_test( |
| 484 | ['-r' 'foo@example.com'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 485 | 'desc\n\nR=foo@example.com\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 486 | description.strip('\n'), |
| 487 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 488 | ['--reviewers=reviewer@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 489 | |
| 490 | def test_reviewer_multiple(self): |
| 491 | # Handles multiple R= or TBR= lines. |
| 492 | description = ( |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 493 | 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com') |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 494 | self._run_reviewer_test( |
| 495 | [], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 496 | 'desc\n\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 497 | description, |
| 498 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 499 | ['--reviewers=another@example.com,reviewer@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 500 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 501 | def test_reviewer_send_mail(self): |
| 502 | # --send-mail can be used without -r if R= is used |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 503 | description = 'Foo Bar\nR=reviewer@example.com' |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 504 | self._run_reviewer_test( |
| 505 | ['--send-mail'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 506 | 'desc\n\nBUG=', |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 507 | description.strip('\n'), |
| 508 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 509 | ['--reviewers=reviewer@example.com', '--send_mail']) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 510 | |
| 511 | def test_reviewer_send_mail_no_rev(self): |
| 512 | # Fails without a reviewer. |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 513 | stdout = StringIO.StringIO() |
| 514 | stderr = StringIO.StringIO() |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 515 | try: |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 516 | self.calls = self._upload_no_rev_calls(None, None) |
| 517 | def RunEditor(desc, _, **kwargs): |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 518 | return desc |
| 519 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 520 | self.mock(sys, 'stdout', stdout) |
| 521 | self.mock(sys, 'stderr', stderr) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 522 | git_cl.main(['upload', '--send-mail']) |
| 523 | self.fail() |
| 524 | except SystemExit: |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 525 | self.assertEqual( |
| 526 | 'Using 50% similarity for rename/copy detection. Override with ' |
| 527 | '--similarity.\n', |
| 528 | stdout.getvalue()) |
| 529 | self.assertEqual( |
| 530 | 'Must specify reviewers to send email.\n', stderr.getvalue()) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 531 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 532 | def test_dcommit(self): |
| 533 | self.calls = ( |
| 534 | self._dcommit_calls_1() + |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 535 | self._git_sanity_checks('fake_ancestor_sha', 'working') + |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 536 | self._dcommit_calls_normal() + |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 537 | self._dcommit_calls_3()) |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 538 | git_cl.main(['dcommit']) |
| 539 | |
| 540 | def test_dcommit_bypass_hooks(self): |
| 541 | self.calls = ( |
| 542 | self._dcommit_calls_1() + |
| 543 | self._dcommit_calls_bypassed() + |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 544 | self._dcommit_calls_3()) |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 545 | git_cl.main(['dcommit', '--bypass-hooks']) |
| 546 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 547 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 548 | @classmethod |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 549 | def _gerrit_base_calls(cls, issue=None): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 550 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 551 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 552 | ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 553 | 'branch.master.git-cl-similarity'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 554 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 555 | ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 556 | 'branch.master.git-find-copies'],), ''), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 557 | ] + cls._is_gerrit_calls(True) + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 558 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 559 | ((['git', 'config', 'branch.master.rietveldissue'],), ''), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 560 | ((['git', 'config', 'branch.master.gerritissue'],), |
| 561 | '' if issue is None else str(issue)), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 562 | ((['git', 'config', 'branch.master.merge'],), 'master'), |
| 563 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 564 | ((['get_or_create_merge_base', 'master', 'master'],), |
| 565 | 'fake_ancestor_sha'), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 566 | ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 567 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 568 | ((['git', 'rev-parse', 'HEAD'],), '12345'), |
| 569 | ((['git', |
mcgrathr@chromium.org | 9249f64 | 2013-06-03 21:36:18 +0000 | [diff] [blame] | 570 | 'diff', '--name-status', '--no-renames', '-r', |
| 571 | 'fake_ancestor_sha...', '.'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 572 | 'M\t.gitignore\n'), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 573 | ((['git', 'config', 'branch.master.gerritpatchset'],), ''), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 574 | ] + ([] if issue else [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 575 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 576 | 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 577 | 'foo'), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 578 | ]) + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 579 | ((['git', 'config', 'user.email'],), 'me@example.com'), |
| 580 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 581 | 'diff', '--no-ext-diff', '--stat', '--find-copies-harder', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 582 | '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 583 | '+dat'), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 584 | ] |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 585 | |
tandrii@chromium.org | 1e67bb7 | 2016-02-11 12:15:49 +0000 | [diff] [blame] | 586 | @classmethod |
| 587 | def _gerrit_upload_calls(cls, description, reviewers, squash, |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 588 | expected_upstream_ref='origin/refs/heads/master', |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 589 | post_amend_description=None, issue=None): |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 590 | if post_amend_description is None: |
| 591 | post_amend_description = description |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 592 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 593 | calls = [ |
bauerb@chromium.org | 54b400c | 2016-01-14 10:08:25 +0000 | [diff] [blame] | 594 | ((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 595 | ] |
| 596 | # If issue is given, then description is fetched from Gerrit instead. |
| 597 | if issue is None: |
| 598 | if squash: |
| 599 | calls += [ |
| 600 | ((['git', 'show', '--format=%B', '-s', |
| 601 | 'refs/heads/git_cl_uploads/master'],), '')] |
| 602 | calls += [ |
| 603 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
| 604 | 'fake_ancestor_sha..HEAD'],), |
| 605 | description)] |
tandrii@chromium.org | 57d8654 | 2016-03-04 16:11:32 +0000 | [diff] [blame] | 606 | if not git_footers.get_footer_change_id(description) and not squash: |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 607 | calls += [ |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 608 | # DownloadGerritHook(False) |
| 609 | ((False, ), |
| 610 | ''), |
| 611 | # Amending of commit message to get the Change-Id. |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 612 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 613 | 'fake_ancestor_sha..HEAD'],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 614 | description), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 615 | ((['git', 'commit', '--amend', '-m', description],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 616 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 617 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 618 | 'fake_ancestor_sha..HEAD'],), |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 619 | post_amend_description) |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 620 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 621 | if squash: |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 622 | if not issue: |
| 623 | # Prompting to edit description on first upload. |
| 624 | calls += [ |
| 625 | ((['git', 'config', 'core.editor'],), ''), |
| 626 | ((['RunEditor'],), description), |
| 627 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 628 | ref_to_push = 'abcdef0123456789' |
| 629 | calls += [ |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 630 | ((['git', 'config', 'branch.master.merge'],), |
| 631 | 'refs/heads/master'), |
| 632 | ((['git', 'config', 'branch.master.remote'],), |
| 633 | 'origin'), |
| 634 | ((['get_or_create_merge_base', 'master', 'master'],), |
| 635 | 'origin/master'), |
| 636 | ((['git', 'rev-parse', 'HEAD:'],), |
| 637 | '0123456789abcdef'), |
| 638 | ((['git', 'commit-tree', '0123456789abcdef', '-p', |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 639 | 'origin/master', '-m', description],), |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 640 | ref_to_push), |
| 641 | ] |
| 642 | else: |
| 643 | ref_to_push = 'HEAD' |
| 644 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 645 | calls += [ |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 646 | ((['git', 'rev-list', |
| 647 | expected_upstream_ref + '..' + ref_to_push],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 648 | ((['git', 'config', 'rietveld.cc'],), '') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 649 | ] |
ukai@chromium.org | 19bbfa2 | 2012-02-03 16:18:11 +0000 | [diff] [blame] | 650 | receive_pack = '--receive-pack=git receive-pack ' |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 651 | receive_pack += '--cc=joe@example.com' # from watch list |
| 652 | if reviewers: |
| 653 | receive_pack += ' ' |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 654 | receive_pack += ' '.join( |
| 655 | '--reviewer=' + email for email in sorted(reviewers)) |
ukai@chromium.org | 19bbfa2 | 2012-02-03 16:18:11 +0000 | [diff] [blame] | 656 | receive_pack += '' |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 657 | calls += [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 658 | ((['git', |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 659 | 'push', receive_pack, 'origin', |
| 660 | ref_to_push + ':refs/for/refs/heads/master'],), |
tandrii@chromium.org | a342c92 | 2016-03-16 07:08:25 +0000 | [diff] [blame] | 661 | ('remote:\n' |
| 662 | 'remote: Processing changes: (\)\n' |
| 663 | 'remote: Processing changes: (|)\n' |
| 664 | 'remote: Processing changes: (/)\n' |
| 665 | 'remote: Processing changes: (-)\n' |
| 666 | 'remote: Processing changes: new: 1 (/)\n' |
| 667 | 'remote: Processing changes: new: 1, done\n' |
| 668 | 'remote:\n' |
| 669 | 'remote: New Changes:\n' |
| 670 | 'remote: https://chromium-review.googlesource.com/123456 XXX.\n' |
| 671 | 'remote:\n' |
| 672 | 'To https://chromium.googlesource.com/yyy/zzz\n' |
| 673 | ' * [new branch] hhhh -> refs/for/refs/heads/master\n')), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 674 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 675 | if squash: |
| 676 | calls += [ |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 677 | ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''), |
| 678 | ((['git', 'config', 'branch.master.gerritserver'],), ''), |
| 679 | ((['git', 'config', 'remote.origin.url'],), |
| 680 | 'https://chromium.googlesource.com/my/repo.git'), |
| 681 | ((['git', 'config', 'branch.master.gerritserver', |
| 682 | 'https://chromium-review.googlesource.com'],), ''), |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 683 | ((['git', 'config', 'branch.master.gerritsquashhash', |
| 684 | 'abcdef0123456789'],), ''), |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 685 | ] |
tandrii@chromium.org | 1e67bb7 | 2016-02-11 12:15:49 +0000 | [diff] [blame] | 686 | calls += cls._git_post_upload_calls() |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 687 | return calls |
| 688 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 689 | def _run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 690 | self, |
| 691 | upload_args, |
| 692 | description, |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 693 | reviewers, |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 694 | squash=False, |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 695 | expected_upstream_ref='origin/refs/heads/master', |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 696 | post_amend_description=None, |
| 697 | issue=None): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 698 | """Generic gerrit upload test framework.""" |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 699 | self.calls = self._gerrit_base_calls(issue=issue) |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 700 | self.calls += self._gerrit_upload_calls( |
| 701 | description, reviewers, squash, |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 702 | expected_upstream_ref=expected_upstream_ref, |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 703 | post_amend_description=post_amend_description, |
| 704 | issue=issue) |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 705 | # Uncomment when debugging. |
| 706 | # print '\n'.join(map(lambda x: '%2i: %s' % x, enumerate(self.calls))) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 707 | git_cl.main(['upload'] + upload_args) |
| 708 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 709 | def test_gerrit_upload_without_change_id(self): |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 710 | self.mock(git_cl, 'DownloadGerritHook', self._mocked_call) |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 711 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 712 | [], |
jamesr@chromium.org | 35d1a84 | 2012-07-27 00:20:43 +0000 | [diff] [blame] | 713 | 'desc\n\nBUG=\n', |
tandrii@chromium.org | 1062500 | 2016-03-04 20:03:47 +0000 | [diff] [blame] | 714 | [], |
| 715 | post_amend_description='desc\n\nBUG=\n\nChange-Id: Ixxx') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 716 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 717 | def test_gerrit_no_reviewer(self): |
| 718 | self._run_gerrit_upload_test( |
| 719 | [], |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 720 | 'desc\n\nBUG=\n\nChange-Id: I123456789\n', |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 721 | []) |
| 722 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 723 | def test_gerrit_reviewers_cmd_line(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 724 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 725 | ['-r', 'foo@example.com'], |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 726 | 'desc\n\nBUG=\n\nChange-Id: I123456789', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 727 | ['foo@example.com']) |
| 728 | |
| 729 | def test_gerrit_reviewer_multiple(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 730 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 731 | [], |
tandrii@chromium.org | 09d7a6a | 2016-03-04 15:44:48 +0000 | [diff] [blame] | 732 | 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n\n' |
| 733 | 'Change-Id: 123456789\n', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 734 | ['reviewer@example.com', 'another@example.com']) |
| 735 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 736 | def test_gerrit_upload_squash_first(self): |
| 737 | # Mock Gerrit CL description to indicate the first upload. |
| 738 | self.mock(git_cl.Changelist, 'GetDescription', |
| 739 | lambda *_: None) |
| 740 | self.mock(git_cl.gclient_utils, 'RunEditor', |
| 741 | lambda *_, **__: self._mocked_call(['RunEditor'])) |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 742 | self._run_gerrit_upload_test( |
| 743 | ['--squash'], |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 744 | 'desc\nBUG=\n\nChange-Id: 123456789', |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 745 | [], |
luqui@chromium.org | 609f395 | 2015-05-04 22:47:04 +0000 | [diff] [blame] | 746 | squash=True, |
| 747 | expected_upstream_ref='origin/master') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 748 | |
tandrii@chromium.org | 512d79c | 2016-03-31 12:55:28 +0000 | [diff] [blame] | 749 | def test_gerrit_upload_squash_reupload(self): |
| 750 | description = 'desc\nBUG=\n\nChange-Id: 123456789' |
| 751 | # Mock Gerrit CL description to indicate re-upload. |
| 752 | self.mock(git_cl.Changelist, 'GetDescription', |
| 753 | lambda *args: description) |
| 754 | self.mock(git_cl.Changelist, 'GetMostRecentPatchset', |
| 755 | lambda *args: 1) |
| 756 | self.mock(git_cl._GerritChangelistImpl, '_GetChangeDetail', |
| 757 | lambda *args: {'change_id': '123456789'}) |
| 758 | self._run_gerrit_upload_test( |
| 759 | ['--squash'], |
| 760 | description, |
| 761 | [], |
| 762 | squash=True, |
| 763 | expected_upstream_ref='origin/master', |
| 764 | issue=123456) |
| 765 | |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 766 | def test_upload_branch_deps(self): |
| 767 | def mock_run_git(*args, **_kwargs): |
| 768 | if args[0] == ['for-each-ref', |
| 769 | '--format=%(refname:short) %(upstream:short)', |
| 770 | 'refs/heads']: |
| 771 | # Create a local branch dependency tree that looks like this: |
| 772 | # test1 -> test2 -> test3 -> test4 -> test5 |
| 773 | # -> test3.1 |
| 774 | # test6 -> test0 |
| 775 | branch_deps = [ |
| 776 | 'test2 test1', # test1 -> test2 |
| 777 | 'test3 test2', # test2 -> test3 |
| 778 | 'test3.1 test2', # test2 -> test3.1 |
| 779 | 'test4 test3', # test3 -> test4 |
| 780 | 'test5 test4', # test4 -> test5 |
| 781 | 'test6 test0', # test0 -> test6 |
| 782 | 'test7', # test7 |
| 783 | ] |
| 784 | return '\n'.join(branch_deps) |
| 785 | self.mock(git_cl, 'RunGit', mock_run_git) |
| 786 | |
| 787 | class RecordCalls: |
| 788 | times_called = 0 |
| 789 | record_calls = RecordCalls() |
| 790 | def mock_CMDupload(*args, **_kwargs): |
| 791 | record_calls.times_called += 1 |
| 792 | return 0 |
| 793 | self.mock(git_cl, 'CMDupload', mock_CMDupload) |
| 794 | |
| 795 | self.calls = [ |
| 796 | (('[Press enter to continue or ctrl-C to quit]',), ''), |
| 797 | ] |
| 798 | |
| 799 | class MockChangelist(): |
| 800 | def __init__(self): |
| 801 | pass |
| 802 | def GetBranch(self): |
| 803 | return 'test1' |
| 804 | def GetIssue(self): |
| 805 | return '123' |
| 806 | def GetPatchset(self): |
| 807 | return '1001' |
tandrii@chromium.org | 4c72b08 | 2016-03-31 22:26:35 +0000 | [diff] [blame] | 808 | def IsGerrit(self): |
| 809 | return False |
rmistry@google.com | 2dd9986 | 2015-06-22 12:22:18 +0000 | [diff] [blame] | 810 | |
| 811 | ret = git_cl.upload_branch_deps(MockChangelist(), []) |
| 812 | # CMDupload should have been called 5 times because of 5 dependent branches. |
| 813 | self.assertEquals(5, record_calls.times_called) |
| 814 | self.assertEquals(0, ret) |
| 815 | |
tandrii@chromium.org | 65874e1 | 2016-03-04 12:03:02 +0000 | [diff] [blame] | 816 | def test_gerrit_change_id(self): |
| 817 | self.calls = [ |
| 818 | ((['git', 'write-tree'], ), |
| 819 | 'hashtree'), |
| 820 | ((['git', 'rev-parse', 'HEAD~0'], ), |
| 821 | 'branch-parent'), |
| 822 | ((['git', 'var', 'GIT_AUTHOR_IDENT'], ), |
| 823 | 'A B <a@b.org> 1456848326 +0100'), |
| 824 | ((['git', 'var', 'GIT_COMMITTER_IDENT'], ), |
| 825 | 'C D <c@d.org> 1456858326 +0100'), |
| 826 | ((['git', 'hash-object', '-t', 'commit', '--stdin'], ), |
| 827 | 'hashchange'), |
| 828 | ] |
| 829 | change_id = git_cl.GenerateGerritChangeId('line1\nline2\n') |
| 830 | self.assertEqual(change_id, 'Ihashchange') |
| 831 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 832 | def test_update_reviewers(self): |
| 833 | data = [ |
| 834 | ('foo', [], 'foo'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 835 | ('foo\nR=xx', [], 'foo\nR=xx'), |
| 836 | ('foo\nTBR=xx', [], 'foo\nTBR=xx'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 837 | ('foo', ['a@c'], 'foo\n\nR=a@c'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 838 | ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'), |
| 839 | ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'), |
| 840 | ('foo\nTBR=xx\nR=yy', ['a@c'], 'foo\n\nR=a@c, yy\nTBR=xx'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 841 | ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 842 | ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], 'foo\n\nR=a@c, xx, bar\nTBR=yy'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 843 | ('foo', ['a@c', 'b@c'], 'foo\n\nR=a@c, b@c'), |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 844 | ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='), |
| 845 | ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='), |
| 846 | # Same as the line before, but full of whitespaces. |
| 847 | ( |
| 848 | 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], |
| 849 | 'foo\nBar\n\nR=c@c\n BUG =', |
| 850 | ), |
| 851 | # Whitespaces aren't interpreted as new lines. |
| 852 | ('foo BUG=allo R=joe ', ['c@c'], 'foo BUG=allo R=joe\n\nR=c@c'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 853 | ] |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 854 | expected = [i[2] for i in data] |
| 855 | actual = [] |
| 856 | for orig, reviewers, _expected in data: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 857 | obj = git_cl.ChangeDescription(orig) |
| 858 | obj.update_reviewers(reviewers) |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 859 | actual.append(obj.description) |
| 860 | self.assertEqual(expected, actual) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 861 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 862 | def test_get_target_ref(self): |
| 863 | # Check remote or remote branch not present. |
| 864 | self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None)) |
| 865 | self.assertEqual(None, git_cl.GetTargetRef(None, |
| 866 | 'refs/remotes/origin/master', |
| 867 | 'master', None)) |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 868 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 869 | # Check default target refs for branches. |
| 870 | self.assertEqual('refs/heads/master', |
| 871 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/master', |
| 872 | None, None)) |
| 873 | self.assertEqual('refs/heads/master', |
| 874 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr', |
| 875 | None, None)) |
| 876 | self.assertEqual('refs/heads/master', |
| 877 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr', |
| 878 | None, None)) |
| 879 | self.assertEqual('refs/branch-heads/123', |
| 880 | git_cl.GetTargetRef('origin', |
| 881 | 'refs/remotes/branch-heads/123', |
| 882 | None, None)) |
| 883 | self.assertEqual('refs/diff/test', |
| 884 | git_cl.GetTargetRef('origin', |
| 885 | 'refs/remotes/origin/refs/diff/test', |
| 886 | None, None)) |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 887 | self.assertEqual('refs/heads/chrome/m42', |
| 888 | git_cl.GetTargetRef('origin', |
| 889 | 'refs/remotes/origin/chrome/m42', |
| 890 | None, None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 891 | |
| 892 | # Check target refs for user-specified target branch. |
| 893 | for branch in ('branch-heads/123', 'remotes/branch-heads/123', |
| 894 | 'refs/remotes/branch-heads/123'): |
| 895 | self.assertEqual('refs/branch-heads/123', |
| 896 | git_cl.GetTargetRef('origin', |
| 897 | 'refs/remotes/origin/master', |
| 898 | branch, None)) |
| 899 | for branch in ('origin/master', 'remotes/origin/master', |
| 900 | 'refs/remotes/origin/master'): |
| 901 | self.assertEqual('refs/heads/master', |
| 902 | git_cl.GetTargetRef('origin', |
| 903 | 'refs/remotes/branch-heads/123', |
| 904 | branch, None)) |
| 905 | for branch in ('master', 'heads/master', 'refs/heads/master'): |
| 906 | self.assertEqual('refs/heads/master', |
| 907 | git_cl.GetTargetRef('origin', |
| 908 | 'refs/remotes/branch-heads/123', |
| 909 | branch, None)) |
| 910 | |
| 911 | # Check target refs for pending prefix. |
| 912 | self.assertEqual('prefix/heads/master', |
| 913 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/master', |
| 914 | None, 'prefix/')) |
| 915 | |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 916 | def test_patch_when_dirty(self): |
| 917 | # Patch when local tree is dirty |
| 918 | self.mock(git_common, 'is_dirty_git_tree', lambda x: True) |
| 919 | self.assertNotEqual(git_cl.main(['patch', '123456']), 0) |
| 920 | |
| 921 | def test_diff_when_dirty(self): |
| 922 | # Do 'git cl diff' when local tree is dirty |
| 923 | self.mock(git_common, 'is_dirty_git_tree', lambda x: True) |
| 924 | self.assertNotEqual(git_cl.main(['diff']), 0) |
| 925 | |
tandrii@chromium.org | e0a1058 | 2016-04-01 19:20:31 +0000 | [diff] [blame^] | 926 | def _patch_common(self): |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 927 | self.mock(git_cl._RietveldChangelistImpl, 'GetMostRecentPatchset', |
| 928 | lambda x: '60001') |
| 929 | self.mock(git_cl._RietveldChangelistImpl, 'GetPatchSetDiff', |
| 930 | lambda *args: None) |
| 931 | self.mock(git_cl.Changelist, 'GetDescription', |
| 932 | lambda *args: 'Description') |
tandrii@chromium.org | e0a1058 | 2016-04-01 19:20:31 +0000 | [diff] [blame^] | 933 | self.mock(git_cl.Changelist, 'SetIssue', lambda *args: None) |
| 934 | self.mock(git_cl.Changelist, 'SetPatchset', lambda *args: None) |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 935 | self.mock(git_cl, 'IsGitVersionAtLeast', lambda *args: True) |
| 936 | |
| 937 | self.calls = [ |
| 938 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
tandrii@chromium.org | e0a1058 | 2016-04-01 19:20:31 +0000 | [diff] [blame^] | 939 | ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 940 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 941 | ((['sed', '-e', 's|^--- a/|--- |; s|^+++ b/|+++ |'],), ''), |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 942 | ] |
| 943 | |
| 944 | def test_patch_successful(self): |
| 945 | self._patch_common() |
| 946 | self.calls += [ |
| 947 | ((['git', 'apply', '--index', '-p0', '--3way'],), ''), |
| 948 | ((['git', 'commit', '-m', |
wychen@chromium.org | 5b3bebb | 2015-05-28 21:41:43 +0000 | [diff] [blame] | 949 | 'Description\n\n' + |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 950 | 'patch from issue 123456 at patchset 60001 ' + |
| 951 | '(http://crrev.com/123456#ps60001)'],), ''), |
tandrii@chromium.org | e0a1058 | 2016-04-01 19:20:31 +0000 | [diff] [blame^] | 952 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
tandrii@chromium.org | aa5ced1 | 2016-03-29 09:41:14 +0000 | [diff] [blame] | 953 | ((['git', 'config', 'branch.master.rietveldserver'],), ''), |
wychen@chromium.org | a872e75 | 2015-04-28 23:42:18 +0000 | [diff] [blame] | 954 | ] |
| 955 | self.assertEqual(git_cl.main(['patch', '123456']), 0) |
| 956 | |
| 957 | def test_patch_conflict(self): |
| 958 | self._patch_common() |
| 959 | self.calls += [ |
| 960 | ((['git', 'apply', '--index', '-p0', '--3way'],), '', |
| 961 | subprocess2.CalledProcessError(1, '', '', '', '')), |
| 962 | ] |
| 963 | self.assertNotEqual(git_cl.main(['patch', '123456']), 0) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 964 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 965 | if __name__ == '__main__': |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 966 | git_cl.logging.basicConfig( |
| 967 | level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 968 | unittest.main() |