From 1ce6105b3c1cf7ecd911682e874519c1eab85166 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 3 Jan 2013 14:36:53 +0000 Subject: [PATCH] heat tests : functional tests remove erroneous finally clause Some tests have had a finally clause added which means they delete the stack before doing any tests, even when it is created successfully. Doh! Change-Id: I7cefd313b9f810067304fe19f58a038226555b86 Signed-off-by: Steven Hardy --- heat/tests/functional/test_CFN_API_Actions.py | 4 +++- heat/tests/functional/test_CFN_API_Actions_Boto.py | 4 +++- heat/tests/functional/test_CFN_API_UpdateStack.py | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/heat/tests/functional/test_CFN_API_Actions.py b/heat/tests/functional/test_CFN_API_Actions.py index 75ce1802..6c0b9d8c 100644 --- a/heat/tests/functional/test_CFN_API_Actions.py +++ b/heat/tests/functional/test_CFN_API_Actions.py @@ -86,8 +86,10 @@ class CfnApiFunctionalTest(unittest.TestCase): # Match the expected format for an instance's physical resource ID cls.phys_res_id_re = re.compile( "^[0-9a-z]*-[0-9a-z]*-[0-9a-z]*-[0-9a-z]*-[0-9a-z]*$") - finally: + except Exception as ex: + print "setupAll failed : %s" % ex cls.stack.cleanup() + raise @classmethod def teardownAll(cls): diff --git a/heat/tests/functional/test_CFN_API_Actions_Boto.py b/heat/tests/functional/test_CFN_API_Actions_Boto.py index c51906f1..165c1948 100644 --- a/heat/tests/functional/test_CFN_API_Actions_Boto.py +++ b/heat/tests/functional/test_CFN_API_Actions_Boto.py @@ -88,8 +88,10 @@ class CfnApiBotoFunctionalTest(unittest.TestCase): # Match the expected format for an instance's physical resource ID cls.phys_res_id_re = re.compile( "^[0-9a-z]*-[0-9a-z]*-[0-9a-z]*-[0-9a-z]*-[0-9a-z]*$") - finally: + except Exception as ex: + print "setupAll failed : %s" % ex cls.stack.cleanup() + raise @classmethod def teardownAll(cls): diff --git a/heat/tests/functional/test_CFN_API_UpdateStack.py b/heat/tests/functional/test_CFN_API_UpdateStack.py index b207fda8..fac22168 100644 --- a/heat/tests/functional/test_CFN_API_UpdateStack.py +++ b/heat/tests/functional/test_CFN_API_UpdateStack.py @@ -63,8 +63,10 @@ class CfnApiUpdateStackFunctionalTest(unittest.TestCase): cls.WikiDatabase.wait_for_provisioning() cls.logical_resource_status = "CREATE_COMPLETE" cls.stack_status = "CREATE_COMPLETE" - finally: + except Exception as ex: + print "setupAll failed : %s" % ex cls.stack.cleanup() + raise @classmethod def teardownAll(cls): -- 2.45.2