summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-28 10:10:44 +0000
committerGerrit Code Review <review@openstack.org>2017-03-28 10:10:44 +0000
commita4ff8fa19f55d5c6741516b204d0cf14a8dc8fdd (patch)
treeb4da5645d0b6ad66740bca63f9ff260c5e000b24
parentb013b41a6a7b6d53deecc36cae2987e1fef76a78 (diff)
parentdc2a892a0298de0a4406eb447393d82be9735345 (diff)
Merge "Ensure that all nodes goes offline after shutting them off"
-rw-r--r--fuelweb_test/models/fuel_web_client.py5
-rw-r--r--fuelweb_test/tests/tests_strength/test_image_based.py2
2 files changed, 7 insertions, 0 deletions
diff --git a/fuelweb_test/models/fuel_web_client.py b/fuelweb_test/models/fuel_web_client.py
index acfa931..ad8c92a 100644
--- a/fuelweb_test/models/fuel_web_client.py
+++ b/fuelweb_test/models/fuel_web_client.py
@@ -2247,6 +2247,11 @@ class FuelWebClient29(object):
2247 self.wait_node_is_online(node, timeout=timeout) 2247 self.wait_node_is_online(node, timeout=timeout)
2248 2248
2249 @logwrap 2249 @logwrap
2250 def wait_nodes_get_offline_state(self, nodes, timeout=4 * 60):
2251 for node in nodes:
2252 self.wait_node_is_offline(node, timeout=timeout)
2253
2254 @logwrap
2250 def wait_cluster_nodes_get_online_state(self, cluster_id, 2255 def wait_cluster_nodes_get_online_state(self, cluster_id,
2251 timeout=4 * 60): 2256 timeout=4 * 60):
2252 self.wait_nodes_get_online_state( 2257 self.wait_nodes_get_online_state(
diff --git a/fuelweb_test/tests/tests_strength/test_image_based.py b/fuelweb_test/tests/tests_strength/test_image_based.py
index 5e84301..bd14424 100644
--- a/fuelweb_test/tests/tests_strength/test_image_based.py
+++ b/fuelweb_test/tests/tests_strength/test_image_based.py
@@ -74,6 +74,8 @@ class RepeatableImageBased(TestBasic):
74 timeout_msg='Nodes failed to become online') 74 timeout_msg='Nodes failed to become online')
75 for slave in self.env.d_env.nodes().slaves[:5]: 75 for slave in self.env.d_env.nodes().slaves[:5]:
76 slave.destroy() 76 slave.destroy()
77 self.fuel_web.wait_nodes_get_offline_state(
78 self.env.d_env.nodes().slaves[:5], timeout=10 * 60)
77 79
78 self.env.make_snapshot("deploy_after_delete", is_make=True) 80 self.env.make_snapshot("deploy_after_delete", is_make=True)
79 81