From 6166caffe31888ef237874fdcaf088ac4ff8d003 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 11 Jul 2018 17:33:44 +0200 Subject: Clean all possible resources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It checks all openstack resources before cleaning. It allows removing images even if the test fail quickly. Change-Id: I1763b8a70fa7ffeb03c435e8e775c7afd1a7adac Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/cinder/cinder_test.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'functest/opnfv_tests/openstack/cinder') diff --git a/functest/opnfv_tests/openstack/cinder/cinder_test.py b/functest/opnfv_tests/openstack/cinder/cinder_test.py index 7d4b4358b..5354291e6 100644 --- a/functest/opnfv_tests/openstack/cinder/cinder_test.py +++ b/functest/opnfv_tests/openstack/cinder/cinder_test.py @@ -111,9 +111,12 @@ class CinderCheck(singlevm.SingleVm2): def clean(self): assert self.cloud - self.cloud.delete_server( - self.vm2, wait=True, - timeout=getattr(config.CONF, 'vping_vm_delete_timeout')) - self.cloud.delete_floating_ip(self.fip2.id) - self.cloud.delete_volume(self.volume.id) + if self.vm2: + self.cloud.delete_server( + self.vm2, wait=True, + timeout=getattr(config.CONF, 'vping_vm_delete_timeout')) + if self.fip2: + self.cloud.delete_floating_ip(self.fip2.id) + if self.volume: + self.cloud.delete_volume(self.volume.id) super(CinderCheck, self).clean() -- cgit 1.2.3-korg