commit 91ca90c20bee139e1a0c6b7bffdb82a6533d58d1
author Thomas Herve <therve@redhat.com> Wed Aug 12 16:18:11 2015 +0200
committer Thomas Herve <therve@redhat.com> Tue Aug 18 13:37:48 2015 +0200
tree 0f627962b6acd03dec1bdd740781fd52bb617e34
parent 081e65fc6522fa90cb3e3aa1d3fdd1f0f4b88e78

Revert failing tests and use v3 for ec2 tokens

Domain users are not supported anymore on v2, so we need to use v3 by
default when authenticating ec2 access.

Change-Id: Ia7ca08bca612b4555f6b4d9098cd7db6c540b1c4
Closes-Bug: #1484086

functional/test_notifications.py

diff --git a/functional/test_notifications.py b/functional/test_notifications.py
index f24d2c2..3b8e003 100644
--- a/functional/test_notifications.py
+++ b/functional/test_notifications.py
@@ -16,8 +16,6 @@
 from oslo_messaging import transport
 import requests
 
-from testtools import testcase
-
 from heat_integrationtests.common import test
 from heat_integrationtests.functional import functional_base
 
@@ -164,7 +162,6 @@
         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)
 

scenario/test_ceilometer_alarm.py

diff --git a/scenario/test_ceilometer_alarm.py b/scenario/test_ceilometer_alarm.py
index e5e141b..e0523aa 100644
--- a/scenario/test_ceilometer_alarm.py
+++ b/scenario/test_ceilometer_alarm.py
@@ -11,7 +11,6 @@
 #    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
@@ -35,7 +34,6 @@
                                                               actual))
         return actual == expected
 
-    @testcase.skip('Skipped until keystone fixed #1484086')
     def test_alarm(self):
         """Confirm we can create an alarm and trigger it."""
 

scenario/test_server_cfn_init.py

diff --git a/scenario/test_server_cfn_init.py b/scenario/test_server_cfn_init.py
index 00a360b..267b44b 100644
--- a/scenario/test_server_cfn_init.py
+++ b/scenario/test_server_cfn_init.py
@@ -12,8 +12,6 @@
 
 import json
 
-from testtools import testcase
-
 from heat_integrationtests.common import exceptions
 from heat_integrationtests.scenario import scenario_base
 
@@ -95,7 +93,6 @@
                 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.