openstack
/
fuel-ostf
Code Issues Proposed changes

Merge "Add error catching to the cleanup method for Heat tests"

This commit is contained in:
Jenkins 2015-06-11 15:27:08 +00:00 committed by Gerrit Code Review
parent 6b1aadef38 7d0cc3920a
commit 833d2b22dd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuel_health/heatmanager.py
View File

@ -89,7 +89,11 @@ class HeatBaseTest(fuel_health.nmanager.NovaNetworkScenarioTest):
stack = self._find_stack(self.heat_client, 'stack_name', stack_name)
if stack is None:
return
self.heat_client.stacks.delete(stack.id)
try:
self.heat_client.stacks.delete(stack.id)
except Exception:
LOG.debug(traceback.format_exc())
self.fail("Cleanup: Failed to delete stack '%s'" % stack_name)
self._wait_for_stack_deleted(stack.id)
LOG.debug("Resource '%s' has been deleted." % stack_name)

2
fuel_health/tests/platform_tests/test_heat.py
View File

@ -284,7 +284,7 @@ class HeatSmokeTests(heatmanager.HeatBaseTest):
11. Wait for the stack status to change to 'UPDATE_COMPLETE'.
12. Check that there are only two newly created stack instances.
13. Delete the stack.
15. Wait for the stack to be deleted.
14. Wait for the stack to be deleted.
Duration: 900 s.
"""
self.check_image_exists()