Move skipping conditions under skip_checks method
Skipping conditions should placed under 'skip_checks'
method rather than 'resource_setup' method.
Change-Id: Ie5d776baa7f0cc7f3774dfcedbfc4ef8e3acf44c
diff --git a/manila_tempest_tests/tests/api/test_rules.py b/manila_tempest_tests/tests/api/test_rules.py
index dc63429..7ad57a9 100644
--- a/manila_tempest_tests/tests/api/test_rules.py
+++ b/manila_tempest_tests/tests/api/test_rules.py
@@ -81,12 +81,16 @@
protocol = "nfs"
@classmethod
- def resource_setup(cls):
- super(ShareIpRulesForNFSTest, cls).resource_setup()
+ def skip_checks(cls):
+ super(ShareIpRulesForNFSTest, cls).skip_checks()
if (cls.protocol not in CONF.share.enable_protocols or
cls.protocol not in CONF.share.enable_ip_rules_for_protocols):
msg = "IP rule tests for %s protocol are disabled" % cls.protocol
raise cls.skipException(msg)
+
+ @classmethod
+ def resource_setup(cls):
+ super(ShareIpRulesForNFSTest, cls).resource_setup()
# create share type
cls.share_type = cls._create_share_type()
cls.share_type_id = cls.share_type['id']
@@ -230,13 +234,18 @@
protocol = "nfs"
@classmethod
- def resource_setup(cls):
- super(ShareUserRulesForNFSTest, cls).resource_setup()
+ def skip_checks(cls):
+ super(ShareUserRulesForNFSTest, cls).skip_checks()
if (cls.protocol not in CONF.share.enable_protocols or
cls.protocol not in
CONF.share.enable_user_rules_for_protocols):
msg = "USER rule tests for %s protocol are disabled" % cls.protocol
raise cls.skipException(msg)
+
+ @classmethod
+ def resource_setup(cls):
+ super(ShareUserRulesForNFSTest, cls).resource_setup()
+
# create share type
cls.share_type = cls._create_share_type()
cls.share_type_id = cls.share_type['id']
@@ -320,13 +329,17 @@
protocol = "glusterfs"
@classmethod
- def resource_setup(cls):
- super(ShareCertRulesForGLUSTERFSTest, cls).resource_setup()
+ def skip_checks(cls):
+ super(ShareCertRulesForGLUSTERFSTest, cls).skip_checks()
if (cls.protocol not in CONF.share.enable_protocols or
cls.protocol not in
CONF.share.enable_cert_rules_for_protocols):
msg = "Cert rule tests for %s protocol are disabled" % cls.protocol
raise cls.skipException(msg)
+
+ @classmethod
+ def resource_setup(cls):
+ super(ShareCertRulesForGLUSTERFSTest, cls).resource_setup()
# create share type
cls.share_type = cls._create_share_type()
cls.share_type_id = cls.share_type['id']
@@ -436,14 +449,18 @@
protocol = "cephfs"
@classmethod
- def resource_setup(cls):
- super(ShareCephxRulesForCephFSTest, cls).resource_setup()
+ def skip_checks(cls):
+ super(ShareCephxRulesForCephFSTest, cls).skip_checks()
if (cls.protocol not in CONF.share.enable_protocols or
cls.protocol not in
CONF.share.enable_cephx_rules_for_protocols):
msg = ("Cephx rule tests for %s protocol are disabled." %
cls.protocol)
raise cls.skipException(msg)
+
+ @classmethod
+ def resource_setup(cls):
+ super(ShareCephxRulesForCephFSTest, cls).resource_setup()
# create share type
cls.share_type = cls._create_share_type()
cls.share_type_id = cls.share_type['id']
@@ -483,8 +500,8 @@
class ShareRulesTest(base.BaseSharesMixedTest):
@classmethod
- def resource_setup(cls):
- super(ShareRulesTest, cls).resource_setup()
+ def skip_checks(cls):
+ super(ShareRulesTest, cls).skip_checks()
if not (any(p in CONF.share.enable_ip_rules_for_protocols
for p in cls.protocols) or
any(p in CONF.share.enable_user_rules_for_protocols
@@ -495,6 +512,10 @@
for p in cls.protocols)):
cls.message = "Rule tests are disabled"
raise cls.skipException(cls.message)
+
+ @classmethod
+ def resource_setup(cls):
+ super(ShareRulesTest, cls).resource_setup()
if CONF.share.enable_ip_rules_for_protocols:
cls.protocol = CONF.share.enable_ip_rules_for_protocols[0]
cls.access_type = "ip"