File 0001-Wait-for-servers-termination-when-cleaning-up-teleme.patch of Package openstack-tempest
From 657a5f3cf2ee9ba8d74d6876e491794d741f41aa Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Sat, 16 Jan 2016 14:28:28 +0100
Subject: [PATCH] Wait for servers termination when cleaning up telemetry test
Closes-Bug: #1534928
Change-Id: Id33b9e1ade1675f1efbae96b7ea7430e46c4cdd7
(cherry picked from commit 66bc0f5329c1db0363b33cb2eeeaf43eea01cdac)
---
tempest/api/telemetry/base.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tempest/api/telemetry/base.py b/tempest/api/telemetry/base.py
index 8f07614..ac00b09 100644
--- a/tempest/api/telemetry/base.py
+++ b/tempest/api/telemetry/base.py
@@ -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
@@ -105,9 +106,15 @@ class BaseTelemetryTest(tempest.test.BaseTestCase):
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.telemetry_client.delete_alarm, cls.alarm_ids)
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()
--
2.6.4