summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-22 21:38:33 +0000
committerGerrit Code Review <review@openstack.org>2012-08-22 21:38:33 +0000
commit007054f2aae1954b1fb657b1c6eedffd6225e4ab (patch)
treeeb51934265b33ed17146d37396df3cb1fa11cbd1
parentd1123ef9c9402a03d979fd28edb131ab22928289 (diff)
parentecaa93f9b051d806edc7b48e67eee638bf8e70cc (diff)
Merge "Restore imagebackend in test_virt_drivers.py"
-rw-r--r--nova/tests/test_virt_drivers.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py
index 276c1b5d4..e23514a44 100644
--- a/nova/tests/test_virt_drivers.py
+++ b/nova/tests/test_virt_drivers.py
@@ -71,6 +71,7 @@ class _FakeDriverBackendTestCase(test.TestCase):
import nova.virt.libvirt.driver
import nova.virt.libvirt.firewall
+ self.saved_libvirt_imagebackend = nova.virt.libvirt.driver.imagebackend
nova.virt.libvirt.driver.imagebackend = fake_imagebackend
nova.virt.libvirt.driver.libvirt = fakelibvirt
nova.virt.libvirt.driver.libvirt_utils = fake_libvirt_utils
@@ -108,6 +109,7 @@ class _FakeDriverBackendTestCase(test.TestCase):
# Restore libvirt
import nova.virt.libvirt.driver
import nova.virt.libvirt.firewall
+ nova.virt.libvirt.driver.imagebackend = self.saved_libvirt_imagebackend
if self.saved_libvirt:
sys.modules['libvirt'] = self.saved_libvirt
nova.virt.libvirt.driver.libvirt = self.saved_libvirt