From 38cd0d1710bcf42ef7593c3350251d7c68fa2905 Mon Sep 17 00:00:00 2001 From: Eduardo Olivares Date: Thu, 15 Apr 2021 09:46:54 +0200 Subject: [PATCH] Waiting for stack deleted completely at fault tests cleanup (II) Change-Id: I17ad7b186a944ccc69b730f478e6b01eda4639f9 --- tobiko/openstack/heat/_stack.py | 3 +-- tobiko/tests/unit/openstack/heat/test_stack.py | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tobiko/openstack/heat/_stack.py b/tobiko/openstack/heat/_stack.py index 7ce3c1b38..d197a61ee 100644 --- a/tobiko/openstack/heat/_stack.py +++ b/tobiko/openstack/heat/_stack.py @@ -217,8 +217,7 @@ class HeatStackFixture(tobiko.SharedFixture): def cleanup_stack(self): self.delete_stack() - if self.stack: - self.wait_until_stack_deleted() + self.wait_until_stack_deleted() def delete_stack(self, stack_id=None): """Deletes stack.""" diff --git a/tobiko/tests/unit/openstack/heat/test_stack.py b/tobiko/tests/unit/openstack/heat/test_stack.py index 338a03494..58955cd57 100644 --- a/tobiko/tests/unit/openstack/heat/test_stack.py +++ b/tobiko/tests/unit/openstack/heat/test_stack.py @@ -261,6 +261,7 @@ class HeatStackFixtureTest(openstack.OpenstackTest): def test_cleanup(self): client = MockClient() + client.stacks.get.return_value = None stack = MyStack(client=client) stack.cleanUp() client.stacks.delete.assert_called_once_with(stack.stack_name)