commit e8034493766880317aafd11ef1614f989f069181
author Jenkins <jenkins@review.openstack.org> Wed Aug 26 19:01:13 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed Aug 26 19:01:13 2015 +0000
tree abf7cb098abd75437a80aaf01e6e8de3447843a0
parent 0c641c90d4d07c3de75da9960b39e5672d9eb1da
parent f8ff358b7e4494897c092f82e3987fad6fc6ca99

Merge "Properly skip nova tests if nova isn't available"

tempest/api/compute/base.py

diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py
index 4164e00..bf2e0c1 100644
--- a/tempest/api/compute/base.py
+++ b/tempest/api/compute/base.py
@@ -43,6 +43,8 @@
     @classmethod
     def skip_checks(cls):
         super(BaseComputeTest, cls).skip_checks()
+        if not CONF.service_available.nova:
+            raise cls.skipException("Nova is not available")
         if cls._api_version != 2:
             msg = ("Unexpected API version is specified (%s)" %
                    cls._api_version)