From 7eb2c21ea50b2606b194aa6363d7978e8f04252c Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Tue, 8 Sep 2015 11:57:57 +0300 Subject: [PATCH] Use deploy_cluster_wait in separate-service tests Change-Id: I4997103c46b16ffb6a12bf6058fc3d5710f42571 Closes-bug:#1493269 --- fuelweb_test/tests/tests_separate_services/test_separate_db.py | 2 +- .../tests/tests_separate_services/test_separate_horizon.py | 2 +- .../tests/tests_separate_services/test_separate_keystone.py | 2 +- .../tests/tests_separate_services/test_separate_rabbitmq.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fuelweb_test/tests/tests_separate_services/test_separate_db.py b/fuelweb_test/tests/tests_separate_services/test_separate_db.py index 79bb4a191..3ce84d0e2 100644 --- a/fuelweb_test/tests/tests_separate_services/test_separate_db.py +++ b/fuelweb_test/tests/tests_separate_services/test_separate_db.py @@ -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) diff --git a/fuelweb_test/tests/tests_separate_services/test_separate_horizon.py b/fuelweb_test/tests/tests_separate_services/test_separate_horizon.py index 82997ef75..ac40448c6 100644 --- a/fuelweb_test/tests/tests_separate_services/test_separate_horizon.py +++ b/fuelweb_test/tests/tests_separate_services/test_separate_horizon.py @@ -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) diff --git a/fuelweb_test/tests/tests_separate_services/test_separate_keystone.py b/fuelweb_test/tests/tests_separate_services/test_separate_keystone.py index 1cc918835..353571afa 100644 --- a/fuelweb_test/tests/tests_separate_services/test_separate_keystone.py +++ b/fuelweb_test/tests/tests_separate_services/test_separate_keystone.py @@ -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) diff --git a/fuelweb_test/tests/tests_separate_services/test_separate_rabbitmq.py b/fuelweb_test/tests/tests_separate_services/test_separate_rabbitmq.py index 2b033e631..110c9b2b4 100644 --- a/fuelweb_test/tests/tests_separate_services/test_separate_rabbitmq.py +++ b/fuelweb_test/tests/tests_separate_services/test_separate_rabbitmq.py @@ -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)