Attempt to work around chronically failing server issues with aggregates and qos

So yeah, this is not kosher for functional tests, but we're testing the
client interaction, not the raciness of Nova or Neutron.  Failure to delete
is not our problem.

Change-Id: I21043f1de0fbacee1aec63110fb12a7cff42e0a0
This commit is contained in:
Dean Troyer 2017-09-15 12:33:55 -05:00
parent f63bb18003
commit 949e0cb3c6
2 changed files with 15 additions and 4 deletions
openstackclient/tests/functional

@ -67,7 +67,11 @@ class AggregateTests(base.TestCase):
'--property a=b ' +
name1
)
self.addCleanup(self.openstack, 'aggregate delete ' + name1)
self.addCleanup(
self.openstack,
'aggregate delete ' + name1,
fail_ok=True,
)
name2 = uuid.uuid4().hex
self.openstack(
@ -76,7 +80,11 @@ class AggregateTests(base.TestCase):
'--property c=d ' +
name2
)
self.addCleanup(self.openstack, 'aggregate delete ' + name2)
self.addCleanup(
self.openstack,
'aggregate delete ' + name2,
fail_ok=True,
)
cmd_output = json.loads(self.openstack(
'aggregate list -f json'

@ -33,8 +33,11 @@ class NetworkQosPolicyTests(common.NetworkTests):
'network qos policy create -f json ' +
self.NAME
))
self.addCleanup(self.openstack,
'network qos policy delete ' + self.NAME)
self.addCleanup(
self.openstack,
'network qos policy delete ' + self.NAME,
fail_ok=True,
)
self.assertEqual(self.NAME, cmd_output['name'])
def test_qos_rule_create_delete(self):