From fb0bdcd7ce31fecef7a0539cfeb7dbd1e238b2f1 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <pbrady@redhat.com>
Date: Mon, 6 Aug 2012 00:30:05 +0100
Subject: tests: avoid traceback warning in test_live_migration

Change-Id: I959e780e88a31ad8105dc0d8bbb544c8c50f49e5
---
 nova/tests/test_virt_drivers.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py
index fb109731f..d0283c3b0 100644
--- a/nova/tests/test_virt_drivers.py
+++ b/nova/tests/test_virt_drivers.py
@@ -85,9 +85,17 @@ class _FakeDriverBackendTestCase(test.TestCase):
         def fake_extend(image, size):
             pass
 
+        def fake_migrateToURI(*a):
+            pass
+
         self.stubs.Set(nova.virt.libvirt.driver.disk,
                        'extend', fake_extend)
 
+        # Like the existing fakelibvirt.migrateToURI, do nothing,
+        # but don't fail for these tests.
+        self.stubs.Set(nova.virt.libvirt.driver.libvirt.Domain,
+                       'migrateToURI', fake_migrateToURI)
+
     def _teardown_fakelibvirt(self):
         # Restore libvirt
         import nova.virt.libvirt.driver
@@ -466,7 +474,7 @@ class _VirtDriverTestCase(_FakeDriverBackendTestCase):
     def test_live_migration(self):
         instance_ref, network_info = self._get_running_instance()
         self.connection.live_migration(self.ctxt, instance_ref, 'otherhost',
-                                       None, None)
+                                       lambda *a: None, lambda *a: None)
 
     @catch_notimplementederror
     def _check_host_status_fields(self, host_status):
-- 
cgit