Merge pull request apache#1000 from pritisarap12/CLOUDSTACK-9005-Modifying-tearDown-function

remibergsma · remibergsma · commit a4d0af21331a · 2016-01-17T13:38:40.000+01:00
CLOUDSTACK-9005: Modifying tearDown functionModifying tearDown function to check if data volume is in detached state before deleting the volume

* pr/1000:
  CLOUDSTACK-9005: Modifying tearDown function

Signed-off-by: Remi Bergsma &lt;github@remi.nl&gt;
diff --git a/test/integration/testpaths/testpath_snapshot_limits.py b/test/integration/testpaths/testpath_snapshot_limits.py
@@ -123,24 +123,25 @@ def setUp(self):
                 "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")
-
-            self.vm.detach_volume(
-                self.userapiclient,
-                data_volumes_list[0]
-            )
+            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")
+
+            if data_volumes_list:
+                self.vm.detach_volume(
+                    self.userapiclient,
+                    data_volumes_list[0]
+                )
 
             cleanup_resources(self.apiclient, self.cleanup)
         except Exception as e:
