Merge "Always wait on server delete"
diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py
index d1549e2..ada55f7 100644
--- a/tempest/api/volume/base.py
+++ b/tempest/api/volume/base.py
@@ -175,7 +175,7 @@
except Exception:
pass
- def create_server(self, name, wait_for_deletion=False, **kwargs):
+ def create_server(self, name, **kwargs):
tenant_network = self.get_tenant_network()
body, _ = compute.create_test_server(
self.os,
@@ -183,11 +183,9 @@
name=name,
**kwargs)
- if wait_for_deletion:
- self.addCleanup(test_utils.call_and_ignore_notfound_exc,
- waiters.wait_for_server_termination,
- self.servers_client, body['id'])
-
+ self.addCleanup(test_utils.call_and_ignore_notfound_exc,
+ waiters.wait_for_server_termination,
+ self.servers_client, body['id'])
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
self.servers_client.delete_server, body['id'])
return body
diff --git a/tempest/api/volume/test_volumes_negative.py b/tempest/api/volume/test_volumes_negative.py
index 5bef7f3..e8ead5b 100755
--- a/tempest/api/volume/test_volumes_negative.py
+++ b/tempest/api/volume/test_volumes_negative.py
@@ -179,7 +179,6 @@
srv_name = data_utils.rand_name(self.__class__.__name__ + '-Instance')
server = self.create_server(
name=srv_name,
- wait_for_deletion=True,
wait_until='ACTIVE')
self.assertRaises(lib_exc.NotFound,