Merge "XenAPI: Fix race-condition with cached images."

This commit is contained in:
Jenkins
2012-08-01 15:49:59 +00:00
committed by Gerrit Code Review

View File

@@ -288,6 +288,15 @@ class XenAPIVMTestCase(stubs.XenAPITestBase):
self.stubs.Set(vmops.VMOps, 'inject_instance_metadata', self.stubs.Set(vmops.VMOps, 'inject_instance_metadata',
fake_inject_instance_metadata) fake_inject_instance_metadata)
def fake_safe_copy_vdi(session, sr_ref, instance, vdi_to_copy_ref):
name_label = "fakenamelabel"
disk_type = "fakedisktype"
virtual_size = 777
return vm_utils.create_vdi(
session, sr_ref, instance, name_label, disk_type,
virtual_size)
self.stubs.Set(vm_utils, '_safe_copy_vdi', fake_safe_copy_vdi)
def tearDown(self): def tearDown(self):
super(XenAPIVMTestCase, self).tearDown() super(XenAPIVMTestCase, self).tearDown()
fake_image.FakeImageService_reset() fake_image.FakeImageService_reset()