diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-16 17:44:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-16 17:44:32 +0000 |
| commit | 21542d1e6ec08250a2b6f7ae5bfda5080f00931a (patch) | |
| tree | 279c1cda863ef3091e939d50427c25cc04271e95 /openstackclient/tests | |
| parent | 40a0ce5c94fde68fd001623f545197bba4203dfe (diff) | |
| parent | 949e0cb3c6fab156d7c067158c3cfd616dbfc1c7 (diff) | |
| download | python-openstackclient-21542d1e6ec08250a2b6f7ae5bfda5080f00931a.tar.gz | |
Merge "Attempt to work around chronically failing server issues with aggregates and qos"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/functional/compute/v2/test_aggregate.py | 12 | ||||
| -rw-r--r-- | openstackclient/tests/functional/network/v2/test_network_qos_policy.py | 7 |
2 files changed, 15 insertions, 4 deletions
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): |