diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-24 23:29:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-24 23:29:55 +0000 |
| commit | 68579d2c8d46ff59d24c8f65b1df3f63c7079792 (patch) | |
| tree | 6688b658ff70442b101b1ccc7ce8396ee2acae8e /nova/tests | |
| parent | de31cdf0a5fbebc18f92872042241284c95d4942 (diff) | |
| parent | 8c53d87ad98f9b7a3ed6d4c83a6f0f62969fa64c (diff) | |
Merge "Import and convert to oslo loopingcall."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_libvirt.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 386476cd2..a955d2f38 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -42,6 +42,7 @@ from nova import exception from nova.openstack.common import fileutils from nova.openstack.common import importutils from nova.openstack.common import jsonutils +from nova.openstack.common import loopingcall from nova.openstack.common import uuidutils from nova import test from nova.tests import fake_libvirt_utils @@ -4848,7 +4849,7 @@ class LibvirtDriverTestCase(test.TestCase): 'uuid': 'not_found_uuid'}) # instance is running case - self.assertRaises(utils.LoopingCallDone, + self.assertRaises(loopingcall.LoopingCallDone, self.libvirtconnection._wait_for_running, {'name': 'running', 'uuid': 'running_uuid'}) @@ -4988,7 +4989,7 @@ class LibvirtDriverTestCase(test.TestCase): self.stubs.Set(self.libvirtconnection, 'to_xml', lambda *a, **k: None) self.stubs.Set(self.libvirtconnection, '_create_domain_and_network', lambda *a: None) - self.stubs.Set(utils, 'FixedIntervalLoopingCall', + self.stubs.Set(loopingcall, 'FixedIntervalLoopingCall', lambda *a, **k: FakeLoopingCall()) libvirt_utils.get_instance_path({}).AndReturn('/fake/foo') |