diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-02-02 23:14:29 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-02-08 08:33:09 -0800 |
| commit | 459145e5d520a6ea4095448ad36366ab5d81d8b2 (patch) | |
| tree | 60e60cf0f6e8a630a64103c840aeed604db9ca69 | |
| parent | 27ac9d5f0ca4279753ee2984769094f2b4191619 (diff) | |
Allows test_virt_drivers to work when run alone
* Properly sets fake_resize using a stub in test_libvirt
* Adds a stub for test_virt_drivers
* Fixes typo and misuse of flags in setUp and TearDown
* Fixes bug 925891
Change-Id: I015e942305f6a08941168ca0ccadb2382db064d7
| -rw-r--r-- | nova/tests/test_libvirt.py | 7 | ||||
| -rw-r--r-- | nova/tests/test_virt_drivers.py | 15 |
2 files changed, 12 insertions, 10 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 61d920ff1..4ce882992 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -35,7 +35,6 @@ from nova import utils from nova.api.ec2 import cloud from nova.compute import power_state from nova.compute import vm_states -from nova.virt.disk import api as disk from nova.virt import images from nova.virt import driver from nova.virt.libvirt import connection @@ -216,12 +215,11 @@ class CacheConcurrencyTestCase(test.TestCase): self.stubs.Set(os.path, 'exists', fake_exists) self.stubs.Set(utils, 'execute', fake_execute) + self.stubs.Set(connection.disk, 'extend', fake_extend) connection.libvirt_utils = fake_libvirt_utils - connection.disk.extend = fake_extend def tearDown(self): connection.libvirt_utils = libvirt_utils - connection.disk.extend = disk.extend super(CacheConcurrencyTestCase, self).tearDown() def test_same_fname_concurrency(self): @@ -301,11 +299,10 @@ class LibvirtConnTestCase(test.TestCase): def fake_extend(image, size): pass - connection.disk.extend = fake_extend + self.stubs.Set(connection.disk, 'extend', fake_extend) def tearDown(self): connection.libvirt_utils = libvirt_utils - connection.disk.extend = disk.extend super(LibvirtConnTestCase, self).tearDown() test_instance = {'memory_kb': '1024000', diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py index 43dde697d..58d295a6f 100644 --- a/nova/tests/test_virt_drivers.py +++ b/nova/tests/test_virt_drivers.py @@ -444,13 +444,17 @@ class LibvirtConnTestCase(_VirtDriverTestCase): self.driver_module = nova.virt.libvirt.connection FLAGS.firewall_driver = nova.virt.libvirt.firewall.drivers[0] super(LibvirtConnTestCase, self).setUp() - FLAGS.rescue_image_id = "2" - FLAGS.rescue_kernel_id = "3" - FLAGS.rescue_ramdisk_id = None + self.flags(rescue_image_id="2", + rescue_kernel_id="3", + rescue_ramdisk_id=None) - def tearDown(self): - super(LibvirtConnTestCase, self).tearDown() + def fake_extend(image, size): + pass + + self.stubs.Set(nova.virt.libvirt.connection.disk, + 'extend', fake_extend) + def tearDown(self): # Restore libvirt import nova.virt.libvirt.connection import nova.virt.libvirt.firewall @@ -459,3 +463,4 @@ class LibvirtConnTestCase(_VirtDriverTestCase): nova.virt.libvirt.connection.libvirt = self.saved_libvirt nova.virt.libvirt.connection.libvirt_utils = self.saved_libvirt nova.virt.libvirt.firewall.libvirt = self.saved_libvirt + super(LibvirtConnTestCase, self).tearDown() |