Use built in cleanup for servers in test_large_ops
The scenario base class has code to properly clean up servers and
wait until they are fully deleted. Use this instead of custom cleanup
which doesn't wait for delete to complete.
Change-Id: Ic9fe5ea0d267116d5bc78f50d1945602e5247d6a
diff --git a/tempest/scenario/test_large_ops.py b/tempest/scenario/test_large_ops.py
index 33b7adc..0bb57ab 100644
--- a/tempest/scenario/test_large_ops.py
+++ b/tempest/scenario/test_large_ops.py
@@ -82,9 +82,6 @@
properties=properties)
def nova_boot(self):
- def delete(servers):
- [x.delete() for x in servers]
-
name = rand_name('scenario-server-')
client = self.compute_client
flavor_id = self.config.compute.flavor_ref
@@ -94,7 +91,8 @@
min_count=self.config.scenario.large_ops_number)
# needed because of bug 1199788
self.servers = [x for x in client.servers.list() if name in x.name]
- self.addCleanup(delete, self.servers)
+ for server in self.servers:
+ self.set_resource(server.name, server)
self._wait_for_server_status('ACTIVE')
@services('compute', 'image')