commit 83ccf6a2fe3a2f1de35dbf6d907672b796547686
author Jenkins <jenkins@review.openstack.org> Wed Jan 13 13:27:03 2016 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jan 13 13:27:03 2016 +0000
tree 0cbcdfcd21111bc1cd8d71404ec18d50fd17a105
parent 5113d874d2e3aef210a720e01e44a175c943bbdc
parent 41f3f8519e6b5b6f91bdb21ecdc94fd70bc7aafc

Merge "Skip security group tests without secgroup ext"

tempest/scenario/test_security_groups_basic_ops.py

diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py
index 0185899..8375d05 100644
--- a/tempest/scenario/test_security_groups_basic_ops.py
+++ b/tempest/scenario/test_security_groups_basic_ops.py
@@ -133,6 +133,9 @@
             msg = ('Either tenant_networks_reachable must be "true", or '
                    'public_network_id must be defined.')
             raise cls.skipException(msg)
+        if not test.is_extension_enabled('security-group', 'network'):
+            msg = "security-group extension not enabled."
+            raise cls.skipException(msg)
 
     @classmethod
     def setup_credentials(cls):