Check server terminations on "delete server" tests
Current "delete server" tests check the API response code only
and do not check server terminations. In current tests, Tempest
cannot detect the termination errors even if they happen.
This patch adds the checks for these tests.
Change-Id: Ib9ba09e86819d7f1027c90cf3ca98dee350125e8
diff --git a/tempest/api/compute/servers/test_delete_server.py b/tempest/api/compute/servers/test_delete_server.py
index ec40ce0..6c0e37c 100644
--- a/tempest/api/compute/servers/test_delete_server.py
+++ b/tempest/api/compute/servers/test_delete_server.py
@@ -36,6 +36,7 @@
resp, server = self.create_test_server(wait_until='BUILD')
resp, _ = self.client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.client.wait_for_server_termination(server['id'])
@test.attr(type='gate')
def test_delete_active_server(self):
@@ -43,6 +44,7 @@
resp, server = self.create_test_server(wait_until='ACTIVE')
resp, _ = self.client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.client.wait_for_server_termination(server['id'])
@test.attr(type='gate')
def test_delete_server_while_in_shutoff_state(self):
@@ -52,6 +54,7 @@
self.client.wait_for_server_status(server['id'], 'SHUTOFF')
resp, _ = self.client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.client.wait_for_server_termination(server['id'])
@test.attr(type='gate')
def test_delete_server_while_in_pause_state(self):
@@ -61,6 +64,7 @@
self.client.wait_for_server_status(server['id'], 'PAUSED')
resp, _ = self.client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.client.wait_for_server_termination(server['id'])
@test.attr(type='gate')
def test_delete_server_while_in_shelved_state(self):
@@ -79,6 +83,7 @@
'SHELVED')
resp, _ = self.client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.client.wait_for_server_termination(server['id'])
class DeleteServersAdminTestJSON(base.BaseV2ComputeAdminTest):
@@ -103,6 +108,8 @@
self.assertEqual(server['status'], 'ERROR')
resp, _ = self.non_admin_client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.servers_client.wait_for_server_termination(server['id'],
+ ignore_error=True)
@test.attr(type='gate')
def test_admin_delete_servers_of_others(self):
diff --git a/tempest/api/compute/v3/servers/test_delete_server.py b/tempest/api/compute/v3/servers/test_delete_server.py
index f53ab6e..0dfe60e 100644
--- a/tempest/api/compute/v3/servers/test_delete_server.py
+++ b/tempest/api/compute/v3/servers/test_delete_server.py
@@ -35,6 +35,7 @@
resp, server = self.create_test_server(wait_until='BUILD')
resp, _ = self.client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.client.wait_for_server_termination(server['id'])
@test.attr(type='gate')
def test_delete_active_server(self):
@@ -42,6 +43,7 @@
resp, server = self.create_test_server(wait_until='ACTIVE')
resp, _ = self.client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.client.wait_for_server_termination(server['id'])
@test.attr(type='gate')
def test_delete_server_while_in_shutoff_state(self):
@@ -51,6 +53,7 @@
self.client.wait_for_server_status(server['id'], 'SHUTOFF')
resp, _ = self.client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.client.wait_for_server_termination(server['id'])
@test.attr(type='gate')
def test_delete_server_while_in_pause_state(self):
@@ -60,6 +63,7 @@
self.client.wait_for_server_status(server['id'], 'PAUSED')
resp, _ = self.client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.client.wait_for_server_termination(server['id'])
@test.attr(type='gate')
def test_delete_server_while_in_shelved_state(self):
@@ -79,6 +83,7 @@
resp, _ = self.client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.client.wait_for_server_termination(server['id'])
class DeleteServersAdminV3Test(base.BaseV3ComputeAdminTest):
@@ -103,6 +108,8 @@
self.assertEqual(server['status'], 'ERROR')
resp, _ = self.non_admin_client.delete_server(server['id'])
self.assertEqual('204', resp['status'])
+ self.servers_client.wait_for_server_termination(server['id'],
+ ignore_error=True)
@test.attr(type='gate')
def test_admin_delete_servers_of_others(self):