commit d6da8c97d780b5b527e87c3554ac9c50fe2bbd8f
author Jenkins <jenkins@review.openstack.org> Thu Dec 15 15:06:05 2016 +0000
committer Gerrit Code Review <review@openstack.org> Thu Dec 15 15:06:05 2016 +0000
tree b1086d3ef457024b11a2dc70b38036ae025b311e
parent 68c52089a75baa4dc96a2ec6a1ebf44eb93382c7
parent 9b6829071db12f3ea4db112309d27e64dd788fde

Merge "Use base.delete_server in base.rebuild_server"

tempest/api/compute/base.py

diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py
index f6a6040..d7e01f0 100644
--- a/tempest/api/compute/base.py
+++ b/tempest/api/compute/base.py
@@ -318,12 +318,7 @@
     def rebuild_server(cls, server_id, validatable=False, **kwargs):
         # Destroy an existing server and creates a new one
         if server_id:
-            try:
-                cls.servers_client.delete_server(server_id)
-                waiters.wait_for_server_termination(cls.servers_client,
-                                                    server_id)
-            except Exception:
-                LOG.exception('Failed to delete server %s' % server_id)
+            cls.delete_server(server_id)
 
         cls.password = data_utils.rand_password()
         server = cls.create_test_server(