From 3b74f2ddd1cb624b98264426509200da00ea3745 Mon Sep 17 00:00:00 2001 From: ricolin Date: Wed, 7 Feb 2018 15:44:18 +0800 Subject: Ignore not found when delete in test Ignore not found when delete stack or stack snapshot in tests. Story: #1737100 Task: #19354 Change-Id: I6c980b68023b33dc318c5d9506c2cac5866c4924 --- heatclient/tests/functional/osc/v1/base.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/heatclient/tests/functional/osc/v1/base.py b/heatclient/tests/functional/osc/v1/base.py index b17fb4c..198457b 100644 --- a/heatclient/tests/functional/osc/v1/base.py +++ b/heatclient/tests/functional/osc/v1/base.py @@ -15,6 +15,7 @@ import os import six from tempest.lib.cli import base from tempest.lib.cli import output_parser +from tempest.lib import exceptions as tempest_exc class OpenStackClientTestBase(base.ClientTestBase): @@ -81,7 +82,13 @@ class OpenStackClientTestBase(base.ClientTestBase): if wait: cmd += ' --wait' if id in self.openstack('stack list --short'): - self.openstack(cmd) + try: + self.openstack(cmd) + except tempest_exc.CommandFailed as e: + msg = "Stack not found: %s" % id + if msg in six.text_type(e.stdout): + return + raise def _stack_suspend(self, id, wait=True): cmd = 'stack suspend ' + id -- cgit v1.2.1