Merge "Fix swift pollsters that use get_account"
This commit is contained in:
commit
41ac16b5ed
@ -93,7 +93,7 @@ class _Base(plugin_base.PollsterBase):
|
||||
yield (t.id, swift_api_method(
|
||||
None,
|
||||
keystone_client.get_auth_token(ksclient),
|
||||
http_conn))
|
||||
http_conn=http_conn))
|
||||
except ClientException as e:
|
||||
if e.http_status == 404:
|
||||
LOG.warning("Swift tenant id %s not found.", t.id)
|
||||
|
@ -207,7 +207,7 @@ class TestSwiftPollster(testscenarios.testcase.WithScenarios,
|
||||
self.assertEqual(expected, mock_connection.call_args_list)
|
||||
|
||||
expected = [mock.call(None, self.manager._auth_token,
|
||||
mock_connection.return_value)
|
||||
http_conn=mock_connection.return_value)
|
||||
for t in ASSIGNED_TENANTS]
|
||||
self.assertEqual(expected, mock_method.call_args_list)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user