diff options
author | Zuul <zuul@review.opendev.org> | 2019-09-05 05:04:46 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-09-05 05:04:46 +0000 |
commit | 4d8f270157bf2e56ede62c61985c8fad41daceb7 (patch) | |
tree | c97fcd18344b4d28ef6e29eee885d51670294051 /heatclient/tests/functional | |
parent | eca16376563c2b0249d5b2aba1f6283a5aebbe98 (diff) | |
parent | 3b74f2ddd1cb624b98264426509200da00ea3745 (diff) | |
download | python-heatclient-4d8f270157bf2e56ede62c61985c8fad41daceb7.tar.gz |
Merge "Ignore not found when delete in test"
Diffstat (limited to 'heatclient/tests/functional')
-rw-r--r-- | heatclient/tests/functional/osc/v1/base.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/heatclient/tests/functional/osc/v1/base.py b/heatclient/tests/functional/osc/v1/base.py index c9a946e..591225a 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 |