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

openstackclient/tests/functional/compute/v2/test_aggregate.py

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

openstackclient/tests/functional/network/v2/test_network_qos_policy.py

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