From ca311649451b60e3cb0f3f47807067c91fd44e97 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Wed, 30 Nov 2011 16:21:12 -0600
Subject: [PATCH] Adds missing image_meta to rescue's spawn() calls.

Change-Id: Id769c217611011d77abafa529c306f780475aaf4
---
 nova/tests/test_compute.py | 2 +-
 nova/tests/test_xenapi.py  | 2 +-
 nova/tests/xenapi/stubs.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 64429c29f..0b1879ed1 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -255,7 +255,7 @@ class ComputeTestCase(BaseTestCase):
         called = {'rescued': False,
                   'unrescued': False}
 
-        def fake_rescue(self, context, instance_ref, network_info):
+        def fake_rescue(self, context, instance_ref, network_info, image_meta):
             called['rescued'] = True
 
         self.stubs.Set(nova.virt.fake.FakeConnection, 'rescue', fake_rescue)
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index afa9e462f..906f176fd 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -641,7 +641,7 @@ class XenAPIVMTestCase(test.TestCase):
     def test_rescue(self):
         instance = self._create_instance()
         conn = xenapi_conn.get_connection(False)
-        conn.rescue(self.context, instance, [])
+        conn.rescue(self.context, instance, [], None)
 
     def test_unrescue(self):
         instance = self._create_instance()
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 96c4d9cbe..84d0cb878 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -207,7 +207,7 @@ def stub_out_vm_methods(stubs):
     def fake_release_bootlock(self, vm):
         pass
 
-    def fake_spawn_rescue(self, context, inst, network_info):
+    def fake_spawn_rescue(self, context, inst, network_info, image_meta):
         inst._rescue = False
 
     stubs.Set(vmops.VMOps, "_shutdown", fake_shutdown)