summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/compute/test_compute.py10
-rw-r--r--nova/tests/test_libvirt.py2
2 files changed, 6 insertions, 6 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 596668048..e1f33ca08 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -2631,8 +2631,6 @@ class ComputeTestCase(BaseTestCase):
'setup_networks_on_host')
self.mox.StubOutWithMock(self.compute.network_api,
'migrate_instance_finish')
- self.mox.StubOutWithMock(self.compute.driver,
- 'post_live_migration_at_destination')
self.mox.StubOutWithMock(self.compute, '_get_power_state')
self.mox.StubOutWithMock(self.compute, '_instance_update')
@@ -2650,10 +2648,12 @@ class ComputeTestCase(BaseTestCase):
self.compute.network_api.migrate_instance_finish(admin_ctxt,
instance, migration)
fake_net_info = []
+ fake_block_dev_info = {'foo': 'bar'}
self.compute.driver.post_live_migration_at_destination(admin_ctxt,
- instance,
- fake_net_info,
- False)
+ instance,
+ fake_net_info,
+ False,
+ fake_block_dev_info)
self.compute._get_power_state(admin_ctxt, instance).AndReturn(
'fake_power_state')
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index c4816d202..f895fde24 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -4581,7 +4581,7 @@ class LibvirtDriverTestCase(test.TestCase):
pass
def fake_to_xml(instance, network_info, image_meta=None, rescue=None,
- block_device_info=None):
+ block_device_info=None, write_to_disk=False):
return ""
def fake_plug_vifs(instance, network_info):