Adds missing image_meta to rescue's spawn() calls.
Change-Id: Id769c217611011d77abafa529c306f780475aaf4
This commit is contained in:
parent
9b000b25d3
commit
ca31164945
@ -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)
|
||||
|
@ -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()
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user