openstack
/
tempest
Code Issues Proposed changes

Wait for servers termination when cleaning up telemetry test 

Closes-Bug: #1534928
Change-Id: Id33b9e1ade1675f1efbae96b7ea7430e46c4cdd7
This commit is contained in:
Vincent Untz 2016-01-16 14:28:28 +01:00
parent 5cc7ef78b4
commit 66bc0f5329
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tempest/api/telemetry/base.py
View File

@ -17,6 +17,7 @@ from tempest_lib import exceptions as lib_exc
from tempest.common import compute
from tempest.common.utils import data_utils
from tempest.common import waiters
from tempest import config
from tempest import exceptions
import tempest.test
@ -96,9 +97,15 @@ class BaseTelemetryTest(tempest.test.BaseTestCase):
except lib_exc.NotFound:
pass
@classmethod
def wait_for_server_termination(cls, server_id):
waiters.wait_for_server_termination(cls.servers_client,
server_id)
@classmethod
def resource_cleanup(cls):
cls.cleanup_resources(cls.servers_client.delete_server, cls.server_ids)
cls.cleanup_resources(cls.wait_for_server_termination, cls.server_ids)
cls.cleanup_resources(cls.image_client.delete_image, cls.image_ids)
super(BaseTelemetryTest, cls).resource_cleanup()