From a6d5f5ae9a9c2a0adaed527b729eb0cab6c2a2d5 Mon Sep 17 00:00:00 2001 From: asledzinskiy Date: Tue, 18 Nov 2014 16:37:18 +0200 Subject: [PATCH] Add wait until nailgun will be operable to rollback tests -In case of rollback some services need time to start so we need to wait in tests for these services to start Change-Id: I34ae6388fe023cad929c1c039d4f7643658548be Closes-Bug: #1392393 --- fuelweb_test/tests/test_upgrade.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fuelweb_test/tests/test_upgrade.py b/fuelweb_test/tests/test_upgrade.py index ac0f3f537..087bc7329 100644 --- a/fuelweb_test/tests/test_upgrade.py +++ b/fuelweb_test/tests/test_upgrade.py @@ -17,6 +17,7 @@ import os from proboscis.asserts import assert_equal from proboscis import test from proboscis import SkipTest +from devops.helpers.helpers import _wait from fuelweb_test.helpers import checkers from fuelweb_test.helpers.decorators import log_snapshot_on_error @@ -283,6 +284,8 @@ class RollbackFuelMaster(base_test_data.TestBasic): checkers.check_upgraded_containers(self.env.get_admin_remote(), hlp_data.UPGRADE_FUEL_TO, hlp_data.UPGRADE_FUEL_FROM) + _wait(lambda: self.fuel_web.get_nailgun_node_by_devops_node( + self.env.nodes().slaves[0]), timeout=120) self.fuel_web.wait_nodes_get_online_state(self.env.nodes().slaves[:5]) self.fuel_web.assert_nodes_in_ready_state(cluster_id) self.fuel_web.assert_fuel_version(hlp_data.UPGRADE_FUEL_FROM) @@ -344,6 +347,8 @@ class RollbackFuelMaster(base_test_data.TestBasic): checkers.check_upgraded_containers(self.env.get_admin_remote(), hlp_data.UPGRADE_FUEL_TO, hlp_data.UPGRADE_FUEL_FROM) + _wait(lambda: self.fuel_web.get_nailgun_node_by_devops_node( + self.env.nodes().slaves[0]), timeout=120) self.fuel_web.wait_nodes_get_online_state(self.env.nodes().slaves[:3]) self.fuel_web.assert_nodes_in_ready_state(cluster_id) self.fuel_web.assert_fuel_version(hlp_data.UPGRADE_FUEL_FROM)