From: Steven Hardy <shardy@redhat.com>
Date: Mon, 18 Feb 2013 19:40:09 +0000 (+0000)
Subject: make stack_delete_after decorator tolerate deleted stacks
X-Git-Tag: 2014.1~888
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fd85eb5f441fa3937051faa33f6b9519a648c355;p=openstack-build%2Fheat-build.git

make stack_delete_after decorator tolerate deleted stacks

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
---

diff --git a/heat/tests/utils.py b/heat/tests/utils.py
index b2a70556..fa5c7d4f 100644
--- a/heat/tests/utils.py
+++ b/heat/tests/utils.py
@@ -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