commit 0d5318456196fa485c785434202d100081fbaaf4
author Jenkins <jenkins@review.openstack.org> Thu Apr 03 14:49:33 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Apr 03 14:49:33 2014 +0000
tree 09fbc33198520f70a0680c7518ef00ad577e1f44
parent d9303f4abf8e25508e740d10996ee84d4456a26a
parent c1cae8c31d942648c4f603aae6aa57ec35d3add0

Merge "Waiting for ACTIVE state in rescue tests"

tempest/api/compute/servers/test_server_rescue_negative.py

diff --git a/tempest/api/compute/servers/test_server_rescue_negative.py b/tempest/api/compute/servers/test_server_rescue_negative.py
index ef45585..65797e9 100644
--- a/tempest/api/compute/servers/test_server_rescue_negative.py
+++ b/tempest/api/compute/servers/test_server_rescue_negative.py
@@ -45,6 +45,7 @@
         cls.servers_client.rescue_server(
             cls.rescue_id, adminPass=rescue_password)
         cls.servers_client.wait_for_server_status(cls.rescue_id, 'RESCUE')
+        cls.servers_client.wait_for_server_status(cls.server_id, 'ACTIVE')
 
     @classmethod
     def tearDownClass(cls):

tempest/api/compute/v3/servers/test_server_rescue_negative.py

diff --git a/tempest/api/compute/v3/servers/test_server_rescue_negative.py b/tempest/api/compute/v3/servers/test_server_rescue_negative.py
index 6bb441c..08fb127 100644
--- a/tempest/api/compute/v3/servers/test_server_rescue_negative.py
+++ b/tempest/api/compute/v3/servers/test_server_rescue_negative.py
@@ -44,6 +44,7 @@
         cls.servers_client.rescue_server(
             cls.rescue_id, admin_password=cls.rescue_password)
         cls.servers_client.wait_for_server_status(cls.rescue_id, 'RESCUE')
+        cls.servers_client.wait_for_server_status(cls.server_id, 'ACTIVE')
 
     @classmethod
     def tearDownClass(cls):