Merge "Revert "WIP: Skip broken functional tests...""

Jenkins · openstack-gerrit · commit f020a9ffd6d5 · 2016-12-30T02:13:52.000Z
diff --git a/openstackclient/tests/functional/common/test_quota.py b/openstackclient/tests/functional/common/test_quota.py
@@ -10,8 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testtools
-
 from openstackclient.tests.functional import base
 
 
@@ -27,27 +25,23 @@ def setUpClass(cls):
         cls.PROJECT_NAME =\
             cls.get_openstack_configuration_value('auth.project_name')
 
-    @testtools.skip('broken SDK testing')
     def test_quota_set(self):
         self.openstack('quota set --instances 11 --volumes 11 --networks 11 ' +
                        self.PROJECT_NAME)
         opts = self.get_opts(self.EXPECTED_FIELDS)
         raw_output = self.openstack('quota show ' + self.PROJECT_NAME + opts)
         self.assertEqual("11\n11\n11\n", raw_output)
 
-    @testtools.skip('broken SDK testing')
     def test_quota_show(self):
         raw_output = self.openstack('quota show ' + self.PROJECT_NAME)
         for expected_field in self.EXPECTED_FIELDS:
             self.assertIn(expected_field, raw_output)
 
-    @testtools.skip('broken SDK testing')
     def test_quota_show_default_project(self):
         raw_output = self.openstack('quota show')
         for expected_field in self.EXPECTED_FIELDS:
             self.assertIn(expected_field, raw_output)
 
-    @testtools.skip('broken SDK testing')
     def test_quota_show_with_default_option(self):
         raw_output = self.openstack('quota show --default')
         for expected_field in self.EXPECTED_FIELDS:
diff --git a/openstackclient/tests/functional/network/v2/test_network_agent.py b/openstackclient/tests/functional/network/v2/test_network_agent.py
@@ -10,8 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testtools
-
 from openstackclient.tests.functional import base
 
 
@@ -28,13 +26,11 @@ def test_network_agent_list(cls):
         # get the list of network agent IDs.
         cls.IDs = raw_output.split('\n')
 
-    @testtools.skip('broken SDK testing')
     def test_network_agent_show(self):
         opts = self.get_opts(self.FIELDS)
         raw_output = self.openstack('network agent show ' + self.IDs[0] + opts)
         self.assertEqual(self.IDs[0] + "\n", raw_output)
 
-    @testtools.skip('broken SDK testing')
     def test_network_agent_set(self):
         opts = self.get_opts(['admin_state_up'])
         self.openstack('network agent set --disable ' + self.IDs[0])
diff --git a/openstackclient/tests/functional/network/v2/test_network_qos_policy.py b/openstackclient/tests/functional/network/v2/test_network_qos_policy.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testtools
 import uuid
 
 from openstackclient.tests.functional import base
@@ -26,7 +25,6 @@ class QosPolicyTests(base.TestCase):
     FIELDS = ['name']
 
     @classmethod
-    @testtools.skip('broken SDK testing')
     def setUpClass(cls):
         opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack('network qos policy create ' + cls.NAME +
diff --git a/openstackclient/tests/functional/network/v2/test_port.py b/openstackclient/tests/functional/network/v2/test_port.py
@@ -10,7 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testtools
 import uuid
 
 from openstackclient.tests.functional import base
@@ -24,7 +23,6 @@ class PortTests(base.TestCase):
     FIELDS = ['name']
 
     @classmethod
-    @testtools.skip('broken SDK testing')
     def setUpClass(cls):
         # Create a network for the subnet.
         cls.openstack('network create ' + cls.NETWORK_NAME)
diff --git a/openstackclient/tests/functional/network/v2/test_security_group.py b/openstackclient/tests/functional/network/v2/test_security_group.py
@@ -10,7 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testtools
 import uuid
 
 from openstackclient.tests.functional import base
@@ -24,7 +23,6 @@ class SecurityGroupTests(base.TestCase):
     FIELDS = ['name']
 
     @classmethod
-    @testtools.skip('broken SDK testing')
     def setUpClass(cls):
         opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack('security group create ' + cls.NAME + opts)
diff --git a/openstackclient/tests/functional/network/v2/test_security_group_rule.py b/openstackclient/tests/functional/network/v2/test_security_group_rule.py
@@ -10,7 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import testtools
 import uuid
 
 from openstackclient.tests.functional import base
@@ -25,7 +24,6 @@ class SecurityGroupRuleTests(base.TestCase):
     ID_HEADER = ['ID']
 
     @classmethod
-    @testtools.skip('broken SDK testing')
     def setUpClass(cls):
         # Create the security group to hold the rule.
         opts = cls.get_opts(cls.NAME_FIELD)
@@ -54,15 +52,13 @@ def tearDownClass(cls):
                                    cls.SECURITY_GROUP_NAME)
         cls.assertOutput('', raw_output)
 
-    @testtools.skip('broken SDK testing')
     def test_security_group_rule_list(self):
         opts = self.get_opts(self.ID_HEADER)
         raw_output = self.openstack('security group rule list ' +
                                     self.SECURITY_GROUP_NAME +
                                     opts)
         self.assertIn(self.SECURITY_GROUP_RULE_ID, raw_output)
 
-    @testtools.skip('broken SDK testing')
     def test_security_group_rule_show(self):
         opts = self.get_opts(self.ID_FIELD)
         raw_output = self.openstack('security group rule show ' +
