commit 67ea5dfbac827a27004448aae7142197eeff57d0
author Zuul <zuul@review.opendev.org> Mon Mar 21 22:51:58 2022 +0000
committer Gerrit Code Review <review@openstack.org> Mon Mar 21 22:51:58 2022 +0000
tree 18a5e17e6a8aa38ac725e0543e08033282f26ae7
parent 7304e3ac8973a42bcfff91d561ac9d238b187334
parent a814961796061804d9e5390e70fd0610a53a2aa9

Merge "Fix compute_unified decoration"

tempest/scenario/test_compute_unified_limits.py

diff --git a/tempest/scenario/test_compute_unified_limits.py b/tempest/scenario/test_compute_unified_limits.py
index bacf526..eda6d6f 100644
--- a/tempest/scenario/test_compute_unified_limits.py
+++ b/tempest/scenario/test_compute_unified_limits.py
@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testtools
-
 from tempest.common import utils
 from tempest.common import waiters
 from tempest import config
@@ -25,8 +23,6 @@
 CONF = config.CONF
 
 
-@testtools.skipUnless(CONF.compute_feature_enabled.unified_limits,
-                      'Compute unified limits are not enabled')
 class ComputeProjectQuotaTest(manager.ScenarioTest):
     """The test base class for compute unified limits tests.
 
@@ -41,6 +37,12 @@
     force_tenant_isolation = True
 
     @classmethod
+    def skip_checks(cls):
+        super(ComputeProjectQuotaTest, cls).skip_checks()
+        if not CONF.compute_feature_enabled.unified_limits:
+            raise cls.skipException('Compute unified limits are not enabled.')
+
+    @classmethod
     def resource_setup(cls):
         super(ComputeProjectQuotaTest, cls).resource_setup()
 
@@ -67,8 +69,6 @@
             self.limit_ids[name], value)
 
 
-@testtools.skipUnless(CONF.compute_feature_enabled.unified_limits,
-                      'Compute unified limits are not enabled')
 class ServersQuotaTest(ComputeProjectQuotaTest):
 
     @classmethod