diff options
| author | Joshua McKenty <jmckenty@gmail.com> | 2010-06-24 04:11:55 +0100 |
|---|---|---|
| committer | andy <github@anarkystic.com> | 2010-06-24 04:11:55 +0100 |
| commit | 347eebe09199c70b93e07e8cf8c9344846e2fe00 (patch) | |
| tree | 0af9780b9eb9308175fd922afeb5be72ed3e8ccf | |
| parent | 4a273bbbff2aaad5c83f9cb65bbab2c89fd643e4 (diff) | |
| download | nova-347eebe09199c70b93e07e8cf8c9344846e2fe00.tar.gz nova-347eebe09199c70b93e07e8cf8c9344846e2fe00.tar.xz nova-347eebe09199c70b93e07e8cf8c9344846e2fe00.zip | |
Flush redis db in setup and teardown of tests.
| -rw-r--r-- | nova/test.py | 5 | ||||
| -rw-r--r-- | nova/tests/cloud_unittest.py | 3 | ||||
| -rw-r--r-- | nova/tests/network_unittest.py | 3 | ||||
| -rw-r--r-- | nova/tests/node_unittest.py | 3 | ||||
| -rw-r--r-- | nova/tests/storage_unittest.py | 3 | ||||
| -rw-r--r-- | nova/tests/users_unittest.py | 3 |
6 files changed, 10 insertions, 10 deletions
diff --git a/nova/test.py b/nova/test.py index 610ad89aa..8cf60af70 100644 --- a/nova/test.py +++ b/nova/test.py @@ -103,6 +103,9 @@ class BaseTestCase(TrialTestCase): self._waiting = None self._doneWaiting = False self._timedOut = False + self.flags(redis_db=8) + r = datastore.Redis.instance() + r.flushdb() self.set_up() def set_up(self): @@ -118,6 +121,8 @@ class BaseTestCase(TrialTestCase): if FLAGS.fake_rabbit: fakerabbit.reset_all() self.tear_down() + r = datastore.Redis.instance() + r.flushdb() def _waitForTest(self, timeout=60): """ Push the ioloop along to wait for our test to complete. """ diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py index 40eeb8a23..24472451f 100644 --- a/nova/tests/cloud_unittest.py +++ b/nova/tests/cloud_unittest.py @@ -40,8 +40,7 @@ class CloudTestCase(test.BaseTestCase): super(CloudTestCase, self).setUp() self.flags(fake_libvirt=True, fake_storage=True, - fake_users=True, - redis_db=8) + fake_users=True) self.conn = rpc.Connection.instance() logging.getLogger().setLevel(logging.DEBUG) diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index a2ad89a32..a5d80875d 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -32,8 +32,7 @@ class NetworkTestCase(test.TrialTestCase): self.flags(fake_libvirt=True, fake_storage=True, fake_network=True, - network_size=32, - redis_db=8) + network_size=32) logging.getLogger().setLevel(logging.DEBUG) self.manager = users.UserManager.instance() try: diff --git a/nova/tests/node_unittest.py b/nova/tests/node_unittest.py index 5ecd56d52..3807beeb1 100644 --- a/nova/tests/node_unittest.py +++ b/nova/tests/node_unittest.py @@ -56,8 +56,7 @@ class NodeConnectionTestCase(test.TrialTestCase): super(NodeConnectionTestCase, self).setUp() self.flags(fake_libvirt=True, fake_storage=True, - fake_users=True, - redis_db=8) + fake_users=True) self.node = node.Node() def create_instance(self): diff --git a/nova/tests/storage_unittest.py b/nova/tests/storage_unittest.py index cbfedbfc1..84f3126c0 100644 --- a/nova/tests/storage_unittest.py +++ b/nova/tests/storage_unittest.py @@ -41,8 +41,7 @@ class StorageTestCase(test.TrialTestCase): self.mynode = node.Node() self.mystorage = None self.flags(fake_libvirt=True, - fake_storage=True, - redis_db=8) + fake_storage=True) if FLAGS.fake_storage: self.mystorage = storage.FakeBlockStore() else: diff --git a/nova/tests/users_unittest.py b/nova/tests/users_unittest.py index a226de455..b87faec9e 100644 --- a/nova/tests/users_unittest.py +++ b/nova/tests/users_unittest.py @@ -34,8 +34,7 @@ class UserTestCase(test.BaseTestCase): def setUp(self): super(UserTestCase, self).setUp() self.flags(fake_libvirt=True, - fake_storage=True, - redis_db=8) + fake_storage=True) self.users = users.UserManager.instance() def test_001_can_create_users(self): |