]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
make stack_delete_after decorator tolerate deleted stacks
authorSteven Hardy <shardy@redhat.com>
Mon, 18 Feb 2013 19:40:09 +0000 (19:40 +0000)
committerSteven Hardy <shardy@redhat.com>
Tue, 19 Feb 2013 10:44:11 +0000 (10:44 +0000)
Make the stack_delete_after decorator try/except so it doesn't cause a
test failure if the test has already done a delete during the test

Change-Id: I4a5e096478ece0de02cc910366a5d361d5ee45e0

heat/tests/utils.py

index b2a705569eb9854e7f8f935513b21eb78b5fd778..fa5c7d4fa0f66bc673a3237872f39d40c1c65972 100644 (file)
@@ -74,6 +74,9 @@ def stack_delete_after(test_fn):
         try:
             test_fn(test_cls)
         finally:
-            test_cls.stack.delete()
+            try:
+                test_cls.stack.delete()
+            except AttributeError:
+                print "Could not delete stack (already deleted?)"
         print "Exited", test_fn.__name__
     return wrapped_test