commit 6d770137d4f6f5731a15289c2397d695f2f1c516
author Jenkins <jenkins@review.openstack.org> Fri Nov 25 14:11:23 2016 +0000
committer Gerrit Code Review <review@openstack.org> Fri Nov 25 14:11:23 2016 +0000
tree a54d7e3910e069718008a2a2e4de071932305a11
parent 5efb798dda41e156a40ca9591135bf7d438efd1d
parent 44fce680a88a6335915a76a6d60d8623ee07a62a

Merge "Add wait_for_server_termination in test_server_basic_ops"

tempest/scenario/test_server_basic_ops.py

diff --git a/tempest/scenario/test_server_basic_ops.py b/tempest/scenario/test_server_basic_ops.py
index c66128d..3aab2b8 100644
--- a/tempest/scenario/test_server_basic_ops.py
+++ b/tempest/scenario/test_server_basic_ops.py
@@ -16,6 +16,7 @@
 import json
 import re
 
+from tempest.common import waiters
 from tempest import config
 from tempest import exceptions
 from tempest.lib.common.utils import test_utils
@@ -134,3 +135,5 @@
         self.verify_metadata_on_config_drive()
         self.verify_networkdata_on_config_drive()
         self.servers_client.delete_server(self.instance['id'])
+        waiters.wait_for_server_termination(
+            self.servers_client, self.instance['id'], ignore_error=False)