diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-20 23:18:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-20 23:18:17 +0000 |
| commit | a724cf86736765e63dc5593ed24a8a6cc15f65be (patch) | |
| tree | 6bd91b92056e4a2e95a884d913c40c8da199edf6 | |
| parent | e27be29d5dcf7a172180b45a33c8b291de658e74 (diff) | |
| parent | 23711a5d0586cd864eb56a78788ff98461cd82d5 (diff) | |
| download | keystonemiddleware-a724cf86736765e63dc5593ed24a8a6cc15f65be.tar.gz | |
Merge "Remove the _is_v2 and _is_v3 helpers"4.7.0
| -rw-r--r-- | keystonemiddleware/auth_token/__init__.py | 8 | ||||
| -rw-r--r-- | keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py | 20 |
2 files changed, 0 insertions, 28 deletions
diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py index 2855bfa..aefcf83 100644 --- a/keystonemiddleware/auth_token/__init__.py +++ b/keystonemiddleware/auth_token/__init__.py @@ -285,14 +285,6 @@ class _BIND_MODE(object): KERBEROS = 'kerberos' -def _token_is_v2(token_info): - return ('access' in token_info) - - -def _token_is_v3(token_info): - return ('token' in token_info) - - def _uncompress_pkiz(token): # TypeError If the signed_text is not zlib compressed binascii.Error if # signed_text has incorrect base64 padding (py34) 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 6636c28..9ecd76f 100644 --- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py +++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py @@ -442,26 +442,6 @@ class GeneralAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest, resources = [('examples', client_fixtures.EXAMPLES_RESOURCE)] - def test_token_is_v2_accepts_v2(self): - token = self.examples.UUID_TOKEN_DEFAULT - token_response = self.examples.TOKEN_RESPONSES[token] - self.assertTrue(auth_token._token_is_v2(token_response)) - - def test_token_is_v2_rejects_v3(self): - token = self.examples.v3_UUID_TOKEN_DEFAULT - token_response = self.examples.TOKEN_RESPONSES[token] - self.assertFalse(auth_token._token_is_v2(token_response)) - - def test_token_is_v3_rejects_v2(self): - token = self.examples.UUID_TOKEN_DEFAULT - token_response = self.examples.TOKEN_RESPONSES[token] - self.assertFalse(auth_token._token_is_v3(token_response)) - - def test_token_is_v3_accepts_v3(self): - token = self.examples.v3_UUID_TOKEN_DEFAULT - token_response = self.examples.TOKEN_RESPONSES[token] - self.assertTrue(auth_token._token_is_v3(token_response)) - def test_fixed_cache_key_length(self): self.set_middleware() short_string = uuid.uuid4().hex |