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