summaryrefslogtreecommitdiff
path: root/heatclient
diff options
context:
space:
mode:
authorricolin <rico.lin@easystack.cn>2018-02-07 15:44:18 +0800
committerRico Lin <rico.lin.guanyu@gmail.com>2019-02-03 05:16:08 +0000
commit3b74f2ddd1cb624b98264426509200da00ea3745 (patch)
tree1ae5ed8ca209b13da6841b2b4f4fc244767c0126 /heatclient
parentaab5b85811c4a23dc0b66e27c771a59a91a2bec0 (diff)
downloadpython-heatclient-3b74f2ddd1cb624b98264426509200da00ea3745.tar.gz
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
Diffstat (limited to 'heatclient')
-rw-r--r--heatclient/tests/functional/osc/v1/base.py9
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 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