diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-10-12 20:13:06 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-10-12 20:13:06 -0700 |
| commit | d533d6414041437e642f2bbfbc7a86daa2527a65 (patch) | |
| tree | 0624f65037003073cdf4eac43045844af7885635 | |
| parent | b9dc877303c13d43fb6b3e1105e9c0bd7161219d (diff) | |
| download | nova-d533d6414041437e642f2bbfbc7a86daa2527a65.tar.gz nova-d533d6414041437e642f2bbfbc7a86daa2527a65.tar.xz nova-d533d6414041437e642f2bbfbc7a86daa2527a65.zip | |
cleanup leftover addresses
| -rw-r--r-- | nova/test.py | 4 | ||||
| -rw-r--r-- | nova/tests/cloud_unittest.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nova/test.py b/nova/test.py index 5cf2abd53..f6485377d 100644 --- a/nova/test.py +++ b/nova/test.py @@ -24,6 +24,7 @@ and some black magic for inline callbacks. import sys import time +import datetime import mox import stubout @@ -62,6 +63,7 @@ class TrialTestCase(unittest.TestCase): # NOTE(vish): We need a better method for creating fixtures for tests # now that we have some required db setup for the system # to work properly. + self.start = datetime.datetime.utcnow() if db.network_count(None) != 5: network_manager.VlanManager().create_networks(None, FLAGS.fixed_range, @@ -84,6 +86,8 @@ class TrialTestCase(unittest.TestCase): self.stubs.UnsetAll() self.stubs.SmartUnsetAll() self.mox.VerifyAll() + # NOTE(vish): Clean up any ips associated during the test. + db.fixed_ip_disassociate_all_by_timeout(None, FLAGS.host, self.start) db.network_disassociate_all(None) rpc.Consumer.attach_to_twisted = self.originalAttach for x in self.injected: diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py index 8e5881edb..a880237f2 100644 --- a/nova/tests/cloud_unittest.py +++ b/nova/tests/cloud_unittest.py @@ -64,12 +64,12 @@ class CloudTestCase(test.TrialTestCase): self.cloud = cloud.CloudController() # set up a service - self.compute = utils.import_class(FLAGS.compute_manager)() + self.compute = utils.import_object(FLAGS.compute_manager) self.compute_consumer = rpc.AdapterConsumer(connection=self.conn, topic=FLAGS.compute_topic, proxy=self.compute) self.compute_consumer.attach_to_eventlet() - self.network = utils.import_class(FLAGS.network_manager)() + self.network = utils.import_object(FLAGS.network_manager) self.network_consumer = rpc.AdapterConsumer(connection=self.conn, topic=FLAGS.network_topic, proxy=self.network) |