Merge "Skip tests when heat is unavailable"

heat_tempest_plugin/common/test.py

@@ -170,6 +170,9 @@ class HeatIntegrationTest(testtools.testcase.WithAttributes,
     def setUp(self):
         super(HeatIntegrationTest, self).setUp()
 
+        if not config.CONF.service_available.heat:
+            raise self.skipException("Heat is not available")
+
         self.conf = config.CONF.heat_plugin
 
         self.assertIsNotNone(self.conf.auth_url,

heat_tempest_plugin/tests/api/fixtures.py

@@ -16,10 +16,14 @@ import os
 from gabbi import fixture
 from heat_tempest_plugin.services import clients
 from tempest import config
+import unittest.case
 
 
 class AuthenticationFixture(fixture.GabbiFixture):
     def start_fixture(self):
+        if not config.CONF.service_available.heat:
+            raise unittest.case.SkipTest("Heat is not available")
+
         conf = config.CONF.heat_plugin
         manager = clients.ClientManager(conf)
         os.environ['OS_TOKEN'] = manager.identity_client.auth_token

releasenotes/notes/honor-service_available-heat-03755bb4b092e753.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The ``[service_available] heat`` parameter now takes effect and disables
+    all tests when it is set to ``False``.