From 949e0cb3c6fab156d7c067158c3cfd616dbfc1c7 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Fri, 15 Sep 2017 12:33:55 -0500 Subject: 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 --- .../tests/functional/compute/v2/test_aggregate.py | 12 ++++++++++-- .../tests/functional/network/v2/test_network_qos_policy.py | 7 +++++-- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'openstackclient/tests') diff --git a/openstackclient/tests/functional/compute/v2/test_aggregate.py b/openstackclient/tests/functional/compute/v2/test_aggregate.py index 1eba3ffe..cf9d2bc0 100644 --- a/openstackclient/tests/functional/compute/v2/test_aggregate.py +++ b/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' diff --git a/openstackclient/tests/functional/network/v2/test_network_qos_policy.py b/openstackclient/tests/functional/network/v2/test_network_qos_policy.py index 27c1b6aa..66bda1c7 100644 --- a/openstackclient/tests/functional/network/v2/test_network_qos_policy.py +++ b/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): -- cgit v1.2.1