diff options
| author | Arata Notsu <notsu@virtualtech.jp> | 2012-08-19 11:31:15 +0900 |
|---|---|---|
| committer | Arata Notsu <notsu@virtualtech.jp> | 2012-08-22 12:12:51 +0900 |
| commit | ecaa93f9b051d806edc7b48e67eee638bf8e70cc (patch) | |
| tree | 7134fdfea52f002b80013b2e09008232a72b5e9c | |
| parent | 962efab370f168bb077447eeb15d43063c8b2272 (diff) | |
| download | nova-ecaa93f9b051d806edc7b48e67eee638bf8e70cc.tar.gz nova-ecaa93f9b051d806edc7b48e67eee638bf8e70cc.tar.xz nova-ecaa93f9b051d806edc7b48e67eee638bf8e70cc.zip | |
Restore imagebackend in test_virt_drivers.py
In the test, nova.virt.libvirt.driver.imagebackend is replaced with
fake_imagebackend at setUp(). But is not restored at tearDown(). It
potentially causes failure in other tests expecting imagebackend is
unchanged. Example: test_libvirt.py:test_pre_block_migration_works_correctly.
However it runs without failure since luckily it comes before
test_virt_drivers.py.
Change-Id: I9b61c6c065567472b64bfa363af8f3ba9a502dd2
| -rw-r--r-- | nova/tests/test_virt_drivers.py | 2 |
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 |