summaryrefslogtreecommitdiff
path: root/openstackclient/tests/functional/compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-16 17:44:32 +0000
committerGerrit Code Review <review@openstack.org>2017-09-16 17:44:32 +0000
commit21542d1e6ec08250a2b6f7ae5bfda5080f00931a (patch)
tree279c1cda863ef3091e939d50427c25cc04271e95 /openstackclient/tests/functional/compute
parent40a0ce5c94fde68fd001623f545197bba4203dfe (diff)
parent949e0cb3c6fab156d7c067158c3cfd616dbfc1c7 (diff)
downloadpython-openstackclient-21542d1e6ec08250a2b6f7ae5bfda5080f00931a.tar.gz
Merge "Attempt to work around chronically failing server issues with aggregates and qos"
Diffstat (limited to 'openstackclient/tests/functional/compute')
-rw-r--r--openstackclient/tests/functional/compute/v2/test_aggregate.py12
1 files changed, 10 insertions, 2 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'