From dc22b4e440058cff20e244e74b6404d5336ad2c2 Mon Sep 17 00:00:00 2001 From: Johannes Erdfelt Date: Wed, 30 May 2012 18:46:31 +0000 Subject: [PATCH] Make xenapi fake match real xenapi a bit closer xenstore_data is a dictionary in the real xenapi and keys get deleted from xenstore_data and other_config when removing them instead of being set to None. Change-Id: I462b04b6e1dc5ad4abf05cc50538121811c2334e --- nova/tests/test_xenapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index b2a15c10..1e2ef964 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -449,7 +449,7 @@ class XenAPIVMTestCase(test.TestCase): # If the cache is turned on then the base disk will be # there even after the cleanup if 'other_config' in vdi_rec: - if vdi_rec['other_config']['image-id'] is None: + if 'image-id' not in vdi_rec['other_config']: self.fail('Found unexpected VDI:%s' % vdi_ref) else: self.fail('Found unexpected VDI:%s' % vdi_ref)