summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/test_keystoneclient.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index ecab6a01..a26d6595 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -36,12 +36,8 @@ 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')
+ # The backends should be loaded and initialized before the servers are
+ # started because the servers use the backends.
self.load_backends()
self.token_provider_api = token.provider.Manager()
@@ -54,6 +50,13 @@ class CompatTestCase(test.TestCase):
self.tenant_bar['id'],
self.role_admin['id'])
+ 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')
+
def tearDown(self):
self.public_server.kill()
self.admin_server.kill()