diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2013-08-01 18:34:28 -0500 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2013-08-01 18:39:08 -0500 |
| commit | b793d2ff1f38ca46994825918500d8f75521d9d2 (patch) | |
| tree | 7bb1656f6caf86281c61855ab9894438e0241ab8 | |
| parent | 19081b834991d263d84c761dcf422a8c9faf40a1 (diff) | |
| download | keystone-b793d2ff1f38ca46994825918500d8f75521d9d2.tar.gz keystone-b793d2ff1f38ca46994825918500d8f75521d9d2.tar.xz keystone-b793d2ff1f38ca46994825918500d8f75521d9d2.zip | |
Clean up use of token_provider manager in tests
With 19081b834991d263d84c761dcf422a8c9faf40a1, the token_provider
is created in load_backends() so it doesn't have to be created by
the tests.
This makes the tests using token_provider_api consistent with how
other backends are used in the tests.
This change only affects unit tests.
Change-Id: I9c05c7876bd14fb28e77fe1e49dd509a2a1cb788
| -rw-r--r-- | keystone/test.py | 7 | ||||
| -rw-r--r-- | tests/test_keystoneclient.py | 2 | ||||
| -rw-r--r-- | tests/test_token_provider.py | 1 | ||||
| -rw-r--r-- | tests/test_v3.py | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/keystone/test.py b/keystone/test.py index d06ea4c5..cbe51fb2 100644 --- a/keystone/test.py +++ b/keystone/test.py @@ -268,7 +268,12 @@ class TestCase(NoModule, unittest.TestCase): for manager in [assignment, catalog, credential, ec2, identity, policy, token, token_provider, trust]: - manager_name = '%s_api' % manager.__name__.split('.')[-1] + # manager.__name__ is like keystone.xxx[.yyy], + # converted to xxx[_yyy] + manager_name = ('%s_api' % + manager.__name__.replace('keystone.', ''). + replace('.', '_')) + setattr(self, manager_name, manager.Manager()) def load_fixtures(self, fixtures): diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py index a26d6595..38062d4b 100644 --- a/tests/test_keystoneclient.py +++ b/tests/test_keystoneclient.py @@ -18,7 +18,6 @@ import uuid import webob from keystone import test -from keystone import token from keystone import config from keystone.openstack.common import jsonutils @@ -40,7 +39,6 @@ class CompatTestCase(test.TestCase): # started because the servers use the backends. self.load_backends() - self.token_provider_api = token.provider.Manager() self.load_fixtures(default_fixtures) # TODO(termie): add an admin user to the fixtures and use that user diff --git a/tests/test_token_provider.py b/tests/test_token_provider.py index ac0b0d6b..a7e92717 100644 --- a/tests/test_token_provider.py +++ b/tests/test_token_provider.py @@ -333,7 +333,6 @@ class TestTokenProvider(test.TestCase): def setUp(self): super(TestTokenProvider, self).setUp() self.load_backends() - self.token_provider_api = token.provider.Manager() def test_get_token_version(self): self.assertEqual( diff --git a/tests/test_v3.py b/tests/test_v3.py index 60a52d69..4f00de7d 100644 --- a/tests/test_v3.py +++ b/tests/test_v3.py @@ -5,7 +5,6 @@ from lxml import etree import webtest from keystone import test -from keystone import token from keystone import auth from keystone.common import serializer @@ -45,8 +44,6 @@ class RestfulTestCase(test_content_types.RestfulTestCase): test.setup_test_database() self.load_backends() - self.token_provider_api = token.provider.Manager() - self.public_app = webtest.TestApp( self.loadapp('keystone', name='main')) self.admin_app = webtest.TestApp( |