commit d2dd5d16753d36791a884b0b55b639b6e9516f63
author Jenkins <jenkins@review.openstack.org> Fri Dec 23 20:10:41 2016 +0000
committer Gerrit Code Review <review@openstack.org> Fri Dec 23 20:10:41 2016 +0000
tree 0dd7db458b26e5ab6b3560b01523f672fa376ccb
parent 84df94bd1f3d5403588d342a6057dfe8373440fd
parent 90c06a1fce8b8a846ea2404bbc075072af31721d

Merge "Use call_and_ignore_notfound_exc method"

tempest/api/volume/base.py

diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py
index 9f522bd..a2b9964 100644
--- a/tempest/api/volume/base.py
+++ b/tempest/api/volume/base.py
@@ -200,16 +200,13 @@
     @classmethod
     def clear_snapshots(cls):
         for snapshot in cls.snapshots:
-            try:
-                cls.snapshots_client.delete_snapshot(snapshot['id'])
-            except Exception:
-                pass
+            test_utils.call_and_ignore_notfound_exc(
+                cls.snapshots_client.delete_snapshot, snapshot['id'])
 
         for snapshot in cls.snapshots:
-            try:
-                cls.snapshots_client.wait_for_resource_deletion(snapshot['id'])
-            except Exception:
-                pass
+            test_utils.call_and_ignore_notfound_exc(
+                cls.snapshots_client.wait_for_resource_deletion,
+                snapshot['id'])
 
     def create_server(self, **kwargs):
         name = kwargs.pop(