commit fe6da2177d5700349f44b5c2abf399a9983c898c
author Jenkins <jenkins@review.openstack.org> Tue Feb 25 03:57:57 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Feb 25 03:57:57 2014 +0000
tree e1c265e7d204d4a5f54006cb35ee498cf9def239
parent ca0456a21f81c786aa15dace6061be5263a6fd19
parent 8be08ccd8da32b7bbe01cac7e85d50d63ca16b5e

Merge "Clarify admin_delete_server_of_others test case"

tempest/api/compute/admin/test_servers.py

diff --git a/tempest/api/compute/admin/test_servers.py b/tempest/api/compute/admin/test_servers.py
index 1078847..03b041c 100644
--- a/tempest/api/compute/admin/test_servers.py
+++ b/tempest/api/compute/admin/test_servers.py
@@ -120,7 +120,7 @@
     @test.attr(type='gate')
     def test_admin_delete_servers_of_others(self):
         # Administrator can delete servers of others
-        _, server = self.create_test_server()
+        _, server = self.create_test_server(wait_until='ACTIVE')
         resp, _ = self.client.delete_server(server['id'])
         self.assertEqual('204', resp['status'])
         self.servers_client.wait_for_server_termination(server['id'])

tempest/api/compute/v3/admin/test_servers.py

diff --git a/tempest/api/compute/v3/admin/test_servers.py b/tempest/api/compute/v3/admin/test_servers.py
index 653eaf0..653e498 100644
--- a/tempest/api/compute/v3/admin/test_servers.py
+++ b/tempest/api/compute/v3/admin/test_servers.py
@@ -105,7 +105,7 @@
     @test.attr(type='gate')
     def test_admin_delete_servers_of_others(self):
         # Administrator can delete servers of others
-        _, server = self.create_test_server()
+        _, server = self.create_test_server(wait_until='ACTIVE')
         resp, _ = self.client.delete_server(server['id'])
         self.assertEqual('204', resp['status'])
         self.servers_client.wait_for_server_termination(server['id'])