diff options
Diffstat (limited to 'nova/tests/unit/virt/libvirt')
| -rw-r--r-- | nova/tests/unit/virt/libvirt/test_driver.py | 7 | ||||
| -rw-r--r-- | nova/tests/unit/virt/libvirt/test_guest.py | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index e5c85a54aa..06ecc41185 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -7450,7 +7450,8 @@ class LibvirtConnTestCase(test.NoDBTestCase, mock_dom = mock.MagicMock() # Second time don't return anything about disk vdc so it looks removed - return_list = [mock_xml_with_disk, mock_xml_without_disk] + return_list = [mock_xml_with_disk, mock_xml_without_disk, + mock_xml_without_disk] # Doubling the size of return list because we test with two guest power # states mock_dom.XMLDesc.side_effect = return_list + return_list @@ -18950,7 +18951,7 @@ class LibvirtDriverTestCase(test.NoDBTestCase): # DeviceNotFound get_interface_calls = [expected_cfg, None] else: - get_interface_calls = [expected_cfg, expected_cfg, None] + get_interface_calls = [expected_cfg, expected_cfg, None, None] with test.nested( mock.patch.object(host.Host, 'get_guest', return_value=guest), @@ -19087,7 +19088,7 @@ class LibvirtDriverTestCase(test.NoDBTestCase): domain.detachDeviceFlags(expected.to_xml(), flags=expected_flags) self.mox.ReplayAll() with mock.patch.object(libvirt_guest.Guest, 'get_interface_by_cfg', - side_effect=[expected, expected, None]): + side_effect=[expected, expected, None, None]): self.drvr.detach_interface(self.context, instance, network_info[0]) self.mox.VerifyAll() diff --git a/nova/tests/unit/virt/libvirt/test_guest.py b/nova/tests/unit/virt/libvirt/test_guest.py index 7c61334a5a..70299dfe1e 100644 --- a/nova/tests/unit/virt/libvirt/test_guest.py +++ b/nova/tests/unit/virt/libvirt/test_guest.py @@ -228,7 +228,7 @@ class GuestTestCase(test.NoDBTestCase): conf = mock.Mock(spec=vconfig.LibvirtConfigGuestDevice) conf.to_xml.return_value = "</xml>" get_config = mock.Mock() - get_config.side_effect = [conf, conf, None] + get_config.side_effect = [conf, conf, conf, None, None] dev_path = "/dev/vdb" self.domain.isPersistent.return_value = False retry_detach = self.guest.detach_device_with_retry( @@ -244,7 +244,7 @@ class GuestTestCase(test.NoDBTestCase): conf.to_xml.return_value = "</xml>" get_config = mock.Mock() # Force multiple retries of detach - get_config.side_effect = [conf, conf, conf, None] + get_config.side_effect = [conf, conf, conf, conf, conf, None, None] dev_path = "/dev/vdb" self.domain.isPersistent.return_value = True @@ -356,7 +356,7 @@ class GuestTestCase(test.NoDBTestCase): get_config = mock.Mock() # Simulate the persistent domain attach attempt followed by the live # domain attach attempt and success - get_config.side_effect = [conf, conf, None] + get_config.side_effect = [conf, conf, conf, None, None] fake_device = "vdb" fake_exc = fakelibvirt.make_libvirtError( fakelibvirt.libvirtError, "", |