From 45f9c298c2a6ba3b182ce3c225d09a0bfcb7dd2d Mon Sep 17 00:00:00 2001 From: Johannes Erdfelt Date: Mon, 2 Jul 2012 20:48:30 +0000 Subject: Properly track VBD and VDI connections in xenapi fake The fake xenapi module correctly destroys VBDs when destroying a VM but it won't destroy VBDs when destroying a VDI. If an exception occurs during a spawn when running test_xenapi, then another exception can occur which obscures the original (and likely more important) exception. This can make troubleshooting test suite failures more difficult. Change-Id: I19aad7f39b0707893a04784faef90815f7b0effb --- nova/tests/xenapi/stubs.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py index 275e3ce63..1b9366761 100644 --- a/nova/tests/xenapi/stubs.py +++ b/nova/tests/xenapi/stubs.py @@ -211,12 +211,6 @@ class FakeSessionForVMTests(fake.SessionBase): template_vbd_ref = fake.create_vbd(template_vm_ref, template_vdi_ref) return template_vm_ref - def VDI_destroy(self, session_ref, vdi_ref): - fake.destroy_vdi(vdi_ref) - - def VM_destroy(self, session_ref, vm_ref): - fake.destroy_vm(vm_ref) - def SR_scan(self, session_ref, sr_ref): pass -- cgit