commit e0997a2338ed13478d9e117cb704ed171296e8f9
author Jenkins <jenkins@review.openstack.org> Fri Mar 29 03:37:52 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Mar 29 03:37:52 2013 +0000
tree 28eff3aaf5bed8cbc035c0c6be909666c9a79a09
parent d4e19753962b84cbd6ba172eb11f2a7b659e240c
parent bf88a63c8edb08f03a96b91e76eb4630fe4a3426

Merge "delete servers in setUpClass if ecxeption raised"

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 = []