diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-23 03:34:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-23 03:34:46 +0000 |
| commit | e60656ac352f66cc590d6bf469414a93fb2caf32 (patch) | |
| tree | 0b9b1d475c5f18e1e9085979d1282e4065ee69f1 /tests | |
| parent | 3f51d2addd38c418a55c01ca2f37e8bbe94319b5 (diff) | |
| parent | 2aaa902d6eb16fe9ee2e7bc262c1b29731c03a0c (diff) | |
| download | keystone-e60656ac352f66cc590d6bf469414a93fb2caf32.tar.gz keystone-e60656ac352f66cc590d6bf469414a93fb2caf32.tar.xz keystone-e60656ac352f66cc590d6bf469414a93fb2caf32.zip | |
Merge "Load app before loading legacy client in tests."
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_keystoneclient.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py index 5c0d2f5b..07bcdac4 100644 --- a/tests/test_keystoneclient.py +++ b/tests/test_keystoneclient.py @@ -38,6 +38,9 @@ class CompatTestCase(test.TestCase): def setUp(self): super(CompatTestCase, self).setUp() + self.public_server = self.serveapp('keystone', name='main') + self.admin_server = self.serveapp('keystone', name='admin') + revdir = test.checkout_vendor(*self.get_checkout()) self.add_path(revdir) self.clear_module('keystoneclient') @@ -46,9 +49,6 @@ class CompatTestCase(test.TestCase): self.token_provider_api = token.provider.Manager() self.load_fixtures(default_fixtures) - self.public_server = self.serveapp('keystone', name='main') - self.admin_server = self.serveapp('keystone', name='admin') - # TODO(termie): add an admin user to the fixtures and use that user # override the fixtures, for now self.metadata_foobar = self.identity_api.add_role_to_user_and_project( |