Merge "Ignore not found when delete in test"
This commit is contained in:
commit
4d8f270157
|
@ -15,6 +15,7 @@ import os
|
||||||
import six
|
import six
|
||||||
from tempest.lib.cli import base
|
from tempest.lib.cli import base
|
||||||
from tempest.lib.cli import output_parser
|
from tempest.lib.cli import output_parser
|
||||||
|
from tempest.lib import exceptions as tempest_exc
|
||||||
|
|
||||||
|
|
||||||
class OpenStackClientTestBase(base.ClientTestBase):
|
class OpenStackClientTestBase(base.ClientTestBase):
|
||||||
|
@ -81,7 +82,13 @@ class OpenStackClientTestBase(base.ClientTestBase):
|
||||||
if wait:
|
if wait:
|
||||||
cmd += ' --wait'
|
cmd += ' --wait'
|
||||||
if id in self.openstack('stack list --short'):
|
if id in self.openstack('stack list --short'):
|
||||||
|
try:
|
||||||
self.openstack(cmd)
|
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):
|
def _stack_suspend(self, id, wait=True):
|
||||||
cmd = 'stack suspend ' + id
|
cmd = 'stack suspend ' + id
|
||||||
|
|
Loading…
Reference in New Issue