Waiting for stack deleted completely at fault tests cleanup
Change-Id: Ib6675c04b20692ec6dbd0544f3d409d48eebeec4
This commit is contained in:
parent
99a7b0a219
commit
8372547c31
|
@ -218,7 +218,7 @@ class HeatStackFixture(tobiko.SharedFixture):
|
||||||
def cleanup_stack(self):
|
def cleanup_stack(self):
|
||||||
self.delete_stack()
|
self.delete_stack()
|
||||||
if self.stack:
|
if self.stack:
|
||||||
self.wait_for_delete_complete()
|
self.wait_until_stack_deleted()
|
||||||
|
|
||||||
def delete_stack(self, stack_id=None):
|
def delete_stack(self, stack_id=None):
|
||||||
"""Deletes stack."""
|
"""Deletes stack."""
|
||||||
|
@ -269,8 +269,11 @@ class HeatStackFixture(tobiko.SharedFixture):
|
||||||
start = time.time()
|
start = time.time()
|
||||||
while stack:
|
while stack:
|
||||||
if time.time() - start > timeout:
|
if time.time() - start > timeout:
|
||||||
raise HeatStackDeletionFailed(name=self.stack_name,
|
raise HeatStackDeletionFailed(
|
||||||
timeout=timeout)
|
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'",
|
LOG.debug("Waiting for deleted stack to disappear: '%s'",
|
||||||
self.stack_name)
|
self.stack_name)
|
||||||
time.sleep(self.wait_interval)
|
time.sleep(self.wait_interval)
|
||||||
|
|
Loading…
Reference in New Issue