| Index: tests/git_cl_test.py
|
| diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
|
| index d6610653a0a5a3e3eb219ad9d0a89df5d8a8da5c..ffd61be3de42f91073a9a2c8faed36c4cf099915 100755
|
| --- a/tests/git_cl_test.py
|
| +++ b/tests/git_cl_test.py
|
| @@ -114,6 +114,11 @@ class TestGitCl(TestCase):
|
| cls._git_upload_calls())
|
|
|
| @classmethod
|
| + def _upload_no_rev_calls(cls, similarity, find_copies):
|
| + return (cls._git_base_calls(similarity, find_copies) +
|
| + cls._git_upload_no_rev_calls())
|
| +
|
| + @classmethod
|
| def _git_base_calls(cls, similarity, find_copies):
|
| if similarity is None:
|
| similarity = '50'
|
| @@ -169,8 +174,15 @@ class TestGitCl(TestCase):
|
| ]
|
|
|
| @classmethod
|
| + def _git_upload_no_rev_calls(cls):
|
| + return [
|
| + ((['git', 'config', 'core.editor'],), ''),
|
| + ]
|
| +
|
| + @classmethod
|
| def _git_upload_calls(cls):
|
| return [
|
| + ((['git', 'config', 'core.editor'],), ''),
|
| ((['git', 'config', 'rietveld.cc'],), ''),
|
| ((['git', 'config', 'branch.master.base-url'],), ''),
|
| ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
|
| @@ -330,7 +342,7 @@ class TestGitCl(TestCase):
|
| find_copies = None
|
|
|
| self.calls = self._upload_calls(similarity, find_copies)
|
| - def RunEditor(desc, _):
|
| + def RunEditor(desc, _, **kwargs):
|
| self.assertEquals(
|
| '# Enter a description of the change.\n'
|
| '# This will be displayed on the codereview site.\n'
|
| @@ -422,8 +434,8 @@ class TestGitCl(TestCase):
|
|
|
| mock = FileMock()
|
| try:
|
| - self.calls = self._git_base_calls(None, None)
|
| - def RunEditor(desc, _):
|
| + self.calls = self._upload_no_rev_calls(None, None)
|
| + def RunEditor(desc, _, **kwargs):
|
| return desc
|
| self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
|
| self.mock(sys, 'stderr', mock)
|
|
|