diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index 637b3b267..72575a8f7 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -972,7 +972,7 @@ class AuthProtocol(object): env_key = self._header_to_env_var(key) return env.get(env_key, default) - def _cache_get(self, token_id, ignore_expires=False): + def _cache_get(self, token_id): """Return token information from cache. If token is invalid raise InvalidUserToken @@ -1035,7 +1035,7 @@ class AuthProtocol(object): expires = timeutils.normalize_time(expires) utcnow = timeutils.utcnow() - if ignore_expires or utcnow < expires: + if utcnow < expires: self.LOG.debug('Returning cached token') return data else: diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py index 066caa82c..89356067a 100644 --- a/keystoneclient/tests/test_auth_token_middleware.py +++ b/keystoneclient/tests/test_auth_token_middleware.py @@ -730,8 +730,7 @@ class CommonAuthTokenMiddlewareTest(object): def _get_cached_token(self, token): token_id = cms.cms_hash_token(token) - # NOTE(vish): example tokens are expired so skip the expiration check. - return self.middleware._cache_get(token_id, ignore_expires=True) + return self.middleware._cache_get(token_id) def test_memcache(self): # NOTE(jamielennox): it appears that httpretty can mess with the