openstack
/
python-heatclient
Code Issues Proposed changes

Merge "Ignore not found when delete in test" into stable/train

This commit is contained in:
Zuul 2019-10-15 20:06:08 +00:00 committed by Gerrit Code Review
parent 56e5188fca dd6560f961
commit ed9edc6b36
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
heatclient/tests/functional/osc/v1/base.py
View File

@ -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