openstack/tempest
Code Issues Proposed changes

Merge "Use addClassResourceCleanup in BaseImageTest"

Browse Source
This commit is contained in:
Zuul 2017-11-17 05:31:54 +00:00 committed by Gerrit Code Review
commit d7f39ba7d7
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tempest/api/image/base.py
View File

@ -45,16 +45,6 @@ class BaseImageTest(tempest.test.BaseTestCase):
super(BaseImageTest, cls).resource_setup() super(BaseImageTest, cls).resource_setup()
cls.created_images = [] cls.created_images = []
@classmethod
def resource_cleanup(cls):
for image_id in cls.created_images:
test_utils.call_and_ignore_notfound_exc(
cls.client.delete_image, image_id)
for image_id in cls.created_images:
cls.client.wait_for_resource_deletion(image_id)
super(BaseImageTest, cls).resource_cleanup()
@classmethod @classmethod
def create_image(cls, data=None, **kwargs): def create_image(cls, data=None, **kwargs):
"""Wrapper that returns a test image.""" """Wrapper that returns a test image."""
@ -75,6 +65,10 @@ class BaseImageTest(tempest.test.BaseTestCase):
if 'image' in image: if 'image' in image:
image = image['image'] image = image['image']
cls.created_images.append(image['id']) cls.created_images.append(image['id'])
cls.addClassResourceCleanup(cls.client.wait_for_resource_deletion,
image['id'])
cls.addClassResourceCleanup(test_utils.call_and_ignore_notfound_exc,
cls.client.delete_image, image['id'])
return image return image
@classmethod @classmethod