commit 015cfa31c56b0df9545fa9cdeeadd01b03fad1b6
author Eric Windisch <ewindisch@docker.com> Wed Mar 05 10:53:37 2014 -0500
committer Eric Windisch <ewindisch@docker.com> Wed Mar 05 10:53:37 2014 -0500
tree 9b469d82c533815551d79625c9c78c963c11e324
parent b1151496986bf79fab5a3ac1f8226c1ffd48a1db

Do not setUpClass or tearDownClass V3 tests if API is disabled

Bugs in performing tearDown may occur if v3 is
disabled as the skip would cause the setUp to be
incomplete, causing the tearDown to reference undefined
instance variables.

Change-Id: I69110c6149ee22aa3e0d6ee27c52ef0159e9a235
Closes-Bug: #1282839
Closes-Bug: #1282829
Closes-Bug: #1282827

tempest/api/compute/base.py

diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py
index 9162926..c2663f8 100644
--- a/tempest/api/compute/base.py
+++ b/tempest/api/compute/base.py
@@ -313,14 +313,14 @@
                         "%s will be removed shortly" % cls.__name__)
             raise cls.skipException(skip_msg)
 
-        cls.set_network_resources()
-        super(BaseV3ComputeTest, cls).setUpClass()
         if not CONF.compute_feature_enabled.api_v3:
-            cls.tearDownClass()
             skip_msg = ("%s skipped as nova v3 api is not available" %
                         cls.__name__)
             raise cls.skipException(skip_msg)
 
+        cls.set_network_resources()
+        super(BaseV3ComputeTest, cls).setUpClass()
+
         cls.servers_client = cls.os.servers_v3_client
         cls.images_client = cls.os.image_client
         cls.flavors_client = cls.os.flavors_v3_client