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 |
| 19 | import subprocess2 |
| 20 | |
| 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 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 69 | class TestGitCl(TestCase): |
| 70 | def setUp(self): |
| 71 | super(TestGitCl, self).setUp() |
| 72 | self.calls = [] |
| 73 | self._calls_done = 0 |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 74 | self.mock(subprocess2, 'call', self._mocked_call) |
| 75 | self.mock(subprocess2, 'check_call', self._mocked_call) |
| 76 | self.mock(subprocess2, 'check_output', self._mocked_call) |
| 77 | self.mock(subprocess2, 'communicate', self._mocked_call) |
| 78 | self.mock(subprocess2, 'Popen', self._mocked_call) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 79 | self.mock(git_cl, 'FindCodereviewSettingsFile', lambda: '') |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 80 | self.mock(git_cl, 'ask_for_data', self._mocked_call) |
| 81 | self.mock(git_cl.breakpad, 'post', self._mocked_call) |
| 82 | self.mock(git_cl.breakpad, 'SendStack', self._mocked_call) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 83 | self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 84 | self.mock(git_cl.rietveld, 'Rietveld', RietveldMock) |
maruel@chromium.org | 4bac4b5 | 2012-11-27 20:33:52 +0000 | [diff] [blame] | 85 | self.mock(git_cl.rietveld, 'CachingRietveld', RietveldMock) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 86 | self.mock(git_cl.upload, 'RealMain', self.fail) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 87 | self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock) |
| 88 | # It's important to reset settings to not have inter-tests interference. |
| 89 | git_cl.settings = None |
| 90 | |
| 91 | def tearDown(self): |
| 92 | if not self.has_failed(): |
| 93 | self.assertEquals([], self.calls) |
| 94 | super(TestGitCl, self).tearDown() |
| 95 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 96 | def _mocked_call(self, *args, **kwargs): |
| 97 | self.assertTrue( |
| 98 | self.calls, |
| 99 | '@%d Expected: <Missing> Actual: %r' % (self._calls_done, args)) |
| 100 | expected_args, result = self.calls.pop(0) |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 101 | # Also logs otherwise it could get caught in a try/finally and be hard to |
| 102 | # diagnose. |
| 103 | if expected_args != args: |
| 104 | msg = '@%d Expected: %r Actual: %r' % ( |
| 105 | self._calls_done, expected_args, args) |
| 106 | git_cl.logging.error(msg) |
| 107 | self.fail(msg) |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 108 | self._calls_done += 1 |
| 109 | return result |
| 110 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 111 | @classmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 112 | def _upload_calls(cls, similarity, find_copies, private): |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 113 | return (cls._git_base_calls(similarity, find_copies) + |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 114 | cls._git_upload_calls(private)) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 115 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 116 | @classmethod |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 117 | def _upload_no_rev_calls(cls, similarity, find_copies): |
| 118 | return (cls._git_base_calls(similarity, find_copies) + |
| 119 | cls._git_upload_no_rev_calls()) |
| 120 | |
| 121 | @classmethod |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 122 | def _git_base_calls(cls, similarity, find_copies): |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 123 | if similarity is None: |
| 124 | similarity = '50' |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 125 | similarity_call = ((['git', '--no-pager', 'config', '--int', '--get', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 126 | 'branch.master.git-cl-similarity'],), '') |
| 127 | else: |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 128 | similarity_call = ((['git', '--no-pager', 'config', '--int', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 129 | 'branch.master.git-cl-similarity', similarity],), '') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 130 | |
| 131 | if find_copies is None: |
| 132 | find_copies = True |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 133 | find_copies_call = ((['git', '--no-pager', 'config', '--int', '--get', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 134 | 'branch.master.git-find-copies'],), '') |
| 135 | else: |
| 136 | val = str(int(find_copies)) |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 137 | find_copies_call = ((['git', '--no-pager', 'config', '--int', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 138 | 'branch.master.git-find-copies', val],), '') |
| 139 | |
| 140 | if find_copies: |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 141 | stat_call = ((['git', '--no-pager', 'diff', '--no-ext-diff', '--stat', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 142 | '--find-copies-harder', '-l100000', '-C'+similarity, |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 143 | 'fake_ancestor_sha', 'HEAD'],), '+dat') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 144 | else: |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 145 | stat_call = ((['git', '--no-pager', 'diff', '--no-ext-diff', '--stat', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 146 | '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat') |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 147 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 148 | return [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 149 | ((['git', '--no-pager', 'config', 'rietveld.server'],), |
| 150 | 'codereview.example.com'), |
| 151 | ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'master'), |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 152 | similarity_call, |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 153 | ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'master'), |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 154 | find_copies_call, |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 155 | ((['git', '--no-pager', 'update-index', '--refresh', '-q'],), ''), |
| 156 | ((['git', '--no-pager', 'diff-index', '--name-status', 'HEAD'],), ''), |
| 157 | ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'master'), |
| 158 | ((['git', '--no-pager', 'config', 'branch.master.merge'],), 'master'), |
| 159 | ((['git', '--no-pager', 'config', 'branch.master.remote'],), 'origin'), |
| 160 | ((['git', '--no-pager', 'merge-base', 'master', 'HEAD'],), |
| 161 | 'fake_ancestor_sha'), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 162 | ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 163 | ((['git', '--no-pager', 'rev-parse', '--show-cdup'],), ''), |
| 164 | ((['git', '--no-pager', 'rev-parse', 'HEAD'],), '12345'), |
| 165 | ((['git', '--no-pager', 'diff', '--name-status', '-r', |
| 166 | 'fake_ancestor_sha...', '.'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 167 | 'M\t.gitignore\n'), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 168 | ((['git', '--no-pager', 'config', 'branch.master.rietveldissue'],), ''), |
| 169 | ((['git', '--no-pager', 'config', 'branch.master.rietveldpatchset'],), |
| 170 | ''), |
| 171 | ((['git', '--no-pager', 'log', '--pretty=format:%s%n%n%b', |
| 172 | 'fake_ancestor_sha...'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 173 | 'foo'), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 174 | ((['git', '--no-pager', 'config', 'user.email'],), 'me@example.com'), |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 175 | stat_call, |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 176 | ((['git', '--no-pager', 'config', 'gerrit.host'],), ''), |
| 177 | ((['git', '--no-pager', 'log', '--pretty=format:%s\n\n%b', |
| 178 | 'fake_ancestor_sha..HEAD'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 179 | 'desc\n'), |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 180 | ] |
| 181 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 182 | @classmethod |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 183 | def _git_upload_no_rev_calls(cls): |
| 184 | return [ |
| 185 | ((['git', '--no-pager', 'config', 'core.editor'],), ''), |
| 186 | ] |
| 187 | |
| 188 | @classmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 189 | def _git_upload_calls(cls, private): |
| 190 | if private: |
| 191 | private_call = [] |
| 192 | else: |
| 193 | private_call = [ |
| 194 | ((['git', '--no-pager', 'config', 'rietveld.private'],), '')] |
| 195 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 196 | return [ |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 197 | ((['git', '--no-pager', 'config', 'core.editor'],), ''), |
| 198 | ((['git', '--no-pager', 'config', 'rietveld.cc'],), '') |
| 199 | ] + private_call + [ |
| 200 | ((['git', '--no-pager', 'config', 'branch.master.base-url'],), ''), |
| 201 | ((['git', '--no-pager', |
| 202 | 'config', '--local', '--get-regexp', '^svn-remote\\.'],), |
| 203 | (('', None), 0)), |
| 204 | ((['git', '--no-pager', 'rev-parse', '--show-cdup'],), ''), |
| 205 | ((['git', '--no-pager', 'svn', 'info'],), ''), |
| 206 | ((['git', '--no-pager', |
| 207 | 'config', 'branch.master.rietveldissue', '1'],), ''), |
| 208 | ((['git', '--no-pager', 'config', 'branch.master.rietveldserver', |
| 209 | 'https://codereview.example.com'],), ''), |
| 210 | ((['git', '--no-pager', |
| 211 | 'config', 'branch.master.rietveldpatchset', '2'],), ''), |
| 212 | ((['git', '--no-pager', 'rev-parse', 'HEAD'],), 'hash'), |
| 213 | ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'hash'), |
| 214 | ((['git', '--no-pager', |
| 215 | 'config', 'branch.hash.last-upload-hash', 'hash'],), ''), |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 216 | ] |
| 217 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 218 | @staticmethod |
| 219 | def _git_sanity_checks(diff_base, working_branch): |
| 220 | fake_ancestor = 'fake_ancestor' |
| 221 | fake_cl = 'fake_cl_for_patch' |
| 222 | return [ |
| 223 | # Calls to verify branch point is ancestor |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 224 | ((['git', '--no-pager', |
| 225 | 'rev-parse', '--verify', diff_base],), fake_ancestor), |
| 226 | ((['git', '--no-pager', |
| 227 | 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor), |
| 228 | ((['git', '--no-pager', |
| 229 | 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 230 | # Mock a config miss (error code 1) |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 231 | ((['git', '--no-pager', |
| 232 | 'config', 'gitcl.remotebranch'],), (('', None), 1)), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 233 | # Call to GetRemoteBranch() |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 234 | ((['git', '--no-pager', |
| 235 | 'config', 'branch.%s.merge' % working_branch],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 236 | 'refs/heads/master'), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 237 | ((['git', '--no-pager', |
| 238 | 'config', 'branch.%s.remote' % working_branch],), 'origin'), |
| 239 | ((['git', '--no-pager', 'rev-list', '^' + fake_ancestor, |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 240 | 'refs/remotes/origin/master'],), ''), |
| 241 | ] |
| 242 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 243 | @classmethod |
| 244 | def _dcommit_calls_1(cls): |
| 245 | return [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 246 | ((['git', '--no-pager', |
| 247 | 'config', '--local', '--get-regexp', '^svn-remote\\.'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 248 | ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n' |
| 249 | 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'), |
| 250 | None), |
| 251 | 0)), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 252 | ((['git', '--no-pager', |
| 253 | 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 254 | ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| 255 | ((['git', '--no-pager', 'config', '--int', '--get', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 256 | 'branch.working.git-cl-similarity'],), ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 257 | ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| 258 | ((['git', '--no-pager', 'config', '--int', '--get', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 259 | 'branch.working.git-find-copies'],), ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 260 | ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| 261 | ((['git', '--no-pager', |
| 262 | 'config', 'branch.working.merge'],), 'refs/heads/master'), |
| 263 | ((['git', '--no-pager', 'config', 'branch.working.remote'],), 'origin'), |
| 264 | ((['git', '--no-pager', 'rev-list', '--merges', |
szager@chromium.org | e84b754 | 2012-06-15 21:26:58 +0000 | [diff] [blame] | 265 | '--grep=^SVN changes up to revision [0-9]*$', |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 266 | 'refs/remotes/origin/master^!'],), ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 267 | ((['git', '--no-pager', 'update-index', '--refresh', '-q'],), ''), |
| 268 | ((['git', '--no-pager', 'diff-index', '--name-status', 'HEAD'],), ''), |
| 269 | ((['git', '--no-pager', 'rev-list', '^refs/heads/working', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 270 | 'refs/remotes/origin/master'],), |
| 271 | ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 272 | ((['git', '--no-pager', |
| 273 | 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 274 | '3fc18b62c4966193eb435baabe2d18a3810ec82e'), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 275 | ((['git', '--no-pager', |
| 276 | 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 277 | 'refs/remotes/origin/master'],), ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 278 | ((['git', '--no-pager', |
| 279 | 'merge-base', 'refs/remotes/origin/master', 'HEAD'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 280 | 'fake_ancestor_sha'), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 281 | ] |
| 282 | |
| 283 | @classmethod |
| 284 | def _dcommit_calls_normal(cls): |
| 285 | return [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 286 | ((['git', '--no-pager', 'rev-parse', '--show-cdup'],), ''), |
| 287 | ((['git', '--no-pager', 'rev-parse', 'HEAD'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 288 | '00ff397798ea57439712ed7e04ab96e13969ef40'), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 289 | ((['git', '--no-pager', |
| 290 | 'diff', '--name-status', '-r', 'fake_ancestor_sha...', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 291 | '.'],), |
| 292 | 'M\tPRESUBMIT.py'), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 293 | ((['git', '--no-pager', |
| 294 | 'config', 'branch.working.rietveldissue'],), '12345'), |
| 295 | ((['git', '--no-pager', |
| 296 | 'config', 'branch.working.rietveldpatchset'],), '31137'), |
| 297 | ((['git', '--no-pager', 'config', 'branch.working.rietveldserver'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 298 | 'codereview.example.com'), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 299 | ((['git', '--no-pager', 'config', 'user.email'],), 'author@example.com'), |
| 300 | ((['git', '--no-pager', 'config', 'rietveld.tree-status-url'],), ''), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 301 | ] |
| 302 | |
| 303 | @classmethod |
| 304 | def _dcommit_calls_bypassed(cls): |
| 305 | return [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 306 | ((['git', '--no-pager', |
| 307 | 'config', 'branch.working.rietveldissue'],), '12345'), |
| 308 | ((['git', '--no-pager', 'config', 'branch.working.rietveldserver'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 309 | 'codereview.example.com'), |
| 310 | (('GitClHooksBypassedCommit', |
| 311 | 'Issue https://codereview.example.com/12345 bypassed hook when ' |
| 312 | 'committing'), None), |
| 313 | ] |
| 314 | |
| 315 | @classmethod |
| 316 | def _dcommit_calls_3(cls): |
| 317 | return [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 318 | ((['git', '--no-pager', |
| 319 | 'diff', '--no-ext-diff', '--stat', '--find-copies-harder', |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 320 | '-l100000', '-C50', 'fake_ancestor_sha', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 321 | 'refs/heads/working'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 322 | (' PRESUBMIT.py | 2 +-\n' |
| 323 | ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')), |
| 324 | (('About to commit; enter to confirm.',), None), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 325 | ((['git', '--no-pager', 'show-ref', '--quiet', '--verify', |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 326 | 'refs/heads/git-cl-commit'],), |
| 327 | (('', None), 0)), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 328 | ((['git', '--no-pager', 'branch', '-D', 'git-cl-commit'],), ''), |
| 329 | ((['git', '--no-pager', 'show-ref', '--quiet', '--verify', |
szager@chromium.org | 9bb85e2 | 2012-06-13 20:28:23 +0000 | [diff] [blame] | 330 | 'refs/heads/git-cl-cherry-pick'],), ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 331 | ((['git', '--no-pager', 'rev-parse', '--show-cdup'],), '\n'), |
| 332 | ((['git', '--no-pager', 'checkout', '-q', '-b', 'git-cl-commit'],), ''), |
| 333 | ((['git', '--no-pager', 'reset', '--soft', 'fake_ancestor_sha'],), ''), |
| 334 | ((['git', '--no-pager', 'commit', '-m', |
maruel@chromium.org | e52678e | 2013-04-26 18:34:44 +0000 | [diff] [blame] | 335 | 'Issue: 12345\n\nR=john@chromium.org\n\n' |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 336 | 'Review URL: https://codereview.example.com/12345'],), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 337 | ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 338 | ((['git', '--no-pager', |
| 339 | 'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],), |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 340 | (('', None), 0)), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 341 | ((['git', '--no-pager', 'checkout', '-q', 'working'],), ''), |
| 342 | ((['git', '--no-pager', 'branch', '-D', 'git-cl-commit'],), ''), |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 343 | ] |
| 344 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 345 | @staticmethod |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 346 | def _cmd_line(description, args, similarity, find_copies, private): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 347 | """Returns the upload command line passed to upload.RealMain().""" |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 348 | return [ |
| 349 | 'upload', '--assume_yes', '--server', |
maruel@chromium.org | eb5edbc | 2012-01-16 17:03:28 +0000 | [diff] [blame] | 350 | 'https://codereview.example.com', |
maruel@chromium.org | 71e12a9 | 2012-02-14 02:34:15 +0000 | [diff] [blame] | 351 | '--message', description |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 352 | ] + args + [ |
| 353 | '--cc', 'joe@example.com', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 354 | ] + (['--private'] if private else []) + [ |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 355 | '--git_similarity', similarity or '50' |
| 356 | ] + (['--git_no_find_copies'] if find_copies == False else []) + [ |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 357 | 'fake_ancestor_sha', 'HEAD' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 358 | ] |
| 359 | |
| 360 | def _run_reviewer_test( |
| 361 | self, |
| 362 | upload_args, |
| 363 | expected_description, |
| 364 | returned_description, |
| 365 | final_description, |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 366 | reviewers, |
| 367 | private=False): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 368 | """Generic reviewer test framework.""" |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 369 | try: |
| 370 | similarity = upload_args[upload_args.index('--similarity')+1] |
| 371 | except ValueError: |
| 372 | similarity = None |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 373 | |
| 374 | if '--find-copies' in upload_args: |
| 375 | find_copies = True |
| 376 | elif '--no-find-copies' in upload_args: |
| 377 | find_copies = False |
| 378 | else: |
| 379 | find_copies = None |
| 380 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 381 | private = '--private' in upload_args |
| 382 | |
| 383 | self.calls = self._upload_calls(similarity, find_copies, private) |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 384 | def RunEditor(desc, _, **kwargs): |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 385 | self.assertEquals( |
| 386 | '# Enter a description of the change.\n' |
janx@chromium.org | 104b2db | 2013-04-18 12:58:40 +0000 | [diff] [blame] | 387 | '# This will be displayed on the codereview site.\n' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 388 | '# The first line will also be used as the subject of the review.\n' + |
| 389 | expected_description, |
| 390 | desc) |
| 391 | return returned_description |
| 392 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
| 393 | def check_upload(args): |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 394 | cmd_line = self._cmd_line(final_description, reviewers, similarity, |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 395 | find_copies, private) |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 396 | self.assertEquals(cmd_line, args) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 397 | return 1, 2 |
| 398 | self.mock(git_cl.upload, 'RealMain', check_upload) |
| 399 | git_cl.main(['upload'] + upload_args) |
| 400 | |
| 401 | def test_no_reviewer(self): |
| 402 | self._run_reviewer_test( |
| 403 | [], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 404 | 'desc\n\nBUG=', |
| 405 | '# Blah blah comment.\ndesc\n\nBUG=', |
| 406 | 'desc\n\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 407 | []) |
| 408 | |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 409 | def test_keep_similarity(self): |
| 410 | self._run_reviewer_test( |
| 411 | ['--similarity', '70'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 412 | 'desc\n\nBUG=', |
| 413 | '# Blah blah comment.\ndesc\n\nBUG=', |
| 414 | 'desc\n\nBUG=', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 415 | []) |
| 416 | |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 417 | def test_keep_find_copies(self): |
| 418 | self._run_reviewer_test( |
| 419 | ['--no-find-copies'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 420 | 'desc\n\nBUG=', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 421 | '# Blah blah comment.\ndesc\n\nBUG=\n', |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 422 | 'desc\n\nBUG=', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 423 | []) |
| 424 | |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 425 | def test_private(self): |
| 426 | self._run_reviewer_test( |
| 427 | ['--private'], |
| 428 | 'desc\n\nBUG=', |
| 429 | '# Blah blah comment.\ndesc\n\nBUG=\n', |
| 430 | 'desc\n\nBUG=', |
| 431 | []) |
| 432 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 433 | def test_reviewers_cmd_line(self): |
| 434 | # Reviewer is passed as-is |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 435 | description = 'desc\n\nR=foo@example.com\nBUG=' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 436 | self._run_reviewer_test( |
| 437 | ['-r' 'foo@example.com'], |
| 438 | description, |
| 439 | '\n%s\n' % description, |
| 440 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 441 | ['--reviewers=foo@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 442 | |
| 443 | def test_reviewer_tbr_overriden(self): |
| 444 | # Reviewer is overriden with TBR |
| 445 | # Also verifies the regexp work without a trailing LF |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 446 | description = 'Foo Bar\n\nTBR=reviewer@example.com' |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 447 | self._run_reviewer_test( |
| 448 | ['-r' 'foo@example.com'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 449 | 'desc\n\nR=foo@example.com\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 450 | description.strip('\n'), |
| 451 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 452 | ['--reviewers=reviewer@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 453 | |
| 454 | def test_reviewer_multiple(self): |
| 455 | # Handles multiple R= or TBR= lines. |
| 456 | description = ( |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 457 | 'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com') |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 458 | self._run_reviewer_test( |
| 459 | [], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 460 | 'desc\n\nBUG=', |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 461 | description, |
| 462 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 463 | ['--reviewers=another@example.com,reviewer@example.com']) |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 464 | |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 465 | def test_reviewer_send_mail(self): |
| 466 | # --send-mail can be used without -r if R= is used |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 467 | description = 'Foo Bar\nR=reviewer@example.com' |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 468 | self._run_reviewer_test( |
| 469 | ['--send-mail'], |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 470 | 'desc\n\nBUG=', |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 471 | description.strip('\n'), |
| 472 | description, |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 473 | ['--reviewers=reviewer@example.com', '--send_mail']) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 474 | |
| 475 | def test_reviewer_send_mail_no_rev(self): |
| 476 | # Fails without a reviewer. |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 477 | stdout = StringIO.StringIO() |
| 478 | stderr = StringIO.StringIO() |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 479 | try: |
jbroman@chromium.org | 615a262 | 2013-05-03 13:20:14 +0000 | [diff] [blame] | 480 | self.calls = self._upload_no_rev_calls(None, None) |
| 481 | def RunEditor(desc, _, **kwargs): |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 482 | return desc |
| 483 | self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 484 | self.mock(sys, 'stdout', stdout) |
| 485 | self.mock(sys, 'stderr', stderr) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 486 | git_cl.main(['upload', '--send-mail']) |
| 487 | self.fail() |
| 488 | except SystemExit: |
maruel@chromium.org | 2e23ce3 | 2013-05-07 12:42:28 +0000 | [diff] [blame] | 489 | self.assertEqual( |
| 490 | 'Using 50% similarity for rename/copy detection. Override with ' |
| 491 | '--similarity.\n', |
| 492 | stdout.getvalue()) |
| 493 | self.assertEqual( |
| 494 | 'Must specify reviewers to send email.\n', stderr.getvalue()) |
maruel@chromium.org | a335365 | 2011-11-30 14:26:57 +0000 | [diff] [blame] | 495 | |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 496 | def test_dcommit(self): |
| 497 | self.calls = ( |
| 498 | self._dcommit_calls_1() + |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 499 | self._git_sanity_checks('fake_ancestor_sha', 'working') + |
maruel@chromium.org | 2e72bb1 | 2012-01-17 15:18:35 +0000 | [diff] [blame] | 500 | self._dcommit_calls_normal() + |
| 501 | self._dcommit_calls_3()) |
| 502 | git_cl.main(['dcommit']) |
| 503 | |
| 504 | def test_dcommit_bypass_hooks(self): |
| 505 | self.calls = ( |
| 506 | self._dcommit_calls_1() + |
| 507 | self._dcommit_calls_bypassed() + |
| 508 | self._dcommit_calls_3()) |
| 509 | git_cl.main(['dcommit', '--bypass-hooks']) |
| 510 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 511 | |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 512 | @classmethod |
| 513 | def _gerrit_base_calls(cls): |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 514 | return [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 515 | ((['git', '--no-pager', |
| 516 | 'config', 'rietveld.server'],), 'codereview.example.com'), |
| 517 | ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'master'), |
| 518 | ((['git', '--no-pager', 'config', '--int', '--get', |
iannucci@chromium.org | 53937ba | 2012-10-02 18:20:43 +0000 | [diff] [blame] | 519 | 'branch.master.git-cl-similarity'],), ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 520 | ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'master'), |
| 521 | ((['git', '--no-pager', 'config', '--int', '--get', |
iannucci@chromium.org | 7954005 | 2012-10-19 23:15:26 +0000 | [diff] [blame] | 522 | 'branch.master.git-find-copies'],), ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 523 | ((['git', '--no-pager', 'update-index', '--refresh', '-q'],), ''), |
| 524 | ((['git', '--no-pager', 'diff-index', '--name-status', 'HEAD'],), ''), |
| 525 | ((['git', '--no-pager', 'symbolic-ref', 'HEAD'],), 'master'), |
| 526 | ((['git', '--no-pager', 'config', 'branch.master.merge'],), 'master'), |
| 527 | ((['git', '--no-pager', 'config', 'branch.master.remote'],), 'origin'), |
| 528 | ((['git', '--no-pager', |
| 529 | 'merge-base', 'master', 'HEAD'],), 'fake_ancestor_sha'), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 530 | ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 531 | ((['git', '--no-pager', 'rev-parse', '--show-cdup'],), ''), |
| 532 | ((['git', '--no-pager', 'rev-parse', 'HEAD'],), '12345'), |
| 533 | ((['git', '--no-pager', |
| 534 | 'diff', '--name-status', '-r', 'fake_ancestor_sha...', '.'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 535 | 'M\t.gitignore\n'), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 536 | ((['git', '--no-pager', 'config', 'branch.master.rietveldissue'],), ''), |
| 537 | ((['git', '--no-pager', |
| 538 | 'config', 'branch.master.rietveldpatchset'],), ''), |
| 539 | ((['git', '--no-pager', |
| 540 | 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],), |
ilevy@chromium.org | 0f58fa8 | 2012-11-05 01:45:20 +0000 | [diff] [blame] | 541 | 'foo'), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 542 | ((['git', '--no-pager', 'config', 'user.email'],), 'me@example.com'), |
| 543 | ((['git', '--no-pager', |
| 544 | 'diff', '--no-ext-diff', '--stat', '--find-copies-harder', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 545 | '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 546 | '+dat'), |
| 547 | ] |
| 548 | |
| 549 | @staticmethod |
| 550 | def _gerrit_upload_calls(description, reviewers): |
| 551 | calls = [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 552 | ((['git', '--no-pager', 'config', 'gerrit.host'],), |
| 553 | 'gerrit.example.com'), |
| 554 | ((['git', '--no-pager', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 555 | 'fake_ancestor_sha..HEAD'],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 556 | description) |
| 557 | ] |
| 558 | if git_cl.CHANGE_ID not in description: |
| 559 | calls += [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 560 | ((['git', '--no-pager', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 561 | 'fake_ancestor_sha..HEAD'],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 562 | description), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 563 | ((['git', '--no-pager', 'commit', '--amend', '-m', description],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 564 | ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 565 | ((['git', '--no-pager', 'log', '--pretty=format:%s\n\n%b', |
sbc@chromium.org | 5e07e06 | 2013-02-28 23:55:44 +0000 | [diff] [blame] | 566 | 'fake_ancestor_sha..HEAD'],), |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 567 | description) |
| 568 | ] |
| 569 | calls += [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 570 | ((['git', '--no-pager', 'config', 'rietveld.cc'],), '') |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 571 | ] |
ukai@chromium.org | 19bbfa2 | 2012-02-03 16:18:11 +0000 | [diff] [blame] | 572 | receive_pack = '--receive-pack=git receive-pack ' |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 573 | receive_pack += '--cc=joe@example.com' # from watch list |
| 574 | if reviewers: |
| 575 | receive_pack += ' ' |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 576 | receive_pack += ' '.join( |
| 577 | '--reviewer=' + email for email in sorted(reviewers)) |
ukai@chromium.org | 19bbfa2 | 2012-02-03 16:18:11 +0000 | [diff] [blame] | 578 | receive_pack += '' |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 579 | calls += [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 580 | ((['git', '--no-pager', |
| 581 | 'push', receive_pack, 'origin', 'HEAD:refs/for/master'],), |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 582 | '') |
| 583 | ] |
| 584 | return calls |
| 585 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 586 | def _run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 587 | self, |
| 588 | upload_args, |
| 589 | description, |
| 590 | reviewers): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 591 | """Generic gerrit upload test framework.""" |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 592 | self.calls = self._gerrit_base_calls() |
| 593 | self.calls += self._gerrit_upload_calls(description, reviewers) |
| 594 | git_cl.main(['upload'] + upload_args) |
| 595 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 596 | def test_gerrit_upload_without_change_id(self): |
| 597 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 598 | [], |
jamesr@chromium.org | 35d1a84 | 2012-07-27 00:20:43 +0000 | [diff] [blame] | 599 | 'desc\n\nBUG=\n', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 600 | []) |
| 601 | |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 602 | def test_gerrit_no_reviewer(self): |
| 603 | self._run_gerrit_upload_test( |
| 604 | [], |
| 605 | 'desc\n\nBUG=\nChange-Id:123456789\n', |
| 606 | []) |
| 607 | |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 608 | def test_gerrit_reviewers_cmd_line(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 609 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 610 | ['-r', 'foo@example.com'], |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 611 | 'desc\n\nBUG=\nChange-Id:123456789', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 612 | ['foo@example.com']) |
| 613 | |
| 614 | def test_gerrit_reviewer_multiple(self): |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 615 | self._run_gerrit_upload_test( |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 616 | [], |
sivachandra@chromium.org | aebe87f | 2012-10-22 20:34:21 +0000 | [diff] [blame] | 617 | 'desc\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n' |
| 618 | 'Change-Id:123456789\n', |
ukai@chromium.org | e807781 | 2012-02-03 03:41:46 +0000 | [diff] [blame] | 619 | ['reviewer@example.com', 'another@example.com']) |
| 620 | |
| 621 | |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 622 | def test_config_gerrit_download_hook(self): |
| 623 | self.mock(git_cl, 'FindCodereviewSettingsFile', CodereviewSettingsFileMock) |
| 624 | def ParseCodereviewSettingsContent(content): |
| 625 | keyvals = {} |
| 626 | keyvals['CODE_REVIEW_SERVER'] = 'gerrit.chromium.org' |
| 627 | keyvals['GERRIT_HOST'] = 'gerrit.chromium.org' |
| 628 | keyvals['GERRIT_PORT'] = '29418' |
| 629 | return keyvals |
| 630 | self.mock(git_cl.gclient_utils, 'ParseCodereviewSettingsContent', |
| 631 | ParseCodereviewSettingsContent) |
| 632 | self.mock(git_cl.os, 'access', self._mocked_call) |
| 633 | self.mock(git_cl.os, 'chmod', self._mocked_call) |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 634 | src_dir = os.path.join(os.path.sep, 'usr', 'local', 'src') |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 635 | def AbsPath(path): |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 636 | if not path.startswith(os.path.sep): |
| 637 | return os.path.join(src_dir, path) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 638 | return path |
| 639 | self.mock(git_cl.os.path, 'abspath', AbsPath) |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 640 | 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] | 641 | def Exists(path): |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 642 | if path == commit_msg_path: |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 643 | return False |
| 644 | # others paths, such as /usr/share/locale/.... |
| 645 | return True |
| 646 | self.mock(git_cl.os.path, 'exists', Exists) |
joshua.lock@intel.com | 426f69b | 2012-08-02 23:41:49 +0000 | [diff] [blame] | 647 | self.mock(git_cl, 'urlretrieve', self._mocked_call) |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 648 | self.calls = [ |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 649 | ((['git', '--no-pager', 'config', 'rietveld.server', |
| 650 | 'gerrit.chromium.org'],), ''), |
| 651 | ((['git', '--no-pager', 'config', '--unset-all', 'rietveld.cc'],), ''), |
| 652 | ((['git', '--no-pager', 'config', '--unset-all', |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 653 | 'rietveld.private'],), ''), |
| 654 | ((['git', '--no-pager', 'config', '--unset-all', |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 655 | 'rietveld.tree-status-url'],), ''), |
| 656 | ((['git', '--no-pager', 'config', '--unset-all', |
| 657 | 'rietveld.viewvc-url'],), ''), |
| 658 | ((['git', '--no-pager', 'config', 'gerrit.host', |
| 659 | 'gerrit.chromium.org'],), ''), |
| 660 | ((['git', '--no-pager', 'config', 'gerrit.port', '29418'],), ''), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 661 | # DownloadHooks(False) |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 662 | ((['git', '--no-pager', 'config', 'gerrit.host'],), |
| 663 | 'gerrit.chromium.org'), |
| 664 | ((['git', '--no-pager', 'config', 'rietveld.server'],), |
| 665 | 'gerrit.chromium.org'), |
| 666 | ((['git', '--no-pager', 'rev-parse', '--show-cdup'],), ''), |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 667 | ((commit_msg_path, os.X_OK,), False), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 668 | (('https://gerrit.chromium.org/tools/hooks/commit-msg', |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 669 | commit_msg_path,), ''), |
| 670 | ((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] | 671 | # GetCodereviewSettingsInteractively |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 672 | ((['git', '--no-pager', 'config', 'rietveld.server'],), |
| 673 | 'gerrit.chromium.org'), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 674 | (('Rietveld server (host[:port]) [https://gerrit.chromium.org]:',), |
| 675 | ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 676 | ((['git', '--no-pager', 'config', 'rietveld.cc'],), ''), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 677 | (('CC list:',), ''), |
tyoshino@chromium.org | c1737d0 | 2013-05-29 14:17:28 +0000 | [diff] [blame] | 678 | ((['git', '--no-pager', 'config', 'rietveld.private'],), ''), |
| 679 | (('Private flag (rietveld only):',), ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 680 | ((['git', '--no-pager', 'config', 'rietveld.tree-status-url'],), ''), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 681 | (('Tree status URL:',), ''), |
bratell@opera.com | f267b0e | 2013-05-02 09:11:43 +0000 | [diff] [blame] | 682 | ((['git', '--no-pager', 'config', 'rietveld.viewvc-url'],), ''), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 683 | (('ViewVC URL:',), ''), |
| 684 | # DownloadHooks(True) |
ukai@chromium.org | 9165550 | 2012-05-25 01:46:07 +0000 | [diff] [blame] | 685 | ((commit_msg_path, os.X_OK,), True), |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 686 | ] |
| 687 | git_cl.main(['config']) |
| 688 | |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 689 | def test_update_reviewers(self): |
| 690 | data = [ |
| 691 | ('foo', [], 'foo'), |
| 692 | ('foo', ['a@c'], 'foo\n\nR=a@c'), |
| 693 | ('foo\nBUG=', ['a@c'], 'foo\nBUG=\nR=a@c'), |
| 694 | ('foo\nR=xx\nTBR=yy\nR=bar', ['a@c'], 'foo\nTBR=a@c'), |
| 695 | ('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] | 696 | ('foo\nBar\n\nR=\nBUG=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='), |
| 697 | ('foo\nBar\n\nR=\nBUG=\nR=', ['c@c'], 'foo\nBar\n\nR=c@c\nBUG='), |
| 698 | # Same as the line before, but full of whitespaces. |
| 699 | ( |
| 700 | 'foo\nBar\n\n R = \n BUG = \n R = ', ['c@c'], |
| 701 | 'foo\nBar\n\nR=c@c\n BUG =', |
| 702 | ), |
| 703 | # Whitespaces aren't interpreted as new lines. |
| 704 | ('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] | 705 | ] |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 706 | expected = [i[2] for i in data] |
| 707 | actual = [] |
| 708 | for orig, reviewers, _expected in data: |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 709 | obj = git_cl.ChangeDescription(orig) |
| 710 | obj.update_reviewers(reviewers) |
maruel@chromium.org | c6f60e8 | 2013-04-19 17:01:57 +0000 | [diff] [blame] | 711 | actual.append(obj.description) |
| 712 | self.assertEqual(expected, actual) |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 713 | |
ukai@chromium.org | 78c4b98 | 2012-02-14 02:20:26 +0000 | [diff] [blame] | 714 | |
maruel@chromium.org | ddd5941 | 2011-11-30 14:20:38 +0000 | [diff] [blame] | 715 | if __name__ == '__main__': |
maruel@chromium.org | 78936cb | 2013-04-11 00:17:52 +0000 | [diff] [blame] | 716 | git_cl.logging.basicConfig( |
| 717 | 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] | 718 | unittest.main() |