diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2013-07-18 11:34:34 -0500 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2013-07-18 11:39:53 -0500 |
| commit | 76888e1ee21326adf1f4d44b64da81479fcde6c3 (patch) | |
| tree | ab48d1e94ed254637beb631db3378f49a9aa0f43 /tests | |
| parent | e63501d305c67b898821ad65ec744adf6851236a (diff) | |
| download | keystone-76888e1ee21326adf1f4d44b64da81479fcde6c3.tar.gz keystone-76888e1ee21326adf1f4d44b64da81479fcde6c3.tar.xz keystone-76888e1ee21326adf1f4d44b64da81479fcde6c3.zip | |
Deprecation warning for [signing] token_format
This also adds i18n to a few related strings and updates doc.
Change-Id: Icba582a085939f58581fa909b63a36cbad3b4e69
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') |