Chromium Code Reviews| Index: tests/git_cl_test.py |
| diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py |
| index 0cd6fea6f2650fe0b6e65c7e7ffb17a5c506ab7e..84b48975fa7a07bb7a7b080d1c5166376b4aad04 100755 |
| --- a/tests/git_cl_test.py |
| +++ b/tests/git_cl_test.py |
| @@ -146,6 +146,8 @@ class TestGitCl(TestCase): |
| '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat') |
| return [ |
| + ((['git', 'config', 'rietveld.autoupdate'],), |
|
ghost stip (do not use)
2014/01/03 20:40:21
nit: make this one line?
|
| + ''), |
| ((['git', 'config', 'rietveld.server'],), |
| 'codereview.example.com'), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| @@ -250,6 +252,8 @@ class TestGitCl(TestCase): |
| 'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'), |
| None), |
| 0)), |
| + ((['git', 'config', 'rietveld.autoupdate'],), |
| + ''), |
| ((['git', |
| 'config', 'rietveld.server'],), 'codereview.example.com'), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'), |
| @@ -382,6 +386,7 @@ class TestGitCl(TestCase): |
| private = '--private' in upload_args |
| self.calls = self._upload_calls(similarity, find_copies, private) |
| + |
| def RunEditor(desc, _, **kwargs): |
| self.assertEquals( |
| '# Enter a description of the change.\n' |
| @@ -393,12 +398,14 @@ class TestGitCl(TestCase): |
| desc) |
| return returned_description |
| self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor) |
| + |
| def check_upload(args): |
| cmd_line = self._cmd_line(final_description, reviewers, similarity, |
| find_copies, private) |
| self.assertEquals(cmd_line, args) |
| return 1, 2 |
| self.mock(git_cl.upload, 'RealMain', check_upload) |
| + |
| git_cl.main(['upload'] + upload_args) |
| def test_no_reviewer(self): |
| @@ -515,6 +522,8 @@ class TestGitCl(TestCase): |
| @classmethod |
| def _gerrit_base_calls(cls): |
| return [ |
| + ((['git', 'config', 'rietveld.autoupdate'],), |
| + ''), |
| ((['git', |
| 'config', 'rietveld.server'],), 'codereview.example.com'), |
| ((['git', 'symbolic-ref', 'HEAD'],), 'master'), |
| @@ -651,6 +660,8 @@ class TestGitCl(TestCase): |
| self.mock(git_cl, 'urlretrieve', self._mocked_call) |
| self.mock(git_cl, 'hasSheBang', self._mocked_call) |
| self.calls = [ |
| + ((['git', 'config', 'rietveld.autoupdate'],), |
| + ''), |
| ((['git', 'config', 'rietveld.server', |
| 'gerrit.chromium.org'],), ''), |
| ((['git', 'config', '--unset-all', 'rietveld.cc'],), ''), |