summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerii Ponomarov <vponomar@redhat.com>2019-11-29 21:57:12 +0530
committerBala Konda Reddy M <bmekala@redhat.com>2019-12-12 11:25:22 +0000
commitc0831bdd436d389fe45b3d8fa9061fe3d6827d10 (patch)
treee83a445292840c8c69fc1523d41813976c645cee
parent5f9e15da17669665fc7a5f8d2d306082372e967e (diff)
[py2to3] Add py3 support for tests in 'tests/functional/authentication'
Change-Id: I1c568a43bb635720a4aedc75ba844a4f499130fe Signed-off-by: Valerii Ponomarov <kiparis.kh@gmail.com>
-rw-r--r--tests/functional/authentication/test_auth_allow.py2
-rw-r--r--tests/functional/authentication/test_auth_invalid_values.py2
-rw-r--r--tests/functional/authentication/test_auth_reject_allow.py2
-rw-r--r--tests/functional/authentication/test_authentication_allow_blank.py2
-rw-r--r--tests/functional/authentication/test_fusereject.py4
-rw-r--r--tests/functional/authentication/test_verify_auth_reject_precedence.py2
-rw-r--r--tests/functional/authentication/test_vol_auth.py4
7 files changed, 9 insertions, 9 deletions
diff --git a/tests/functional/authentication/test_auth_allow.py b/tests/functional/authentication/test_auth_allow.py
index 41e0e78..194ea18 100644
--- a/tests/functional/authentication/test_auth_allow.py
+++ b/tests/functional/authentication/test_auth_allow.py
@@ -36,7 +36,7 @@ class FuseAuthAllow(GlusterBaseClass):
"""
Create and start volume
"""
- GlusterBaseClass.setUpClass.im_func(cls)
+ cls.get_super_method(cls, 'setUpClass')()
# Create and start volume
g.log.info("Starting volume setup process %s", cls.volname)
ret = cls.setup_volume()
diff --git a/tests/functional/authentication/test_auth_invalid_values.py b/tests/functional/authentication/test_auth_invalid_values.py
index ddda9a1..7fd514b 100644
--- a/tests/functional/authentication/test_auth_invalid_values.py
+++ b/tests/functional/authentication/test_auth_invalid_values.py
@@ -40,7 +40,7 @@ class AuthInvalidValues(GlusterBaseClass):
"""
Create and start volume
"""
- GlusterBaseClass.setUpClass.im_func(cls)
+ cls.get_super_method(cls, 'setUpClass')()
# Create and start volume
g.log.info("Starting volume setup process %s", cls.volname)
ret = cls.setup_volume()
diff --git a/tests/functional/authentication/test_auth_reject_allow.py b/tests/functional/authentication/test_auth_reject_allow.py
index 9dd519f..083b08e 100644
--- a/tests/functional/authentication/test_auth_reject_allow.py
+++ b/tests/functional/authentication/test_auth_reject_allow.py
@@ -40,7 +40,7 @@ class FuseAuthRejectAllow(GlusterBaseClass):
"""
Create and start volume
"""
- GlusterBaseClass.setUpClass.im_func(cls)
+ cls.get_super_method(cls, 'setUpClass')()
# Create and start volume
g.log.info("Starting volume setup process %s", cls.volname)
ret = cls.setup_volume()
diff --git a/tests/functional/authentication/test_authentication_allow_blank.py b/tests/functional/authentication/test_authentication_allow_blank.py
index d9b87ed..dab0baa 100644
--- a/tests/functional/authentication/test_authentication_allow_blank.py
+++ b/tests/functional/authentication/test_authentication_allow_blank.py
@@ -44,7 +44,7 @@ class AuthAllowEmptyString(GlusterBaseClass):
g.log.info("Volume %s has been setup successfully", self.volname)
# Calling GlusterBaseClass Setup
- GlusterBaseClass.setUp.im_func(self)
+ self.get_super_method(self, 'setUp')()
def test_validate_authallow(self):
"""
diff --git a/tests/functional/authentication/test_fusereject.py b/tests/functional/authentication/test_fusereject.py
index 5b403f4..19bafdf 100644
--- a/tests/functional/authentication/test_fusereject.py
+++ b/tests/functional/authentication/test_fusereject.py
@@ -51,7 +51,7 @@ class AuthRejectVol(GlusterBaseClass):
raise ExecutionError("Volume has not Started")
g.log.info("Volume is started")
# Calling GlusterBaseClass Setup
- GlusterBaseClass.setUp.im_func(self)
+ self.get_super_method(self, 'setUp')()
def tearDown(self):
"""
@@ -73,7 +73,7 @@ class AuthRejectVol(GlusterBaseClass):
": %s", self.volname)
# Calling GlusterBaseClass tearDown
- GlusterBaseClass.tearDown.im_func(self)
+ self.get_super_method(self, 'tearDown')()
def test_validate_authreject_vol(self):
"""
diff --git a/tests/functional/authentication/test_verify_auth_reject_precedence.py b/tests/functional/authentication/test_verify_auth_reject_precedence.py
index a98b299..d51e614 100644
--- a/tests/functional/authentication/test_verify_auth_reject_precedence.py
+++ b/tests/functional/authentication/test_verify_auth_reject_precedence.py
@@ -39,7 +39,7 @@ class VerifyAuthRejectPrecedence(GlusterBaseClass):
"""
Create and start volume
"""
- GlusterBaseClass.setUpClass.im_func(cls)
+ cls.get_super_method(cls, 'setUpClass')()
# Create and start volume
g.log.info("Starting volume setup process %s", cls.volname)
ret = cls.setup_volume()
diff --git a/tests/functional/authentication/test_vol_auth.py b/tests/functional/authentication/test_vol_auth.py
index bb3da6f..646ab35 100644
--- a/tests/functional/authentication/test_vol_auth.py
+++ b/tests/functional/authentication/test_vol_auth.py
@@ -50,7 +50,7 @@ class AuthRejectVol(GlusterBaseClass):
raise ExecutionError("Volume has not Started")
g.log.info("Volume is started.")
# Calling GlusterBaseClass Setup
- GlusterBaseClass.setUp.im_func(self)
+ self.get_super_method(self, 'setUp')()
def tearDown(self):
# tearDown for every test
@@ -63,7 +63,7 @@ class AuthRejectVol(GlusterBaseClass):
": %s", self.volname)
# Calling GlusterBaseClass tearDown
- GlusterBaseClass.tearDown.im_func(self)
+ self.get_super_method(self, 'tearDown')()
def test_validate_authreject_vol(self):
"""