commit d5a0a7200ea21f98a83ebc8d2d829c17db91c0d2
author Akihito INOH <aki-inou@rs.jp.nec.com> Fri Dec 15 17:24:51 2017 +0900
committer Akihito INOH <aki-inou@rs.jp.nec.com> Mon Dec 18 10:04:27 2017 +0900
tree 6dc2a69b2a3d392b51bca9430057f5452a281557
parent 3f697b3c0ab5f57a78986a5969584852e3ae1da3

Remove resource_cleanup from test_object_version

test_object_version.py keep created containers till
class level cleanup which is not needed.

This patch makes it to use addCleanup to remove containers
during test itself.

Change-Id: I0cda6692764031dbbee94965dd1d8d843dd94b12

tempest/api/object_storage/test_object_version.py

diff --git a/tempest/api/object_storage/test_object_version.py b/tempest/api/object_storage/test_object_version.py
index 51b0a1d..75111b6 100644
--- a/tempest/api/object_storage/test_object_version.py
+++ b/tempest/api/object_storage/test_object_version.py
@@ -24,16 +24,6 @@
 
 
 class ContainerTest(base.BaseObjectTest):
-    @classmethod
-    def resource_setup(cls):
-        super(ContainerTest, cls).resource_setup()
-        cls.containers = []
-
-    @classmethod
-    def resource_cleanup(cls):
-        cls.delete_containers()
-        super(ContainerTest, cls).resource_cleanup()
-
     def assertContainer(self, container, count, byte, versioned):
         resp, _ = self.container_client.list_container_metadata(container)
         self.assertHeaders(resp, 'Container', 'HEAD')
@@ -52,7 +42,10 @@
         # create container
         vers_container_name = data_utils.rand_name(name='TestVersionContainer')
         resp, _ = self.container_client.update_container(vers_container_name)
-        self.containers.append(vers_container_name)
+        self.addCleanup(base.delete_containers,
+                        [vers_container_name],
+                        self.container_client,
+                        self.object_client)
         self.assertHeaders(resp, 'Container', 'PUT')
         self.assertContainer(vers_container_name, '0', '0', 'Missing Header')
 
@@ -61,7 +54,10 @@
         resp, _ = self.container_client.update_container(
             base_container_name,
             **headers)
-        self.containers.append(base_container_name)
+        self.addCleanup(base.delete_containers,
+                        [base_container_name],
+                        self.container_client,
+                        self.object_client)
         self.assertHeaders(resp, 'Container', 'PUT')
         self.assertContainer(base_container_name, '0', '0',
                              vers_container_name)