x/gantt
Code Issues Proposed changes

Adds missing image_meta to rescue's spawn() calls.

Browse Source 
Change-Id: Id769c217611011d77abafa529c306f780475aaf4
This commit is contained in:
Josh Kearney 2011-11-30 16:21:12 -06:00
parent 9b000b25d3
commit ca31164945
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/test_compute.py
View File

@ -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)

2
nova/tests/test_xenapi.py
View File

@ -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()

2
nova/tests/xenapi/stubs.py
View File

@ -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)