From 92ded5b6b5e065a6b8973ae5b30856b1e262dd32 Mon Sep 17 00:00:00 2001
From: Thomas Herve <therve@redhat.com>
Date: Wed, 12 Aug 2015 13:46:17 +0200
Subject: [PATCH] Skip failing integration tests

Some tests are failing because ec2tokens seems broken. Let's skip them
for now.

Ref bug #1484086

Change-Id: I7de260e4dbd1c17fddc9385bdbb127fd593441be
---
 heat_integrationtests/functional/test_notifications.py  | 3 +++
 heat_integrationtests/scenario/test_ceilometer_alarm.py | 2 ++
 heat_integrationtests/scenario/test_server_cfn_init.py  | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/heat_integrationtests/functional/test_notifications.py b/heat_integrationtests/functional/test_notifications.py
index 3b8e0030f..f24d2c2e3 100644
--- a/heat_integrationtests/functional/test_notifications.py
+++ b/heat_integrationtests/functional/test_notifications.py
@@ -16,6 +16,8 @@ from oslo_messaging._drivers import common
 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 @@ outputs:
         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/heat_integrationtests/scenario/test_ceilometer_alarm.py b/heat_integrationtests/scenario/test_ceilometer_alarm.py
index e0523aa6f..e5e141b00 100644
--- a/heat_integrationtests/scenario/test_ceilometer_alarm.py
+++ b/heat_integrationtests/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 @@ class CeilometerAlarmTest(scenario_base.ScenarioTestsBase):
                                                               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/heat_integrationtests/scenario/test_server_cfn_init.py b/heat_integrationtests/scenario/test_server_cfn_init.py
index 267b44b8e..00a360b05 100644
--- a/heat_integrationtests/scenario/test_server_cfn_init.py
+++ b/heat_integrationtests/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 @@ class CfnInitIntegrationTest(scenario_base.ScenarioTestsBase):
                 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.