Merge "Adds option to skip specific tests"
diff --git a/functional/test_notifications.py b/functional/test_notifications.py
index 3b8e003..f24d2c2 100644
--- a/functional/test_notifications.py
+++ b/functional/test_notifications.py
@@ -16,6 +16,8 @@
from oslo_messaging import transport
import requests
+from testtools import testcase
+
from heat_integrationtests.common import test
from heat_integrationtests.functional import functional_base
@@ -162,6 +164,7 @@
for n in BASIC_NOTIFICATIONS:
self.assertIn(n, handler.notifications)
+ @testcase.skip('Skipped until keystone fixed #1484086')
def test_asg_notifications(self):
stack_identifier = self.stack_create(template=self.asg_template)
diff --git a/scenario/test_ceilometer_alarm.py b/scenario/test_ceilometer_alarm.py
index e0523aa..e5e141b 100644
--- a/scenario/test_ceilometer_alarm.py
+++ b/scenario/test_ceilometer_alarm.py
@@ -11,6 +11,7 @@
# under the License.
from oslo_log import log as logging
+from testtools import testcase
from heat_integrationtests.common import test
from heat_integrationtests.scenario import scenario_base
@@ -34,6 +35,7 @@
actual))
return actual == expected
+ @testcase.skip('Skipped until keystone fixed #1484086')
def test_alarm(self):
"""Confirm we can create an alarm and trigger it."""
diff --git a/scenario/test_server_cfn_init.py b/scenario/test_server_cfn_init.py
index 267b44b..00a360b 100644
--- a/scenario/test_server_cfn_init.py
+++ b/scenario/test_server_cfn_init.py
@@ -12,6 +12,8 @@
import json
+from testtools import testcase
+
from heat_integrationtests.common import exceptions
from heat_integrationtests.scenario import scenario_base
@@ -93,6 +95,7 @@
self._log_console_output(servers=[server])
raise e
+ @testcase.skip('Skipped until keystone fixed #1484086')
def test_server_cfn_init(self):
"""
Check cfn-init and cfn-signal availability on the created server.