commit b3abf9c482ba123f4d023a898a35c37307552f1b
author Jenkins <jenkins@review.openstack.org> Fri Sep 06 18:13:11 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Sep 06 18:13:11 2013 +0000
tree 09bfee2b16e178512a45e63f7972e8b567dcbd57
parent 2338a979e6490065c5e7808a6068935e5e65f6f3
parent 02486136957a6e37924407093ad6cde924789477

Merge "Eliminate the impact of "wait_until='BUILD'""

tempest/services/compute/json/servers_client.py

diff --git a/tempest/services/compute/json/servers_client.py b/tempest/services/compute/json/servers_client.py
index 6906610..c5827f6 100644
--- a/tempest/services/compute/json/servers_client.py
+++ b/tempest/services/compute/json/servers_client.py
@@ -157,6 +157,8 @@
         start = int(time.time())
 
         while(server_status != status):
+            if status == 'BUILD' and server_status != 'UNKNOWN':
+                return
             time.sleep(self.build_interval)
             resp, body = self.get_server(server_id)
             server_status = body['status']

tempest/services/compute/xml/servers_client.py

diff --git a/tempest/services/compute/xml/servers_client.py b/tempest/services/compute/xml/servers_client.py
index 5c7a629..ec9464a 100644
--- a/tempest/services/compute/xml/servers_client.py
+++ b/tempest/services/compute/xml/servers_client.py
@@ -312,6 +312,8 @@
         start = int(time.time())
 
         while(server_status != status):
+            if status == 'BUILD' and server_status != 'UNKNOWN':
+                return
             time.sleep(self.build_interval)
             resp, body = self.get_server(server_id)
             server_status = body['status']