openstack/deb-python-keystonemiddleware
Code Issues Proposed changes

Merge "Remove except Exception handler"

Browse Source
This commit is contained in:
Jenkins
2016-02-12 03:48:38 +00:00
committed by Gerrit Code Review
parent 184fbff177 4008e75d2b
commit 310a5b204e
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keystonemiddleware/auth_token/__init__.py
View File

@@ -860,9 +860,6 @@ class AuthProtocol(BaseAuthProtocol):
self._token_cache.store_invalid(token_hashes[0])
self.log.warning(_LW('Authorization failed for token'))
raise
except Exception:
self.log.critical(_LC('Unable to validate token'), exc_info=True)
raise webob.exc.HTTPInternalServerError()
return data

9
keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
View File

@@ -665,15 +665,6 @@ class CommonAuthTokenMiddlewareTest(object):
self.call_middleware(headers={'X-Auth-Token': token},
expected_status=503)
def test_unexpected_exception_in_validate_offline(self):
# When an unexpected exception is hit during _validate_offline,
# 500 is returned
token = self.token_dict['uuid_token_default']
with mock.patch.object(self.middleware, '_validate_offline',
side_effect=Exception):
self.call_middleware(headers={'X-Auth-Token': token},
expected_status=500)
def test_cached_revoked_uuid(self):
# When the UUID token is cached and revoked, 401 is returned.
self._test_cache_revoked(self.token_dict['uuid_token_default'])