commit bf88a63c8edb08f03a96b91e76eb4630fe4a3426
author ivan-zhu <bozhu@linux.vnet.ibm.com> Tue Mar 26 13:29:21 2013 +0800
committer ivan-zhu <bozhu@linux.vnet.ibm.com> Thu Mar 28 14:34:44 2013 +0800
tree c4a13ffa7266d2d7477f1dac030d40d153d4ad91
parent 87018bede92c5590fb7f5b5c3e94b6f69cb703cb

delete servers in setUpClass if ecxeption raised

this catch the exception in setUpClass of test_images_oneserver
and delete the server. Every exception should be catched
so hasn't specify what kind of exception after except.

fix bug 1158843

Change-Id: I4ea4f6b4bc97a514393c0d0cb6236dcc720fd1a0

tempest/tests/compute/images/test_images_oneserver.py

diff --git a/tempest/tests/compute/images/test_images_oneserver.py b/tempest/tests/compute/images/test_images_oneserver.py
index 9412d39..ca3dbb5 100644
--- a/tempest/tests/compute/images/test_images_oneserver.py
+++ b/tempest/tests/compute/images/test_images_oneserver.py
@@ -41,7 +41,12 @@
         super(ImagesOneServerTestJSON, cls).setUpClass()
         cls.client = cls.images_client
         cls.servers_client = cls.servers_client
-        resp, cls.server = cls.create_server(wait_until='ACTIVE')
+
+        try:
+            resp, cls.server = cls.create_server(wait_until='ACTIVE')
+        except Exception:
+            cls.tearDownClass()
+            raise
 
         cls.image_ids = []