diff options
| author | Jamie Lennox <jamielennox@gmail.com> | 2016-07-07 14:20:28 +1000 |
|---|---|---|
| committer | Jamie Lennox <jamielennox@gmail.com> | 2016-07-07 14:20:28 +1000 |
| commit | 23711a5d0586cd864eb56a78788ff98461cd82d5 (patch) | |
| tree | 1757df3b0f60b25f3a2593f3f9003ed0ca5e7d61 | |
| parent | 29709a4aaf9f8851a11234380cc67285840f0216 (diff) | |
| download | keystonemiddleware-23711a5d0586cd864eb56a78788ff98461cd82d5.tar.gz | |
Remove the _is_v2 and _is_v3 helpers
We've finally got to the point where tokens are abstracted to the point
where we don't actually need to test by content what version of token it
is. Rejoice and remove the helpers.
Change-Id: Ia968ea68a9731c2a8f6a120acf697b30a2fcef8b
| -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 |