diff --git a/tempest/api/object_storage/test_container_acl.py b/tempest/api/object_storage/test_container_acl.py index c8731fec01..0259373d43 100644 --- a/tempest/api/object_storage/test_container_acl.py +++ b/tempest/api/object_storage/test_container_acl.py @@ -31,9 +31,10 @@ class ObjectTestACLs(base.BaseObjectTest): super(ObjectTestACLs, self).setUp() self.container_name = self.create_container() - def tearDown(self): - self.delete_containers() - super(ObjectTestACLs, self).tearDown() + @classmethod + def resource_cleanup(cls): + cls.delete_containers() + super(ObjectTestACLs, cls).resource_cleanup() @decorators.idempotent_id('a3270f3f-7640-4944-8448-c7ea783ea5b6') def test_read_object_with_rights(self): diff --git a/tempest/api/object_storage/test_container_acl_negative.py b/tempest/api/object_storage/test_container_acl_negative.py index 73d7f27a71..85e6ddb110 100644 --- a/tempest/api/object_storage/test_container_acl_negative.py +++ b/tempest/api/object_storage/test_container_acl_negative.py @@ -42,9 +42,10 @@ class ObjectACLsNegativeTest(base.BaseObjectTest): self.container_name = data_utils.rand_name(name='TestContainer') self.container_client.update_container(self.container_name) - def tearDown(self): - self.delete_containers([self.container_name]) - super(ObjectACLsNegativeTest, self).tearDown() + @classmethod + def resource_cleanup(cls): + cls.delete_containers() + super(ObjectACLsNegativeTest, cls).resource_cleanup() @decorators.attr(type=['negative']) @decorators.idempotent_id('af587587-0c24-4e15-9822-8352ce711013') diff --git a/tempest/api/object_storage/test_container_quotas.py b/tempest/api/object_storage/test_container_quotas.py index fcd9a7c2cd..7977a7a7e2 100644 --- a/tempest/api/object_storage/test_container_quotas.py +++ b/tempest/api/object_storage/test_container_quotas.py @@ -44,10 +44,10 @@ class ContainerQuotasTest(base.BaseObjectTest): self.container_client.create_update_or_delete_container_metadata( self.container_name, create_update_metadata=metadata) - def tearDown(self): - """Cleans the container of any object after each test.""" - self.delete_containers() - super(ContainerQuotasTest, self).tearDown() + @classmethod + def resource_cleanup(cls): + cls.delete_containers() + super(ContainerQuotasTest, cls).resource_cleanup() @decorators.idempotent_id('9a0fb034-86af-4df0-86fa-f8bd7db21ae0') @utils.requires_ext(extension='container_quotas', service='object') diff --git a/tempest/api/object_storage/test_container_services.py b/tempest/api/object_storage/test_container_services.py index 7ad6f6fe7b..085b8ab117 100644 --- a/tempest/api/object_storage/test_container_services.py +++ b/tempest/api/object_storage/test_container_services.py @@ -21,9 +21,10 @@ from tempest.lib import decorators class ContainerTest(base.BaseObjectTest): """Test containers""" - def tearDown(self): - self.delete_containers() - super(ContainerTest, self).tearDown() + @classmethod + def resource_cleanup(cls): + cls.delete_containers() + super(ContainerTest, cls).resource_cleanup() @decorators.attr(type='smoke') @decorators.idempotent_id('92139d73-7819-4db1-85f8-3f2f22a8d91f')