From b90df7c9c7042d2a8f104f66220f81ecb2951597 Mon Sep 17 00:00:00 2001 From: Diana Clarke Date: Thu, 6 Oct 2016 21:52:03 -0400 Subject: [PATCH] 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 --- nova/tests/unit/virt/libvirt/test_driver.py | 6 ++++-- 1 file 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 0ad7734fc936..47bdf3895e23 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -10114,11 +10114,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) @@ -16421,7 +16422,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')