commit 7120a4b009006ff712a34cf67372fb269f09a9c2
author Jenkins <jenkins@review.openstack.org> Tue May 06 04:37:10 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue May 06 04:37:10 2014 +0000
tree 805fcd72099c4c1079a792c2ca47ec32fa846607
parent 492a768060333ac2687e43219a306e597dd83c95
parent 649d8c03d77c4726a6456ee391665002dfcb714f

Merge "Skip creation of network resources for disabled IPv6 tests"

tempest/api/network/test_networks.py

diff --git a/tempest/api/network/test_networks.py b/tempest/api/network/test_networks.py
index de44f4d..00754e4 100644
--- a/tempest/api/network/test_networks.py
+++ b/tempest/api/network/test_networks.py
@@ -364,11 +364,10 @@
 
     @classmethod
     def setUpClass(cls):
-        super(NetworksIpV6TestJSON, cls).setUpClass()
         if not CONF.network_feature_enabled.ipv6:
-            cls.tearDownClass()
             skip_msg = "IPv6 Tests are disabled."
             raise cls.skipException(skip_msg)
+        super(NetworksIpV6TestJSON, cls).setUpClass()
 
 
 class NetworksIpV6TestXML(NetworksIpV6TestJSON):

tempest/api/network/test_ports.py

diff --git a/tempest/api/network/test_ports.py b/tempest/api/network/test_ports.py
index e924585..e6e6ea1 100644
--- a/tempest/api/network/test_ports.py
+++ b/tempest/api/network/test_ports.py
@@ -288,11 +288,10 @@
 
     @classmethod
     def setUpClass(cls):
-        super(PortsAdminExtendedAttrsIpV6TestJSON, cls).setUpClass()
         if not CONF.network_feature_enabled.ipv6:
-            cls.tearDownClass()
             skip_msg = "IPv6 Tests are disabled."
             raise cls.skipException(skip_msg)
+        super(PortsAdminExtendedAttrsIpV6TestJSON, cls).setUpClass()
 
 
 class PortsAdminExtendedAttrsIpV6TestXML(