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 |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 20 | import subprocess2 |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 21 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 22 | class PresubmitMock(object): |
| 23 | def __init__(self, *args, **kwargs): |
| 24 | self.reviewers = [] |
| 25 | @staticmethod |
| 26 | def should_continue(): |
| 27 | return True |
| 28 | |
| 29 | |
| 30 | class RietveldMock(object): |
| 31 | def __init__(self, *args, **kwargs): |
| 32 | pass |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 33 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 34 | @staticmethod |
| 35 | def get_description(issue): |
| 36 | return 'Issue: %d' % issue |
| 37 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 38 | @staticmethod |
| 39 | def get_issue_properties(_issue, _messages): |
| 40 | return { |
| 41 | 'reviewers': ['joe@chromium.org', 'john@chromium.org'], |
| 42 | 'messages': [ |
| 43 | { |
| 44 | 'approval': True, |
| 45 | 'sender': 'john@chromium.org', |
| 46 | }, |
| 47 | ], |
| 48 | } |
| 49 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 50 | |
| 51 | class WatchlistsMock(object): |
| 52 | def __init__(self, _): |
| 53 | pass |
| 54 | @staticmethod |
| 55 | def GetWatchersForPaths(_): |
| 56 | return ['joe@example.com'] |
| 57 | |
| 58 | |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 59 | class CodereviewSettingsFileMock(object): |
| 60 | def __init__(self): |
| 61 | pass |
| 62 | # pylint: disable=R0201 |
| 63 | def read(self): |
| 64 | return ("CODE_REVIEW_SERVER: gerrit.chromium.org\n" + |
| 65 | "GERRIT_HOST: gerrit.chromium.org\n" + |
| 66 | "GERRIT_PORT: 29418\n") |
| 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) |
sbc@chromium.org | 71437c0 | 2015-04-09 19:29:40 +0000 | [diff] [blame] | 85 | self.mock(git_common, 'is_dirty_git_tree', lambda x: False) |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 86 | self.mock(git_common, 'get_or_create_merge_base', |
| 87 | lambda *a: ( |
| 88 | self._mocked_call(['get_or_create_merge_base']+list(a)))) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 89 | self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '') |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 90 | self.mock(git_cl, 'ask_for_data', self._mocked_call) |
| 91 | self.mock(git_cl.breakpad, 'post', self._mocked_call) |
| 92 | self.mock(git_cl.breakpad, 'SendStack', 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): |
| 103 | if not self.has_failed(): |
| 104 | self.assertEquals([], self.calls) |
| 105 | super(TestGitCl, self).tearDown() |
| 106 | |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 107 | def _mocked_call(self, *args, **_kwargs): |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 108 | self.assertTrue( |
| 109 | self.calls, |
| 110 | '@%d Expected: <Missing> Actual: %r' % (self._calls_done, args)) |
| 111 | expected_args, result = self.calls.pop(0) |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 112 | # Also logs otherwise it could get caught in a try/finally and be hard to |
| 113 | # diagnose. |
| 114 | if expected_args != args: |
| 115 | msg = '@%d Expected: %r Actual: %r' % ( |
| 116 | self._calls_done, expected_args, args) |
| 117 | git_cl.logging.error(msg) |
| 118 | self.fail(msg) |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 119 | self._calls_done += 1 |
| 120 | return result |
| 121 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 122 | @classmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 123 | def _upload_calls(cls, similarity, find_copies, private): |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 124 | return (cls._git_base_calls(similarity, find_copies) + |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 125 | cls._git_upload_calls(private)) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 126 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 127 | @classmethod |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 128 | def _upload_no_rev_calls(cls, similarity, find_copies): |
| 129 | return (cls._git_base_calls(similarity, find_copies) + |
| 130 | cls._git_upload_no_rev_calls()) |
| 131 | |
| 132 | @classmethod |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 133 | def _git_base_calls(cls, similarity, find_copies): |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 134 | if similarity is None: |
| 135 | similarity = '50' |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 136 | similarity_call = ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 137 | 'branch.master.git-cl-similarity'],), '') |
| 138 | else: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 139 | similarity_call = ((['git', 'config', '--int', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 140 | 'branch.master.git-cl-similarity', similarity],), '') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 141 | |
| 142 | if find_copies is None: |
| 143 | find_copies = True |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 144 | find_copies_call = ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 145 | 'branch.master.git-find-copies'],), '') |
| 146 | else: |
| 147 | val = str(int(find_copies)) |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 148 | find_copies_call = ((['git', 'config', '--int', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 149 | 'branch.master.git-find-copies', val],), '') |
| 150 | |
| 151 | if find_copies: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 152 | stat_call = ((['git', 'diff', '--no-ext-diff', '--stat', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 153 | '--find-copies-harder', '-l100000', '-C'+similarity, |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 154 | 'fake_ancestor_sha', 'HEAD'],), '+dat') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 155 | else: |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 156 | stat_call = ((['git', 'diff', '--no-ext-diff', '--stat', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 157 | '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 158 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 159 | return [ |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 160 | ((['git', 'config', 'rietveld.autoupdate'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 161 | ((['git', 'config', 'rietveld.server'],), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 162 | 'codereview.example.com'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 163 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 164 | similarity_call, |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 165 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 166 | find_copies_call, |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 167 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 168 | ((['git', 'config', 'branch.master.merge'],), 'master'), |
| 169 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 170 | ((['get_or_create_merge_base', 'master', 'master'],), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 171 | 'fake_ancestor_sha'), |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 172 | ((['git', 'config', 'gerrit.host'],), ''), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 173 | ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 174 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 175 | ((['git', 'rev-parse', 'HEAD'],), '12345'), |
| 176 | ((['git', 'diff', '--name-status', '--no-renames', '-r', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 177 | 'fake_ancestor_sha...', '.'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 178 | 'M\t.gitignore\n'), |
akuegel@chromium.org | 5df79ca | 2015-04-13 13:59:24 +0000 | [diff] [blame^] | 179 | ((['git', 'config', 'branch.master.rietveldissue'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 180 | ((['git', 'config', 'branch.master.rietveldpatchset'],), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 181 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 182 | ((['git', 'log', '--pretty=format:%s%n%n%b', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 183 | 'fake_ancestor_sha...'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 184 | 'foo'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 185 | ((['git', 'config', 'user.email'],), 'me@example.com'), |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 186 | stat_call, |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 187 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 188 | 'fake_ancestor_sha..HEAD'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 189 | 'desc\n'), |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 190 | ((['git', 'config', 'rietveld.bug-prefix'],), ''), |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 191 | ] |
| 192 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 193 | @classmethod |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 194 | def _git_upload_no_rev_calls(cls): |
| 195 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 196 | ((['git', 'config', 'core.editor'],), ''), |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 197 | ] |
| 198 | |
| 199 | @classmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 200 | def _git_upload_calls(cls, private): |
| 201 | if private: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 202 | cc_call = [] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 203 | private_call = [] |
| 204 | else: |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 205 | cc_call = [((['git', 'config', 'rietveld.cc'],), '')] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 206 | private_call = [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 207 | ((['git', 'config', 'rietveld.private'],), '')] |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 208 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 209 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 210 | ((['git', 'config', 'core.editor'],), ''), |
tyoshino@chromium.org | 99918ab | 2013-09-30 06:17:28 +0000 | [diff] [blame] | 211 | ] + cc_call + private_call + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 212 | ((['git', 'config', 'branch.master.base-url'],), ''), |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 213 | ((['git', 'config', 'rietveld.pending-ref-prefix'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 214 | ((['git', |
bratell@opera.com | 05fb911 | 2014-07-07 09:30:23 +0000 | [diff] [blame] | 215 | 'config', '--local', '--get-regexp', '^svn-remote\\.'],), |
| 216 | (('', None), 0)), |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 217 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 218 | ((['git', 'svn', 'info'],), ''), |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 219 | ((['git', 'config', 'rietveld.project'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 220 | ((['git', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 221 | 'config', 'branch.master.rietveldissue', '1'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 222 | ((['git', 'config', 'branch.master.rietveldserver', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 223 | 'https://codereview.example.com'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 224 | ((['git', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 225 | 'config', 'branch.master.rietveldpatchset', '2'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 226 | ((['git', 'rev-parse', 'HEAD'],), 'hash'), |
| 227 | ((['git', 'symbolic-ref', 'HEAD'],), 'hash'), |
| 228 | ((['git', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 229 | 'config', 'branch.hash.last-upload-hash', 'hash'],), ''), |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 230 | ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''), |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 231 | ] |
| 232 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 233 | @staticmethod |
| 234 | def _git_sanity_checks(diff_base, working_branch): |
| 235 | fake_ancestor = 'fake_ancestor' |
| 236 | fake_cl = 'fake_cl_for_patch' |
| 237 | return [ |
| 238 | # Calls to verify branch point is ancestor |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 239 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 240 | 'rev-parse', '--verify', diff_base],), fake_ancestor), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 241 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 242 | 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 243 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 244 | 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 245 | # Mock a config miss (error code 1) |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 246 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 247 | 'config', 'gitcl.remotebranch'],), (('', None), 1)), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 248 | # Call to GetRemoteBranch() |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 249 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 250 | 'config', 'branch.%s.merge' % working_branch],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 251 | 'refs/heads/master'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 252 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 253 | 'config', 'branch.%s.remote' % working_branch],), 'origin'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 254 | ((['git', 'rev-list', '^' + fake_ancestor, |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 255 | 'refs/remotes/origin/master'],), ''), |
| 256 | ] |
| 257 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 258 | @classmethod |
| 259 | def _dcommit_calls_1(cls): |
| 260 | return [ |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 261 | ((['git', 'config', 'rietveld.autoupdate'],), |
| 262 | ''), |
| 263 | ((['git', 'config', 'rietveld.pending-ref-prefix'],), |
| 264 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 265 | ((['git', |
bratell@opera.com | 05fb911 | 2014-07-07 09:30:23 +0000 | [diff] [blame] | 266 | 'config', '--local', '--get-regexp', '^svn-remote\\.'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 267 | ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n' |
| 268 | 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'), |
| 269 | None), |
| 270 | 0)), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 271 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 272 | 'config', 'rietveld.server'],), 'codereview.example.com'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 273 | ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| 274 | ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 275 | 'branch.working.git-cl-similarity'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 276 | ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| 277 | ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 278 | 'branch.working.git-find-copies'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 279 | ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| 280 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 281 | 'config', 'branch.working.merge'],), 'refs/heads/master'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 282 | ((['git', 'config', 'branch.working.remote'],), 'origin'), |
iannucci@chromium.org | 5724c96 | 2014-04-11 09:32:56 +0000 | [diff] [blame] | 283 | ((['git', 'config', 'branch.working.merge'],), |
| 284 | 'refs/heads/master'), |
| 285 | ((['git', 'config', 'branch.working.remote'],), 'origin'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 286 | ((['git', 'rev-list', '--merges', |
szager@chromium.org | e84b754 | 2012-06-15 21:26:58 +0000 | [diff] [blame] | 287 | '--grep=^SVN changes up to revision [0-9]*$', |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 288 | 'refs/remotes/origin/master^!'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 289 | ((['git', 'rev-list', '^refs/heads/working', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 290 | 'refs/remotes/origin/master'],), |
| 291 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 292 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 293 | 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 294 | '3fc18b62c4966193eb435baabe2d18a3810ec82e'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 295 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 296 | 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 297 | 'refs/remotes/origin/master'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 298 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 299 | 'merge-base', 'refs/remotes/origin/master', 'HEAD'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 300 | 'fake_ancestor_sha'), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 301 | ] |
| 302 | |
| 303 | @classmethod |
| 304 | def _dcommit_calls_normal(cls): |
| 305 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 306 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 307 | ((['git', 'rev-parse', 'HEAD'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 308 | '00ff397798ea57439712ed7e04ab96e13969ef40'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 309 | ((['git', |
mcgrathr@chromium.org | 9249f64 | 2013-06-03 21:36:18 +0000 | [diff] [blame] | 310 | 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 311 | '.'],), |
| 312 | 'M\tPRESUBMIT.py'), |
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 | 'config', 'branch.working.rietveldissue'],), '12345'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 315 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 316 | 'config', 'branch.working.rietveldpatchset'],), '31137'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 317 | ((['git', 'config', 'branch.working.rietveldserver'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 318 | 'codereview.example.com'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 319 | ((['git', 'config', 'user.email'],), 'author@example.com'), |
| 320 | ((['git', 'config', 'rietveld.tree-status-url'],), ''), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 321 | ] |
| 322 | |
| 323 | @classmethod |
| 324 | def _dcommit_calls_bypassed(cls): |
| 325 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 326 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 327 | 'config', 'branch.working.rietveldissue'],), '12345'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 328 | ((['git', 'config', 'branch.working.rietveldserver'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 329 | 'codereview.example.com'), |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 330 | ((['git', 'config', 'rietveld.tree-status-url'],), ''), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 331 | (('GitClHooksBypassedCommit', |
| 332 | 'Issue https://codereview.example.com/12345 bypassed hook when ' |
jochen@chromium.org | 3ec0d54 | 2014-01-14 20:00:03 +0000 | [diff] [blame] | 333 | 'committing (tree status was "unset")'), None), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 334 | ] |
| 335 | |
| 336 | @classmethod |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 337 | def _dcommit_calls_3(cls): |
| 338 | return [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 339 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 340 | 'diff', '--no-ext-diff', '--stat', '--find-copies-harder', |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 341 | '-l100000', '-C50', 'fake_ancestor_sha', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 342 | 'refs/heads/working'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 343 | (' PRESUBMIT.py | 2 +-\n' |
| 344 | ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 345 | ((['git', 'show-ref', '--quiet', '--verify', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 346 | 'refs/heads/git-cl-commit'],), |
| 347 | (('', None), 0)), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 348 | ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
| 349 | ((['git', 'show-ref', '--quiet', '--verify', |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 350 | 'refs/heads/git-cl-cherry-pick'],), ''), |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 351 | ((['git', 'rev-parse', '--show-cdup'],), '\n'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 352 | ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''), |
| 353 | ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''), |
| 354 | ((['git', 'commit', '-m', |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 355 | 'Issue: 12345\n\nR=john@chromium.org\n\n' |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 356 | 'Review URL: https://codereview.example.com/12345'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 357 | ''), |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 358 | ((['git', 'config', 'rietveld.force-https-commit-url'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 359 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 360 | 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],), |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 361 | (('', None), 0)), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 362 | ((['git', 'checkout', '-q', 'working'],), ''), |
| 363 | ((['git', 'branch', '-D', 'git-cl-commit'],), ''), |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 364 | ] |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 365 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 366 | @staticmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 367 | def _cmd_line(description, args, similarity, find_copies, private): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 368 | """Returns the upload command line passed to upload.RealMain().""" |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 369 | return [ |
| 370 | 'upload', '--assume_yes', '--server', |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 371 | 'https://codereview.example.com', |
maruel@chromium.org | 71e12a9 | 2012-02-14 02:34:15 +0000 | [diff] [blame] | 372 | '--message', description |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 373 | ] + args + [ |
| 374 | '--cc', 'joe@example.com', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 375 | ] + (['--private'] if private else []) + [ |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 376 | '--git_similarity', similarity or '50' |
| 377 | ] + (['--git_no_find_copies'] if find_copies == False else []) + [ |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 378 | 'fake_ancestor_sha', 'HEAD' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 379 | ] |
| 380 | |
| 381 | def _run_reviewer_test( |
| 382 | self, |
| 383 | upload_args, |
| 384 | expected_description, |
| 385 | returned_description, |
| 386 | final_description, |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 387 | reviewers, |
| 388 | private=False): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 389 | """Generic reviewer test framework.""" |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 390 | try: |
| 391 | similarity = upload_args[upload_args.index('--similarity')+1] |
| 392 | except ValueError: |
| 393 | similarity = None |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 394 | |
| 395 | if '--find-copies' in upload_args: |
| 396 | find_copies = True |
| 397 | elif '--no-find-copies' in upload_args: |
| 398 | find_copies = False |
| 399 | else: |
| 400 | find_copies = None |
| 401 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 402 | private = '--private' in upload_args |
| 403 | |
| 404 | self.calls = self._upload_calls(similarity, find_copies, private) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 405 | |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 406 | def RunEditor(desc, _, **kwargs): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 407 | self.assertEquals( |
| 408 | '# Enter a description of the change.\n' |
janx@chromium.org | 104b2db | 2013-04-18 12:58:40 +0000 | [diff] [blame] | 409 | '# This will be displayed on the codereview site.\n' |
alancutter@chromium.org | 63a4d7f | 2013-05-31 02:22:45 +0000 | [diff] [blame] | 410 | '# 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] | 411 | '#--------------------This line is 72 characters long' |
| 412 | '--------------------\n' + |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 413 | expected_description, |
| 414 | desc) |
| 415 | return returned_description |
| 416 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 417 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 418 | def check_upload(args): |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 419 | cmd_line = self._cmd_line(final_description, reviewers, similarity, |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 420 | find_copies, private) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 421 | self.assertEquals(cmd_line, args) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 422 | return 1, 2 |
| 423 | self.mock(git_cl.upload, 'RealMain', check_upload) |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 424 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 425 | git_cl.main(['upload'] + upload_args) |
| 426 | |
| 427 | def test_no_reviewer(self): |
| 428 | self._run_reviewer_test( |
| 429 | [], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 430 | 'desc\n\nBUG=', |
| 431 | '# Blah blah comment.\ndesc\n\nBUG=', |
| 432 | 'desc\n\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 433 | []) |
| 434 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 435 | def test_keep_similarity(self): |
| 436 | self._run_reviewer_test( |
| 437 | ['--similarity', '70'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 438 | 'desc\n\nBUG=', |
| 439 | '# Blah blah comment.\ndesc\n\nBUG=', |
| 440 | 'desc\n\nBUG=', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 441 | []) |
| 442 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 443 | def test_keep_find_copies(self): |
| 444 | self._run_reviewer_test( |
| 445 | ['--no-find-copies'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 446 | 'desc\n\nBUG=', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 447 | '# Blah blah comment.\ndesc\n\nBUG=\n', |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 448 | 'desc\n\nBUG=', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 449 | []) |
| 450 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 451 | def test_private(self): |
| 452 | self._run_reviewer_test( |
| 453 | ['--private'], |
| 454 | 'desc\n\nBUG=', |
| 455 | '# Blah blah comment.\ndesc\n\nBUG=\n', |
| 456 | 'desc\n\nBUG=', |
| 457 | []) |
| 458 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 459 | def test_reviewers_cmd_line(self): |
| 460 | # Reviewer is passed as-is |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 461 | description = 'desc\n\nR=foo@example.com\nBUG=' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 462 | self._run_reviewer_test( |
| 463 | ['-r' 'foo@example.com'], |
| 464 | description, |
| 465 | '\n%s\n' % description, |
| 466 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 467 | ['--reviewers=foo@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 468 | |
| 469 | def test_reviewer_tbr_overriden(self): |
| 470 | # Reviewer is overriden with TBR |
| 471 | # Also verifies the regexp work without a trailing LF |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 472 | description = 'Foo Bar\n\nTBR=reviewer@example.com' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 473 | self._run_reviewer_test( |
| 474 | ['-r' 'foo@example.com'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 475 | 'desc\n\nR=foo@example.com\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 476 | description.strip('\n'), |
| 477 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 478 | ['--reviewers=reviewer@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 479 | |
| 480 | def test_reviewer_multiple(self): |
| 481 | # Handles multiple R= or TBR= lines. |
| 482 | description = ( |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 483 | 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com') |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 484 | self._run_reviewer_test( |
| 485 | [], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 486 | 'desc\n\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 487 | description, |
| 488 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 489 | ['--reviewers=another@example.com,reviewer@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 490 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 491 | def test_reviewer_send_mail(self): |
| 492 | # --send-mail can be used without -r if R= is used |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 493 | description = 'Foo Bar\nR=reviewer@example.com' |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 494 | self._run_reviewer_test( |
| 495 | ['--send-mail'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 496 | 'desc\n\nBUG=', |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 497 | description.strip('\n'), |
| 498 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 499 | ['--reviewers=reviewer@example.com', '--send_mail']) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 500 | |
| 501 | def test_reviewer_send_mail_no_rev(self): |
| 502 | # Fails without a reviewer. |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 503 | stdout = StringIO.StringIO() |
| 504 | stderr = StringIO.StringIO() |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 505 | try: |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 506 | self.calls = self._upload_no_rev_calls(None, None) |
| 507 | def RunEditor(desc, _, **kwargs): |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 508 | return desc |
| 509 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 510 | self.mock(sys, 'stdout', stdout) |
| 511 | self.mock(sys, 'stderr', stderr) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 512 | git_cl.main(['upload', '--send-mail']) |
| 513 | self.fail() |
| 514 | except SystemExit: |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 515 | self.assertEqual( |
| 516 | 'Using 50% similarity for rename/copy detection. Override with ' |
| 517 | '--similarity.\n', |
| 518 | stdout.getvalue()) |
| 519 | self.assertEqual( |
| 520 | 'Must specify reviewers to send email.\n', stderr.getvalue()) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 521 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 522 | def test_dcommit(self): |
| 523 | self.calls = ( |
| 524 | self._dcommit_calls_1() + |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 525 | self._git_sanity_checks('fake_ancestor_sha', 'working') + |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 526 | self._dcommit_calls_normal() + |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 527 | self._dcommit_calls_3()) |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 528 | git_cl.main(['dcommit']) |
| 529 | |
| 530 | def test_dcommit_bypass_hooks(self): |
| 531 | self.calls = ( |
| 532 | self._dcommit_calls_1() + |
| 533 | self._dcommit_calls_bypassed() + |
thestig@chromium.org | 7a54e81 | 2014-02-11 19:57:22 +0000 | [diff] [blame] | 534 | self._dcommit_calls_3()) |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 535 | git_cl.main(['dcommit', '--bypass-hooks']) |
| 536 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 537 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 538 | @classmethod |
| 539 | def _gerrit_base_calls(cls): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 540 | return [ |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 541 | ((['git', 'config', 'rietveld.autoupdate'],), |
| 542 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 543 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 544 | 'config', 'rietveld.server'],), 'codereview.example.com'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 545 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 546 | ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 547 | 'branch.master.git-cl-similarity'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 548 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 549 | ((['git', 'config', '--int', '--get', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 550 | 'branch.master.git-find-copies'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 551 | ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| 552 | ((['git', 'config', 'branch.master.merge'],), 'master'), |
| 553 | ((['git', 'config', 'branch.master.remote'],), 'origin'), |
iannucci@chromium.org | 9e84927 | 2014-04-04 00:31:55 +0000 | [diff] [blame] | 554 | ((['get_or_create_merge_base', 'master', 'master'],), |
| 555 | 'fake_ancestor_sha'), |
vadimsh@chromium.org | eed4df3 | 2015-04-10 21:30:20 +0000 | [diff] [blame] | 556 | ((['git', 'config', 'gerrit.host'],), 'gerrit.example.com'), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 557 | ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 558 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
| 559 | ((['git', 'rev-parse', 'HEAD'],), '12345'), |
| 560 | ((['git', |
mcgrathr@chromium.org | 9249f64 | 2013-06-03 21:36:18 +0000 | [diff] [blame] | 561 | 'diff', '--name-status', '--no-renames', '-r', |
| 562 | 'fake_ancestor_sha...', '.'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 563 | 'M\t.gitignore\n'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 564 | ((['git', 'config', 'branch.master.rietveldissue'],), ''), |
| 565 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 566 | 'config', 'branch.master.rietveldpatchset'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 567 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 568 | 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 569 | 'foo'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 570 | ((['git', 'config', 'user.email'],), 'me@example.com'), |
| 571 | ((['git', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 572 | 'diff', '--no-ext-diff', '--stat', '--find-copies-harder', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 573 | '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 574 | '+dat'), |
| 575 | ] |
| 576 | |
| 577 | @staticmethod |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 578 | def _gerrit_upload_calls(description, reviewers, squash): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 579 | calls = [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 580 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 581 | 'fake_ancestor_sha..HEAD'],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 582 | description) |
| 583 | ] |
| 584 | if git_cl.CHANGE_ID not in description: |
| 585 | calls += [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 586 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 587 | 'fake_ancestor_sha..HEAD'],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 588 | description), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 589 | ((['git', 'commit', '--amend', '-m', description],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 590 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 591 | ((['git', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 592 | 'fake_ancestor_sha..HEAD'],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 593 | description) |
| 594 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 595 | if squash: |
| 596 | ref_to_push = 'abcdef0123456789' |
| 597 | calls += [ |
| 598 | ((['git', 'show', '--format=%s\n\n%b', '-s', |
| 599 | 'refs/heads/git_cl_uploads/master'],), |
| 600 | (description, 0)), |
| 601 | ((['git', 'config', 'branch.master.merge'],), |
| 602 | 'refs/heads/master'), |
| 603 | ((['git', 'config', 'branch.master.remote'],), |
| 604 | 'origin'), |
| 605 | ((['get_or_create_merge_base', 'master', 'master'],), |
| 606 | 'origin/master'), |
| 607 | ((['git', 'rev-parse', 'HEAD:'],), |
| 608 | '0123456789abcdef'), |
| 609 | ((['git', 'commit-tree', '0123456789abcdef', '-p', |
| 610 | 'origin/master', '-m', 'd'],), |
| 611 | ref_to_push), |
| 612 | ] |
| 613 | else: |
| 614 | ref_to_push = 'HEAD' |
| 615 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 616 | calls += [ |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 617 | ((['git', 'rev-list', 'origin/master..' + ref_to_push],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 618 | ((['git', 'config', 'rietveld.cc'],), '') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 619 | ] |
ukai@chromium.org | 19bbfa2 | 2012-02-03 16:18:11 +0000 | [diff] [blame] | 620 | receive_pack = '--receive-pack=git receive-pack ' |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 621 | receive_pack += '--cc=joe@example.com' # from watch list |
| 622 | if reviewers: |
| 623 | receive_pack += ' ' |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 624 | receive_pack += ' '.join( |
| 625 | '--reviewer=' + email for email in sorted(reviewers)) |
ukai@chromium.org | 19bbfa2 | 2012-02-03 16:18:11 +0000 | [diff] [blame] | 626 | receive_pack += '' |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 627 | calls += [ |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 628 | ((['git', |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 629 | 'push', receive_pack, 'origin', ref_to_push + ':refs/for/master'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 630 | '') |
| 631 | ] |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 632 | if squash: |
| 633 | calls += [ |
| 634 | ((['git', 'rev-parse', 'HEAD'],), 'abcdef0123456789'), |
| 635 | ((['git', 'update-ref', '-m', 'Uploaded abcdef0123456789', |
| 636 | 'refs/heads/git_cl_uploads/master', 'abcdef0123456789'],), |
| 637 | '') |
| 638 | ] |
| 639 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 640 | return calls |
| 641 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 642 | def _run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 643 | self, |
| 644 | upload_args, |
| 645 | description, |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 646 | reviewers, |
| 647 | squash=False): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 648 | """Generic gerrit upload test framework.""" |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 649 | self.calls = self._gerrit_base_calls() |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 650 | self.calls += self._gerrit_upload_calls(description, reviewers, squash) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 651 | git_cl.main(['upload'] + upload_args) |
| 652 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 653 | def test_gerrit_upload_without_change_id(self): |
| 654 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 655 | [], |
jamesr@chromium.org | 35d1a84 | 2012-07-27 00:20:43 +0000 | [diff] [blame] | 656 | 'desc\n\nBUG=\n', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 657 | []) |
| 658 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 659 | def test_gerrit_no_reviewer(self): |
| 660 | self._run_gerrit_upload_test( |
| 661 | [], |
| 662 | 'desc\n\nBUG=\nChange-Id:123456789\n', |
| 663 | []) |
| 664 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 665 | def test_gerrit_reviewers_cmd_line(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 666 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 667 | ['-r', 'foo@example.com'], |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 668 | 'desc\n\nBUG=\nChange-Id:123456789', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 669 | ['foo@example.com']) |
| 670 | |
| 671 | def test_gerrit_reviewer_multiple(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 672 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 673 | [], |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 674 | 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n' |
| 675 | 'Change-Id:123456789\n', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 676 | ['reviewer@example.com', 'another@example.com']) |
| 677 | |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 678 | def test_gerrit_upload_squash(self): |
| 679 | self._run_gerrit_upload_test( |
| 680 | ['--squash'], |
| 681 | 'desc\n\nBUG=\nChange-Id:123456789\n', |
| 682 | [], |
| 683 | squash=True) |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 684 | |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 685 | def test_config_gerrit_download_hook(self): |
| 686 | self.mock(git_cl, 'FindCodereviewSettingsFile', CodereviewSettingsFileMock) |
| 687 | def ParseCodereviewSettingsContent(content): |
| 688 | keyvals = {} |
| 689 | keyvals['CODE_REVIEW_SERVER'] = 'gerrit.chromium.org' |
| 690 | keyvals['GERRIT_HOST'] = 'gerrit.chromium.org' |
| 691 | keyvals['GERRIT_PORT'] = '29418' |
| 692 | return keyvals |
| 693 | self.mock(git_cl.gclient_utils, 'ParseCodereviewSettingsContent', |
| 694 | ParseCodereviewSettingsContent) |
| 695 | self.mock(git_cl.os, 'access', self._mocked_call) |
| 696 | self.mock(git_cl.os, 'chmod', self._mocked_call) |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 697 | src_dir = os.path.join(os.path.sep, 'usr', 'local', 'src') |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 698 | def AbsPath(path): |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 699 | if not path.startswith(os.path.sep): |
| 700 | return os.path.join(src_dir, path) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 701 | return path |
| 702 | self.mock(git_cl.os.path, 'abspath', AbsPath) |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 703 | commit_msg_path = os.path.join(src_dir, '.git', 'hooks', 'commit-msg') |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 704 | def Exists(path): |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 705 | if path == commit_msg_path: |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 706 | return False |
| 707 | # others paths, such as /usr/share/locale/.... |
| 708 | return True |
| 709 | self.mock(git_cl.os.path, 'exists', Exists) |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 710 | self.mock(git_cl, 'urlretrieve', self._mocked_call) |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 711 | self.mock(git_cl, 'hasSheBang', self._mocked_call) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 712 | self.calls = [ |
pgervais@chromium.org | 87884cc | 2014-01-03 22:23:41 +0000 | [diff] [blame] | 713 | ((['git', 'config', 'rietveld.autoupdate'],), |
| 714 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 715 | ((['git', 'config', 'rietveld.server', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 716 | 'gerrit.chromium.org'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 717 | ((['git', 'config', '--unset-all', 'rietveld.cc'],), ''), |
| 718 | ((['git', 'config', '--unset-all', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 719 | 'rietveld.private'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 720 | ((['git', 'config', '--unset-all', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 721 | 'rietveld.tree-status-url'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 722 | ((['git', 'config', '--unset-all', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 723 | 'rietveld.viewvc-url'],), ''), |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 724 | ((['git', 'config', '--unset-all', |
| 725 | 'rietveld.bug-prefix'],), ''), |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 726 | ((['git', 'config', '--unset-all', |
| 727 | 'rietveld.cpplint-regex'],), ''), |
| 728 | ((['git', 'config', '--unset-all', |
kjellander@chromium.org | 6abc652 | 2014-12-02 07:34:49 +0000 | [diff] [blame] | 729 | 'rietveld.force-https-commit-url'],), ''), |
| 730 | ((['git', 'config', '--unset-all', |
thestig@chromium.org | 44202a2 | 2014-03-11 19:22:18 +0000 | [diff] [blame] | 731 | 'rietveld.cpplint-ignore-regex'],), ''), |
sheyang@chromium.org | 152cf83 | 2014-06-11 21:37:49 +0000 | [diff] [blame] | 732 | ((['git', 'config', '--unset-all', |
| 733 | 'rietveld.project'],), ''), |
vadimsh@chromium.org | 566a02a | 2014-08-22 01:34:13 +0000 | [diff] [blame] | 734 | ((['git', 'config', '--unset-all', |
| 735 | 'rietveld.pending-ref-prefix'],), ''), |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 736 | ((['git', 'config', '--unset-all', |
| 737 | 'rietveld.run-post-upload-hook'],), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 738 | ((['git', 'config', 'gerrit.host', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 739 | 'gerrit.chromium.org'],), ''), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 740 | # DownloadHooks(False) |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 741 | ((['git', 'config', 'gerrit.host'],), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 742 | 'gerrit.chromium.org'), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 743 | ((['git', 'rev-parse', '--show-cdup'],), ''), |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 744 | ((commit_msg_path, os.X_OK,), False), |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 745 | (('https://gerrit-review.googlesource.com/tools/hooks/commit-msg', |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 746 | commit_msg_path,), ''), |
ukai@chromium.org | 712d610 | 2013-11-27 00:52:58 +0000 | [diff] [blame] | 747 | ((commit_msg_path,), True), |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 748 | ((commit_msg_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR,), ''), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 749 | # GetCodereviewSettingsInteractively |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 750 | ((['git', 'config', 'rietveld.server'],), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 751 | 'gerrit.chromium.org'), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 752 | (('Rietveld server (host[:port]) [https://gerrit.chromium.org]:',), |
| 753 | ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 754 | ((['git', 'config', 'rietveld.cc'],), ''), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 755 | (('CC list:',), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 756 | ((['git', 'config', 'rietveld.private'],), ''), |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 757 | (('Private flag (rietveld only):',), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 758 | ((['git', 'config', 'rietveld.tree-status-url'],), ''), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 759 | (('Tree status URL:',), ''), |
bratell@opera.com | 82b91cd | 2013-07-09 06:33:41 +0000 | [diff] [blame] | 760 | ((['git', 'config', 'rietveld.viewvc-url'],), ''), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 761 | (('ViewVC URL:',), ''), |
| 762 | # DownloadHooks(True) |
rmistry@google.com | 9075258 | 2014-01-14 21:04:50 +0000 | [diff] [blame] | 763 | ((['git', 'config', 'rietveld.bug-prefix'],), ''), |
| 764 | (('Bug Prefix:',), ''), |
rmistry@google.com | 5626a92 | 2015-02-26 14:03:30 +0000 | [diff] [blame] | 765 | ((['git', 'config', 'rietveld.run-post-upload-hook'],), ''), |
| 766 | (('Run Post Upload Hook:',), ''), |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 767 | ((commit_msg_path, os.X_OK,), True), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 768 | ] |
| 769 | git_cl.main(['config']) |
| 770 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 771 | def test_update_reviewers(self): |
| 772 | data = [ |
| 773 | ('foo', [], 'foo'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 774 | ('foo\nR=xx', [], 'foo\nR=xx'), |
| 775 | ('foo\nTBR=xx', [], 'foo\nTBR=xx'), |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 776 | ('foo', ['a@c'], 'foo\n\nR=a@c'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 777 | ('foo\nR=xx', ['a@c'], 'foo\n\nR=a@c, xx'), |
| 778 | ('foo\nTBR=xx', ['a@c'], 'foo\n\nR=a@c\nTBR=xx'), |
| 779 | ('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] | 780 | ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'), |
agable@chromium.org | 42c2079 | 2013-09-12 17:34:49 +0000 | [diff] [blame] | 781 | ('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] | 782 | ('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] | 783 | ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='), |
| 784 | ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='), |
| 785 | # Same as the line before, but full of whitespaces. |
| 786 | ( |
| 787 | 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], |
| 788 | 'foo\nBar\n\nR=c@c\n BUG =', |
| 789 | ), |
| 790 | # Whitespaces aren't interpreted as new lines. |
| 791 | ('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] | 792 | ] |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 793 | expected = [i[2] for i in data] |
| 794 | actual = [] |
| 795 | for orig, reviewers, _expected in data: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 796 | obj = git_cl.ChangeDescription(orig) |
| 797 | obj.update_reviewers(reviewers) |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 798 | actual.append(obj.description) |
| 799 | self.assertEqual(expected, actual) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 800 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 801 | def test_get_target_ref(self): |
| 802 | # Check remote or remote branch not present. |
| 803 | self.assertEqual(None, git_cl.GetTargetRef('origin', None, 'master', None)) |
| 804 | self.assertEqual(None, git_cl.GetTargetRef(None, |
| 805 | 'refs/remotes/origin/master', |
| 806 | 'master', None)) |
bauerb@chromium.org | 27386dd | 2015-02-16 10:45:39 +0000 | [diff] [blame] | 807 | |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 808 | # Check default target refs for branches. |
| 809 | self.assertEqual('refs/heads/master', |
| 810 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/master', |
| 811 | None, None)) |
| 812 | self.assertEqual('refs/heads/master', |
| 813 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkgr', |
| 814 | None, None)) |
| 815 | self.assertEqual('refs/heads/master', |
| 816 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/lkcr', |
| 817 | None, None)) |
| 818 | self.assertEqual('refs/branch-heads/123', |
| 819 | git_cl.GetTargetRef('origin', |
| 820 | 'refs/remotes/branch-heads/123', |
| 821 | None, None)) |
| 822 | self.assertEqual('refs/diff/test', |
| 823 | git_cl.GetTargetRef('origin', |
| 824 | 'refs/remotes/origin/refs/diff/test', |
| 825 | None, None)) |
rmistry@google.com | c68112d | 2015-03-03 12:48:06 +0000 | [diff] [blame] | 826 | self.assertEqual('refs/heads/chrome/m42', |
| 827 | git_cl.GetTargetRef('origin', |
| 828 | 'refs/remotes/origin/chrome/m42', |
| 829 | None, None)) |
wittman@chromium.org | 455dc92 | 2015-01-26 20:15:50 +0000 | [diff] [blame] | 830 | |
| 831 | # Check target refs for user-specified target branch. |
| 832 | for branch in ('branch-heads/123', 'remotes/branch-heads/123', |
| 833 | 'refs/remotes/branch-heads/123'): |
| 834 | self.assertEqual('refs/branch-heads/123', |
| 835 | git_cl.GetTargetRef('origin', |
| 836 | 'refs/remotes/origin/master', |
| 837 | branch, None)) |
| 838 | for branch in ('origin/master', 'remotes/origin/master', |
| 839 | 'refs/remotes/origin/master'): |
| 840 | self.assertEqual('refs/heads/master', |
| 841 | git_cl.GetTargetRef('origin', |
| 842 | 'refs/remotes/branch-heads/123', |
| 843 | branch, None)) |
| 844 | for branch in ('master', 'heads/master', 'refs/heads/master'): |
| 845 | self.assertEqual('refs/heads/master', |
| 846 | git_cl.GetTargetRef('origin', |
| 847 | 'refs/remotes/branch-heads/123', |
| 848 | branch, None)) |
| 849 | |
| 850 | # Check target refs for pending prefix. |
| 851 | self.assertEqual('prefix/heads/master', |
| 852 | git_cl.GetTargetRef('origin', 'refs/remotes/origin/master', |
| 853 | None, 'prefix/')) |
| 854 | |
| 855 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 856 | if __name__ == '__main__': |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 857 | git_cl.logging.basicConfig( |
| 858 | 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] | 859 | unittest.main() |