From d5a0a7200ea21f98a83ebc8d2d829c17db91c0d2 Mon Sep 17 00:00:00 2001 From: Akihito INOH Date: Fri, 15 Dec 2017 17:24:51 +0900 Subject: [PATCH] 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 --- .../api/object_storage/test_object_version.py | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tempest/api/object_storage/test_object_version.py b/tempest/api/object_storage/test_object_version.py index 51b0a1d15f..75111b6e9d 100644 --- a/tempest/api/object_storage/test_object_version.py +++ b/tempest/api/object_storage/test_object_version.py @@ -24,16 +24,6 @@ CONF = config.CONF 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 @@ class ContainerTest(base.BaseObjectTest): # 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 @@ class ContainerTest(base.BaseObjectTest): 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)