Merge "Fix error message when a stack is not deleted"

This commit is contained in:
Zuul 2023-05-19 14:17:59 +00:00 committed by Gerrit Code Review
commit 1ea31ce8f9

View File

@ -415,14 +415,17 @@ class HeatStackFixture(tobiko.SharedFixture):
LOG.debug(f"Stack {self.stack_name} disappeared") LOG.debug(f"Stack {self.stack_name} disappeared")
break break
assert stack.stack_status == DELETE_COMPLETE if stack.stack_status != DELETE_COMPLETE:
if attempt.is_last:
raise HeatStackDeletionFailed( raise HeatStackDeletionFailed(
name=self.stack_name, name=self.stack_name,
observed=stack.stack_status, observed=stack.stack_status,
expected={DELETE_COMPLETE}, expected={DELETE_COMPLETE},
status_reason=stack.stack_status_reason) status_reason=stack.stack_status_reason)
if attempt.is_last:
tobiko.fail(f"Stack {self.stack_name} in status "
f"{DELETE_COMPLETE}, but still present")
cached = False cached = False
LOG.debug("Waiting for deleted stack to disappear: '%s'", LOG.debug("Waiting for deleted stack to disappear: '%s'",
self.stack_name) self.stack_name)