depot_tools: Clean up auth.py
Bug: 1001756
Change-Id: I495991c30f7f00de17e7c098e2d88ef7783aff3c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1865265
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 887783f..b115a9f 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -637,7 +637,7 @@
self._mocked_call('write_json', path, contents))
self.mock(git_cl.presubmit_support, 'DoPresubmitChecks', PresubmitMock)
self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
- self.mock(git_cl.auth, 'get_authenticator', AuthenticatorMock)
+ self.mock(git_cl.auth, 'Authenticator', AuthenticatorMock)
self.mock(git_cl.gerrit_util, 'GetChangeDetail',
lambda *args, **kwargs: self._mocked_call(
'GetChangeDetail', *args, **kwargs))
@@ -3062,7 +3062,7 @@
return_value='https://chromium-review.googlesource.com').start()
mock.patch('git_cl.Changelist.GetMostRecentPatchset',
return_value=7).start()
- mock.patch('git_cl.auth.get_authenticator',
+ mock.patch('git_cl.auth.Authenticator',
return_value=AuthenticatorMock()).start()
mock.patch('git_cl.Changelist._GetChangeDetail',
return_value=self._CHANGE_DETAIL).start()
@@ -3382,14 +3382,14 @@
self.assertEqual(0, git_cl.main(['upload', '--retry-failed']))
self.assertEqual([
- mock.call(mock.ANY, mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
- mock.call(mock.ANY, mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
+ mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=7),
+ mock.call(mock.ANY, 'cr-buildbucket.appspot.com', patchset=6),
], git_cl.fetch_try_jobs.mock_calls)
expected_buckets = {
'chromium/try': {'bot_failure': [], 'bot_infra_failure': []},
}
git_cl._trigger_try_jobs.assert_called_once_with(
- mock.ANY, mock.ANY, expected_buckets, mock.ANY, 8)
+ mock.ANY, expected_buckets, mock.ANY, 8)
class CMDFormatTestCase(TestCase):