diff options
| author | Diana Clarke <diana.joan.clarke@gmail.com> | 2016-10-06 21:52:03 -0400 |
|---|---|---|
| committer | Daniel Pawlik <daniel.pawlik@corp.ovh.com> | 2017-12-20 09:58:08 +0000 |
| commit | d67cfbc8ca60c7820883daa2d0917dedc0958d65 (patch) | |
| tree | bf56928da1435851d2e7c091cf9f9ac8036e4dfe | |
| parent | e4e7b8da563e1fe4c2713dad55788f5ba3a86057 (diff) | |
| download | nova-d67cfbc8ca60c7820883daa2d0917dedc0958d65.tar.gz | |
Patch mkisofs calls
The nova unit tests recently started to fail on systems lacking mkisofs
(like mac osx). Skip these mkisofs calls by patching _make_iso9660.
Change-Id: I350aafa878616f74df506c1bc9ee5f26ea06fe97
Closes-Bug: #1630420
(cherry picked from commit b90df7c9c7042d2a8f104f66220f81ecb2951597)
| -rw-r--r-- | nova/tests/unit/virt/libvirt/test_driver.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index adc2ac30d0..467c862d41 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -10212,11 +10212,12 @@ class LibvirtConnTestCase(test.NoDBTestCase): '_create_domain_and_network') @mock.patch.object(libvirt_driver.LibvirtDriver, 'get_info') # Methods called by _create_configdrive via post_xml_callback + @mock.patch('nova.virt.configdrive.ConfigDriveBuilder._make_iso9660') @mock.patch.object(libvirt_driver.LibvirtDriver, '_build_device_metadata') @mock.patch.object(instance_metadata, 'InstanceMetadata') def test_spawn_with_config_drive(self, mock_instance_metadata, mock_build_device_metadata, - mock_get_info, + mock_mkisofs, mock_get_info, mock_create_domain_and_network, mock_get_guest_xml): drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) @@ -17052,7 +17053,8 @@ class LibvirtDriverTestCase(test.NoDBTestCase): self.assertEqual(expected_kernel_ramdisk_paths, kernel_ramdisk_paths) - def test_rescue_config_drive(self): + @mock.patch('nova.virt.configdrive.ConfigDriveBuilder._make_iso9660') + def test_rescue_config_drive(self, mock_mkisofs): instance = self._create_instance({'config_drive': str(True)}) backend, doc = self._test_rescue( instance, exists=lambda name: name != 'disk.config.rescue') |