From d793c7f50ff56a3ecdd6c8862df1ee67ebcc9ac4 Mon Sep 17 00:00:00 2001 From: Priti Sarap Date: Thu, 29 Oct 2015 10:58:15 +0530 Subject: [PATCH] CLOUDSTACK-9005: Modifying tearDown function --- .../testpaths/testpath_snapshot_limits.py | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/test/integration/testpaths/testpath_snapshot_limits.py b/test/integration/testpaths/testpath_snapshot_limits.py index a99f053e66d..855d3a21a13 100644 --- a/test/integration/testpaths/testpath_snapshot_limits.py +++ b/test/integration/testpaths/testpath_snapshot_limits.py @@ -123,24 +123,25 @@ class TestStorageSnapshotsLimits(cloudstackTestCase): "Snapshots are not supported on %s" % self.hypervisor) - def tearDown(self): try: - data_volumes_list = Volume.list( - self.userapiclient, - id=self.data_volume_created.id, - virtualmachineid=self.vm.id - ) - status = validateList(data_volumes_list) - self.assertEqual( - status[0], - PASS, - "DATA Volume List Validation Failed") + if hasattr(self, "data_volume_created"): + data_volumes_list = Volume.list( + self.userapiclient, + id=self.data_volume_created.id, + virtualmachineid=self.vm.id + ) + status = validateList(data_volumes_list) + self.assertEqual( + status[0], + PASS, + "DATA Volume List Validation Failed") - self.vm.detach_volume( - self.userapiclient, - data_volumes_list[0] - ) + if data_volumes_list: + self.vm.detach_volume( + self.userapiclient, + data_volumes_list[0] + ) cleanup_resources(self.apiclient, self.cleanup) except Exception as e: