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
2 changed files with 15 additions and 4 deletions

View File

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

View File

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