commit 77e861861b7ba3eeaf1229c799e085ea398fdef4
author Jenkins <jenkins@review.openstack.org> Mon Aug 10 01:38:16 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon Aug 10 01:38:16 2015 +0000
tree a987b367dcb441b61e49e88988191fd75bcc854a
parent cecb8ed1f8a1d736d33cbf4baff6dcdd4b3d4629
parent bad70a71bd78cffb02a8c2157bf9c5d920a5cffb

Merge "Revert "Temporarily skip failing scenario tests""

scenario/test_neutron_autoscaling.py

diff --git a/scenario/test_neutron_autoscaling.py b/scenario/test_neutron_autoscaling.py
index c81e22d..e7aae19 100644
--- a/scenario/test_neutron_autoscaling.py
+++ b/scenario/test_neutron_autoscaling.py
@@ -20,7 +20,6 @@
 
     def setUp(self):
         super(NeutronAutoscalingTest, self).setUp()
-        raise self.skipException("Skipping until bug #1479869 is fixed.")
         if not self.conf.fixed_subnet_name:
             raise self.skipException("No sub-network configured to test")
         self.template_name = 'test_neutron_autoscaling.yaml'

scenario/test_neutron_loadbalancer.py

diff --git a/scenario/test_neutron_loadbalancer.py b/scenario/test_neutron_loadbalancer.py
index a890257..d8e0197 100644
--- a/scenario/test_neutron_loadbalancer.py
+++ b/scenario/test_neutron_loadbalancer.py
@@ -25,7 +25,6 @@
 
     def setUp(self):
         super(NeutronLoadBalancerTest, self).setUp()
-        raise self.skipException("Skipping until bug #1479869 is fixed.")
         self.public_net = self._get_network(self.conf.floating_network_name)
         self.template_name = 'test_neutron_loadbalancer.yaml'
 

scenario/test_server_cfn_init.py

diff --git a/scenario/test_server_cfn_init.py b/scenario/test_server_cfn_init.py
index 197e0c0..267b44b 100644
--- a/scenario/test_server_cfn_init.py
+++ b/scenario/test_server_cfn_init.py
@@ -23,7 +23,6 @@
 
     def setUp(self):
         super(CfnInitIntegrationTest, self).setUp()
-        raise self.skipException("Skipping until bug #1479869 is fixed.")
 
     def check_stack(self, sid):
         # Check status of all resources