commit 5da7c1f5f9e0831bc01e9ee2bbb629b9ebad4483
author Jenkins <jenkins@review.openstack.org> Mon Aug 26 15:24:35 2013 +0000
committer Gerrit Code Review <review@openstack.org> Mon Aug 26 15:24:35 2013 +0000
tree 8c267210d3f8539086c20c0b6e9373280e22a4d4
parent 7e42dd30061e07d26811ef899d34cd9ba15d4a69
parent 11c5b647e9bd9c6677929b21ed586c3507afb6e8

Merge "Skip orchestration scenario tests if heat service not available"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 8290021..e93d9bc 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -574,6 +574,12 @@
     """
 
     @classmethod
+    def setUpClass(cls):
+        super(OrchestrationScenarioTest, cls).setUpClass()
+        if not cls.config.service_available.heat:
+            raise cls.skipException("Heat support is required")
+
+    @classmethod
     def credentials(cls):
         username = cls.config.identity.admin_username
         password = cls.config.identity.admin_password