From e8f04abb4418a8b17b15a7b031c76d16fbf03856 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Tue, 23 Jul 2013 14:25:34 -0500 Subject: Load backends before deploy app in client tests The backends should be loaded before the app is deployed for the client tests, otherwise the wrong backends may be loaded when the app is deployed. Part of fix for bug 1204605 Change-Id: I70680c3daea3a863bcbde07b1ee7e062cd150e51 --- tests/test_keystoneclient.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py index 07bcdac4..dc494b3f 100644 --- a/tests/test_keystoneclient.py +++ b/tests/test_keystoneclient.py @@ -38,12 +38,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() @@ -56,6 +52,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() -- cgit