Merge "Fix server cleanup in test_multiple_create test"
diff --git a/tempest/api/compute/servers/test_multiple_create.py b/tempest/api/compute/servers/test_multiple_create.py
index 10c76bb..b464c45 100644
--- a/tempest/api/compute/servers/test_multiple_create.py
+++ b/tempest/api/compute/servers/test_multiple_create.py
@@ -15,6 +15,7 @@
from tempest.api.compute import base
from tempest.common import compute
+from tempest.common import waiters
from tempest.lib import decorators
@@ -34,8 +35,15 @@
wait_until='ACTIVE',
min_count=2,
tenant_network=tenant_network)
+
+ for server in servers:
+ self.addCleanup(waiters.wait_for_server_termination,
+ self.servers_client,
+ server['id'])
+
for server in servers:
self.addCleanup(self.servers_client.delete_server, server['id'])
+
# NOTE(maurosr): do status response check and also make sure that
# reservation_id is not in the response body when the request send
# contains return_reservation_id=False