diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-21 17:39:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-21 17:39:14 +0000 |
| commit | 4a72d271d982b5b7098d648515c6eb201d715f57 (patch) | |
| tree | 7bd05f352da42f82be2ec4ead4332dad03d799cc /tests | |
| parent | 028590bdda2ab8120fcbc6f659b1cef7d836ea74 (diff) | |
| parent | 76888e1ee21326adf1f4d44b64da81479fcde6c3 (diff) | |
| download | keystone-4a72d271d982b5b7098d648515c6eb201d715f57.tar.gz keystone-4a72d271d982b5b7098d648515c6eb201d715f57.tar.xz keystone-4a72d271d982b5b7098d648515c6eb201d715f57.zip | |
Merge "Deprecation warning for [signing] token_format"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_token_provider.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_token_provider.py b/tests/test_token_provider.py index 31205073..1bcf1a21 100644 --- a/tests/test_token_provider.py +++ b/tests/test_token_provider.py @@ -397,39 +397,39 @@ class TestTokenProvider(test.TestCase): token.provider.Manager() def test_default_token_format(self): - self.assertEqual(token.provider.Manager.check_and_get_token_provider(), + self.assertEqual(token.provider.Manager.get_token_provider(), token.provider.PKI_PROVIDER) def test_uuid_token_format_and_no_provider(self): self.opt_in_group('signing', token_format='UUID') - self.assertEqual(token.provider.Manager.check_and_get_token_provider(), + self.assertEqual(token.provider.Manager.get_token_provider(), token.provider.UUID_PROVIDER) def test_unsupported_token_format(self): self.opt_in_group('signing', token_format='CUSTOM') self.assertRaises(exception.UnexpectedError, - token.provider.Manager.check_and_get_token_provider) + token.provider.Manager.get_token_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.check_and_get_token_provider) + token.provider.Manager.get_token_provider) self.opt_in_group('signing', token_format='UUID') self.opt_in_group('token', provider=token.provider.UUID_PROVIDER) - self.assertEqual(token.provider.Manager.check_and_get_token_provider(), + self.assertEqual(token.provider.Manager.get_token_provider(), token.provider.UUID_PROVIDER) self.opt_in_group('signing', token_format='PKI') self.opt_in_group('token', provider=token.provider.PKI_PROVIDER) - self.assertEqual(token.provider.Manager.check_and_get_token_provider(), + self.assertEqual(token.provider.Manager.get_token_provider(), token.provider.PKI_PROVIDER) self.opt_in_group('signing', token_format='CUSTOM') self.opt_in_group('token', provider='my.package.MyProvider') - self.assertEqual(token.provider.Manager.check_and_get_token_provider(), + self.assertEqual(token.provider.Manager.get_token_provider(), 'my.package.MyProvider') |