| Index: tests/git_cl_test.py
|
| diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
|
| index 68be49f792cccf455404b6dfe0428cfa4c43e64a..ed1d7a56342c97873ee1091e93996e4ff25ca8e6 100755
|
| --- a/tests/git_cl_test.py
|
| +++ b/tests/git_cl_test.py
|
| @@ -96,7 +96,6 @@ class TestGitCl(TestCase):
|
| self.mock(git_cl.upload, 'RealMain', self.fail)
|
| self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
|
| self.mock(git_cl.auth, 'get_authenticator_for_host', AuthenticatorMock)
|
| - self.mock(git_cl.auth, '_should_use_oauth2', lambda: False)
|
| # It's important to reset settings to not have inter-tests interference.
|
| git_cl.settings = None
|
|
|
| @@ -171,13 +170,13 @@ class TestGitCl(TestCase):
|
| ((['get_or_create_merge_base', 'master', 'master'],),
|
| 'fake_ancestor_sha'),
|
| ((['git', 'config', 'gerrit.host'],), ''),
|
| + ((['git', 'config', 'branch.master.rietveldissue'],), ''),
|
| ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
|
| ((['git', 'rev-parse', '--show-cdup'],), ''),
|
| ((['git', 'rev-parse', 'HEAD'],), '12345'),
|
| ((['git', 'diff', '--name-status', '--no-renames', '-r',
|
| 'fake_ancestor_sha...', '.'],),
|
| 'M\t.gitignore\n'),
|
| - ((['git', 'config', 'branch.master.rietveldissue'],), ''),
|
| ((['git', 'config', 'branch.master.rietveldpatchset'],),
|
| ''),
|
| ((['git', 'log', '--pretty=format:%s%n%n%b',
|
|
|