diff --git a/tempest/scenario/test_load_balancer_basic.py b/tempest/scenario/test_load_balancer_basic.py index 4b2dacdda2..57a5406f52 100644 --- a/tempest/scenario/test_load_balancer_basic.py +++ b/tempest/scenario/test_load_balancer_basic.py @@ -48,12 +48,10 @@ class TestLoadBalancerBasic(manager.NetworkScenarioTest): cfg = config.network if not test.is_extension_enabled('lbaas', 'network'): msg = 'LBaaS Extension is not enabled' - cls.enabled = False raise cls.skipException(msg) if not (cfg.tenant_networks_reachable or cfg.public_network_id): msg = ('Either tenant_networks_reachable must be "true", or ' 'public_network_id must be defined.') - cls.enabled = False raise cls.skipException(msg) @classmethod diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py index 61c710e049..194a0bd393 100644 --- a/tempest/scenario/test_network_advanced_server_ops.py +++ b/tempest/scenario/test_network_advanced_server_ops.py @@ -46,7 +46,6 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest): or CONF.network.public_network_id): msg = ('Either tenant_networks_reachable must be "true", or ' 'public_network_id must be defined.') - cls.enabled = False raise cls.skipException(msg) @classmethod diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py index 98e3fda553..30c3b9decd 100644 --- a/tempest/scenario/test_network_basic_ops.py +++ b/tempest/scenario/test_network_basic_ops.py @@ -83,7 +83,6 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest): or CONF.network.public_network_id): msg = ('Either tenant_networks_reachable must be "true", or ' 'public_network_id must be defined.') - cls.enabled = False raise cls.skipException(msg) @classmethod diff --git a/tempest/scenario/test_network_v6.py b/tempest/scenario/test_network_v6.py index c9f1fe1e2a..f3b2290d26 100644 --- a/tempest/scenario/test_network_v6.py +++ b/tempest/scenario/test_network_v6.py @@ -42,14 +42,13 @@ class TestGettingAddress(manager.NetworkScenarioTest): def check_preconditions(cls): if not (CONF.network_feature_enabled.ipv6 and CONF.network_feature_enabled.ipv6_subnet_attributes): - cls.enabled = False raise cls.skipException('IPv6 or its attributes not supported') if not (CONF.network.tenant_networks_reachable or CONF.network.public_network_id): msg = ('Either tenant_networks_reachable must be "true", or ' 'public_network_id must be defined.') - cls.enabled = False raise cls.skipException(msg) + super(TestGettingAddress, cls).check_preconditions() def setUp(self): diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py index d8f7a2602d..5e2a9d001e 100644 --- a/tempest/scenario/test_security_groups_basic_ops.py +++ b/tempest/scenario/test_security_groups_basic_ops.py @@ -116,14 +116,12 @@ class TestSecurityGroupsBasicOps(manager.NetworkScenarioTest): def check_preconditions(cls): if CONF.baremetal.driver_enabled: msg = ('Not currently supported by baremetal.') - cls.enabled = False raise cls.skipException(msg) super(TestSecurityGroupsBasicOps, cls).check_preconditions() if not (CONF.network.tenant_networks_reachable or CONF.network.public_network_id): msg = ('Either tenant_networks_reachable must be "true", or ' 'public_network_id must be defined.') - cls.enabled = False raise cls.skipException(msg) @classmethod