Merge "Use deploy_cluster_wait in separate-service tests"

This commit is contained in:
Jenkins 2015-09-08 09:59:05 +00:00 committed by Gerrit Code Review
commit bbe4557f1e
4 changed files with 4 additions and 4 deletions

View File

@ -252,7 +252,7 @@ class SeparateDbFailover(TestBasic):
nailgun_node = self.fuel_web.update_nodes(cluster_id, node,
False, True)
nodes = filter(lambda x: x["pending_deletion"] is True, nailgun_node)
self.fuel_web.deploy_cluster(cluster_id)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
wait(lambda: self.fuel_web.is_node_discovered(nodes[0]),
timeout=6 * 60)
self.fuel_web.verify_network(cluster_id)

View File

@ -237,7 +237,7 @@ class SeparateHorizonFailover(TestBasic):
nailgun_node = self.fuel_web.update_nodes(cluster_id, node,
False, True)
nodes = filter(lambda x: x["pending_deletion"] is True, nailgun_node)
self.fuel_web.deploy_cluster(cluster_id)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
wait(lambda: self.fuel_web.is_node_discovered(nodes[0]),
timeout=6 * 60)
self.fuel_web.verify_network(cluster_id)

View File

@ -260,7 +260,7 @@ class SeparateKeystoneFailover(TestBasic):
nailgun_node = self.fuel_web.update_nodes(cluster_id, node,
False, True)
nodes = filter(lambda x: x["pending_deletion"] is True, nailgun_node)
self.fuel_web.deploy_cluster(cluster_id)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
wait(lambda: self.fuel_web.is_node_discovered(nodes[0]),
timeout=6 * 60)
self.fuel_web.verify_network(cluster_id)

View File

@ -256,7 +256,7 @@ class SeparateRabbitFailover(TestBasic):
nailgun_node = self.fuel_web.update_nodes(cluster_id, node,
False, True)
nodes = filter(lambda x: x["pending_deletion"] is True, nailgun_node)
self.fuel_web.deploy_cluster(cluster_id)
self.fuel_web.deploy_cluster_wait(cluster_id, check_services=False)
wait(lambda: self.fuel_web.is_node_discovered(nodes[0]),
timeout=6 * 60)
self.fuel_web.verify_network(cluster_id)