From 8372547c310b9d3a78f54631d669f7a4b538f4b8 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Wed, 14 Apr 2021 14:54:35 +0200 Subject: [PATCH] Waiting for stack deleted completely at fault tests cleanup Change-Id: Ib6675c04b20692ec6dbd0544f3d409d48eebeec4 --- tobiko/openstack/heat/_stack.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tobiko/openstack/heat/_stack.py b/tobiko/openstack/heat/_stack.py index 3fba9275b..7ce3c1b38 100644 --- a/tobiko/openstack/heat/_stack.py +++ b/tobiko/openstack/heat/_stack.py @@ -218,7 +218,7 @@ class HeatStackFixture(tobiko.SharedFixture): def cleanup_stack(self): self.delete_stack() if self.stack: - self.wait_for_delete_complete() + self.wait_until_stack_deleted() def delete_stack(self, stack_id=None): """Deletes stack.""" @@ -269,8 +269,11 @@ class HeatStackFixture(tobiko.SharedFixture): start = time.time() while stack: if time.time() - start > timeout: - raise HeatStackDeletionFailed(name=self.stack_name, - timeout=timeout) + raise HeatStackDeletionFailed( + name=self.stack_name, + observed=stack.stack_status, + expected=DELETE_COMPLETE, + status_reason=stack.stack_status_reason) LOG.debug("Waiting for deleted stack to disappear: '%s'", self.stack_name) time.sleep(self.wait_interval)