From 4a2845095c0e35336c60836050ca11c71898fb8c Mon Sep 17 00:00:00 2001 From: Andrew Laski Date: Wed, 8 May 2013 10:22:59 -0400 Subject: Fix zookeeper import and tests Import zookeeper.membership rather than zookeeper.membersip. Also fixed some issues with setting up the tests for the zookeeper servicegroup driver. Config options were not being set before initializing the driver leading to failures. There is no added test for this because the bug is indistinguishable from not having the zookeeper python modules installed, which leads to skipping these servicegroup tests. Bug 1177776 Change-Id: Idd6dca2e03169399b930cc1fc1a85636497cb0b5 --- nova/servicegroup/drivers/zk.py | 2 +- nova/tests/servicegroup/test_zk_driver.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nova/servicegroup/drivers/zk.py b/nova/servicegroup/drivers/zk.py index 55a7097b4..d318020ad 100644 --- a/nova/servicegroup/drivers/zk.py +++ b/nova/servicegroup/drivers/zk.py @@ -26,7 +26,7 @@ from nova.openstack.common import loopingcall from nova.servicegroup import api evzookeeper = importutils.try_import('evzookeeper') -membership = importutils.try_import('evzookeeper.membersip') +membership = importutils.try_import('evzookeeper.membership') zookeeper = importutils.try_import('zookeeper') zk_driver_opts = [ diff --git a/nova/tests/servicegroup/test_zk_driver.py b/nova/tests/servicegroup/test_zk_driver.py index cdb919307..eb6ddd4bf 100644 --- a/nova/tests/servicegroup/test_zk_driver.py +++ b/nova/tests/servicegroup/test_zk_driver.py @@ -36,13 +36,13 @@ class ZKServiceGroupTestCase(test.TestCase): def setUp(self): super(ZKServiceGroupTestCase, self).setUp() servicegroup.API._driver = None + from nova.servicegroup.drivers import zk + self.flags(servicegroup_driver='zk') + self.flags(address='localhost:2181', group="zookeeper") try: - from nova.servicegroup.drivers import zk _unused = zk.ZooKeeperDriver() except ImportError: self.skipTest("Unable to test due to lack of ZooKeeper") - self.flags(servicegroup_driver='zk') - self.flags(address='localhost:2181', group="zookeeper") def test_join_leave(self): self.servicegroup_api = servicegroup.API() -- cgit