diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-02 19:42:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-02 19:42:14 +0000 |
| commit | f73cb512a7291cde546a13f57be0b1e6138fe5a3 (patch) | |
| tree | f34a57bd3a233afc3cdd78e1f467425043ce9df3 | |
| parent | 60e98a12cbee0b9fb8aa91a08e7f3a11fd4182e7 (diff) | |
| parent | b793d2ff1f38ca46994825918500d8f75521d9d2 (diff) | |
| download | keystone-f73cb512a7291cde546a13f57be0b1e6138fe5a3.tar.gz keystone-f73cb512a7291cde546a13f57be0b1e6138fe5a3.tar.xz keystone-f73cb512a7291cde546a13f57be0b1e6138fe5a3.zip | |
Merge "Clean up use of token_provider manager in tests"
| -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 5d1ad505..9118b2ea 100644 --- a/keystone/test.py +++ b/keystone/test.py @@ -272,7 +272,12 @@ class TestCase(NoModule, unittest.TestCase): # identity driver. for manager in [identity, assignment, catalog, credential, ec2, 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()) dependency.resolve_future_dependencies() 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( |