diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2013-07-23 21:16:01 -0500 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2013-07-24 12:34:48 -0500 |
| commit | 7b4fedeed3517a17d32dad820bae2a49dd6c3e1b (patch) | |
| tree | 137d94085943718da9e3457e409d7c67eb6a39a2 /tests | |
| parent | c6b7dd8959f96e4b5bf282860245603ff94b0084 (diff) | |
| download | keystone-7b4fedeed3517a17d32dad820bae2a49dd6c3e1b.tar.gz keystone-7b4fedeed3517a17d32dad820bae2a49dd6c3e1b.tar.xz keystone-7b4fedeed3517a17d32dad820bae2a49dd6c3e1b.zip | |
default token format/provider handling
The Keystone server would print a warning when both the token
format and provider were set to the default.
Also, the Keystone server would not start if the format was
commented out and the provider was set to the uuid.Provider.
Fixes: bug 1204314
Change-Id: Id7db33a1f27c4986af153efc73b22db8c6a8942e
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_pki_token_provider.conf | 3 | ||||
| -rw-r--r-- | tests/test_token_provider.py | 9 | ||||
| -rw-r--r-- | tests/test_uuid_token_provider.conf | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/tests/test_pki_token_provider.conf b/tests/test_pki_token_provider.conf index ec8df231..255972c3 100644 --- a/tests/test_pki_token_provider.conf +++ b/tests/test_pki_token_provider.conf @@ -1,5 +1,2 @@ -[signing] -token_format = PKI - [token] provider = keystone.token.providers.pki.Provider diff --git a/tests/test_token_provider.py b/tests/test_token_provider.py index 1bcf1a21..ac0b0d6b 100644 --- a/tests/test_token_provider.py +++ b/tests/test_token_provider.py @@ -410,11 +410,16 @@ class TestTokenProvider(test.TestCase): self.assertRaises(exception.UnexpectedError, token.provider.Manager.get_token_provider) + def test_uuid_provider(self): + self.opt_in_group('token', provider=token.provider.UUID_PROVIDER) + self.assertEqual(token.provider.Manager.get_token_provider(), + token.provider.UUID_PROVIDER) + def test_provider_override_token_format(self): self.opt_in_group('token', provider='keystone.token.providers.pki.Test') - self.assertRaises(exception.UnexpectedError, - token.provider.Manager.get_token_provider) + self.assertEqual(token.provider.Manager.get_token_provider(), + 'keystone.token.providers.pki.Test') self.opt_in_group('signing', token_format='UUID') self.opt_in_group('token', diff --git a/tests/test_uuid_token_provider.conf b/tests/test_uuid_token_provider.conf index d1ac5fdf..d127ea3b 100644 --- a/tests/test_uuid_token_provider.conf +++ b/tests/test_uuid_token_provider.conf @@ -1,5 +1,2 @@ -[signing] -token_format = UUID - [token] provider = keystone.token.providers.uuid.Provider |