x/gantt
Code Issues Proposed changes

Flush redis db in setup and teardown of tests.

Browse Source
This commit is contained in:
Joshua McKenty
2010-06-24 04:11:55 +01:00
committed by andy
parent 97571b5afe
commit fbb666eef6
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/test.py
View File

@@ -103,6 +103,9 @@ class BaseTestCase(TrialTestCase):
self._waiting = None self._waiting = None
self._doneWaiting = False self._doneWaiting = False
self._timedOut = False self._timedOut = False
self.flags(redis_db=8)
r = datastore.Redis.instance()
r.flushdb()
self.set_up() self.set_up()
def set_up(self): def set_up(self):
@@ -118,6 +121,8 @@ class BaseTestCase(TrialTestCase):
if FLAGS.fake_rabbit: if FLAGS.fake_rabbit:
fakerabbit.reset_all() fakerabbit.reset_all()
self.tear_down() self.tear_down()
r = datastore.Redis.instance()
r.flushdb()
def _waitForTest(self, timeout=60): def _waitForTest(self, timeout=60):
""" Push the ioloop along to wait for our test to complete. """ """ Push the ioloop along to wait for our test to complete. """

3
nova/tests/cloud_unittest.py
View File

@@ -40,8 +40,7 @@ class CloudTestCase(test.BaseTestCase):
super(CloudTestCase, self).setUp() super(CloudTestCase, self).setUp()
self.flags(fake_libvirt=True, self.flags(fake_libvirt=True,
fake_storage=True, fake_storage=True,
fake_users=True, fake_users=True)
redis_db=8)
self.conn = rpc.Connection.instance() self.conn = rpc.Connection.instance()
logging.getLogger().setLevel(logging.DEBUG) logging.getLogger().setLevel(logging.DEBUG)

3
nova/tests/network_unittest.py
View File

@@ -32,8 +32,7 @@ class NetworkTestCase(test.TrialTestCase):
self.flags(fake_libvirt=True, self.flags(fake_libvirt=True,
fake_storage=True, fake_storage=True,
fake_network=True, fake_network=True,
network_size=32, network_size=32)
redis_db=8)
logging.getLogger().setLevel(logging.DEBUG) logging.getLogger().setLevel(logging.DEBUG)
self.manager = users.UserManager.instance() self.manager = users.UserManager.instance()
try: try:

3
nova/tests/node_unittest.py
View File

@@ -56,8 +56,7 @@ class NodeConnectionTestCase(test.TrialTestCase):
super(NodeConnectionTestCase, self).setUp() super(NodeConnectionTestCase, self).setUp()
self.flags(fake_libvirt=True, self.flags(fake_libvirt=True,
fake_storage=True, fake_storage=True,
fake_users=True, fake_users=True)
redis_db=8)
self.node = node.Node() self.node = node.Node()
def create_instance(self): def create_instance(self):

3
nova/tests/storage_unittest.py
View File

@@ -41,8 +41,7 @@ class StorageTestCase(test.TrialTestCase):
self.mynode = node.Node() self.mynode = node.Node()
self.mystorage = None self.mystorage = None
self.flags(fake_libvirt=True, self.flags(fake_libvirt=True,
fake_storage=True, fake_storage=True)
redis_db=8)
if FLAGS.fake_storage: if FLAGS.fake_storage:
self.mystorage = storage.FakeBlockStore() self.mystorage = storage.FakeBlockStore()
else: else:

3
nova/tests/users_unittest.py
View File

@@ -34,8 +34,7 @@ class UserTestCase(test.BaseTestCase):
def setUp(self): def setUp(self):
super(UserTestCase, self).setUp() super(UserTestCase, self).setUp()
self.flags(fake_libvirt=True, self.flags(fake_libvirt=True,
fake_storage=True, fake_storage=True)
redis_db=8)
self.users = users.UserManager.instance() self.users = users.UserManager.instance()
def test_001_can_create_users(self): def test_001_can_create_users(self):