diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-31 08:25:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-31 08:25:51 +0000 |
| commit | f1ac78c8992432e5f6d5c29f24f202870cb14a97 (patch) | |
| tree | 37f709125bbece026bdabfdf335432e8a401acf9 | |
| parent | d0d9d97ad166d9c57ab0ee494600c50a704a781b (diff) | |
| parent | e8f04abb4418a8b17b15a7b031c76d16fbf03856 (diff) | |
| download | keystone-f1ac78c8992432e5f6d5c29f24f202870cb14a97.tar.gz keystone-f1ac78c8992432e5f6d5c29f24f202870cb14a97.tar.xz keystone-f1ac78c8992432e5f6d5c29f24f202870cb14a97.zip | |
Merge "Load backends before deploy app in client tests"
| -rw-r--r-- | tests/test_keystoneclient.py | 15 |
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() |