openstack
/
magnum-tempest-plugin
Code Issues Proposed changes

Merge "Fix the slowest test"

This commit is contained in:
Zuul 2018-11-26 02:44:40 +00:00 committed by Gerrit Code Review
parent afbd2135dd b473e2d498
commit ae982f96a5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
magnum_tempest_plugin/tests/api/v1/clients/cluster_client.py
View File

@ -118,7 +118,7 @@ class ClusterClient(client.MagnumClient):
def wait_for_created_cluster(self, cluster_id, delete_on_error=True):
try:
utils.wait_for_condition(
lambda: self.does_cluster_exist(cluster_id), 10, 1800)
lambda: self.does_cluster_exist(cluster_id), 10, 3600)
except Exception:
# In error state. Clean up the cluster id if desired
self.LOG.error('Cluster %s entered an exception state.',
@ -131,7 +131,7 @@ class ClusterClient(client.MagnumClient):
def wait_for_final_state(self, cluster_id):
utils.wait_for_condition(
lambda: self.is_cluster_in_final_state(cluster_id), 10, 1800)
lambda: self.is_cluster_in_final_state(cluster_id), 10, 3600)
def is_cluster_in_final_state(self, cluster_id):
try:
@ -156,7 +156,7 @@ class ClusterClient(client.MagnumClient):
self.LOG.error('Cluster %s is in fail state.',
cluster_id)
raise exceptions.ServerFault(
"Got into an error condition: %s for %s",
"Got into an error condition: %s for %s" %
(model.status, cluster_id))
else:
return False

3
magnum_tempest_plugin/tests/api/v1/test_cluster.py
View File

@ -68,7 +68,7 @@ class ClusterTest(base.BaseTempestTest):
# NOTE (dimtruck) by default tempest sets timeout to 20 mins.
# We need more time.
test_timeout = 1800
test_timeout = 3600
self.useFixture(fixtures.Timeout(test_timeout, gentle=True))
except Exception:
self.tearDown()
@ -133,6 +133,7 @@ class ClusterTest(base.BaseTempestTest):
# (dimtruck) Combining all these tests in one because
# they time out on the gate (2 hours not enough)
@testtools.testcase.attr('positive')
@testtools.testcase.attr('slow')
def test_create_list_sign_delete_clusters(self):
gen_model = datagen.valid_cluster_data(
cluster_template_id=self.cluster_template.uuid, node_count=1)