From d3090bfbc0adffff36b158785a1ecea73349045c Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Sun, 24 Nov 2019 00:12:24 -0600 Subject: [PATCH] Remove keystoneclient exception usage in tests This change replaces the usage of keystoneclient exceptions in the auth_token_middleware unit tests to use the ConnectFailure exception from keystoneauth. This is part of the process of removing keystoneclient from keystonemiddleware. Change-Id: Ie00fc310728c319faf2cfdfb651f0c7a8f48d757 --- .../tests/unit/auth_token/test_auth_token_middleware.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py index a09d269d..d2dc9462 100644 --- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py +++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py @@ -22,7 +22,6 @@ from keystoneauth1 import exceptions as ksa_exceptions from keystoneauth1 import fixture from keystoneauth1 import loading from keystoneauth1 import session -from keystoneclient import exceptions as ksc_exceptions import mock import oslo_cache from oslo_log import log as logging @@ -1527,7 +1526,7 @@ class DelayedAuthTests(BaseAuthTokenMiddlewareTest): if request.headers.get('X-Subject-Token') == ERROR_TOKEN: msg = 'Network connection refused.' - raise ksc_exceptions.ConnectionRefused(msg) + raise ksa_exceptions.ConnectFailure(msg) # All others just fail context.status_code = 404 @@ -1951,7 +1950,7 @@ class v3CompositeAuthTests(BaseAuthTokenMiddlewareTest, if token_id == ERROR_TOKEN: msg = "Network connection refused." - raise ksc_exceptions.ConnectionRefused(msg) + raise ksa_exceptions.ConnectFailure(msg) elif token_id == TIMEOUT_TOKEN: request_timeout_response(request, context)