openstack
/
python-openstackclient
Code Issues Proposed changes

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

This commit is contained in:
Jenkins 2017-09-16 17:44:32 +00:00 committed by Gerrit Code Review
parent 40a0ce5c94 949e0cb3c6
commit 21542d1e6e
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openstackclient/tests/functional/compute/v2/test_aggregate.py
View File

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

7
openstackclient/tests/functional/network/v2/test_network_qos_policy.py
View File

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