From c0831bdd436d389fe45b3d8fa9061fe3d6827d10 Mon Sep 17 00:00:00 2001 From: Valerii Ponomarov Date: Fri, 29 Nov 2019 21:57:12 +0530 Subject: [py2to3] Add py3 support for tests in 'tests/functional/authentication' Change-Id: I1c568a43bb635720a4aedc75ba844a4f499130fe Signed-off-by: Valerii Ponomarov --- tests/functional/authentication/test_auth_allow.py | 2 +- tests/functional/authentication/test_auth_invalid_values.py | 2 +- tests/functional/authentication/test_auth_reject_allow.py | 2 +- tests/functional/authentication/test_authentication_allow_blank.py | 2 +- tests/functional/authentication/test_fusereject.py | 4 ++-- tests/functional/authentication/test_verify_auth_reject_precedence.py | 2 +- tests/functional/authentication/test_vol_auth.py | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/functional/authentication') diff --git a/tests/functional/authentication/test_auth_allow.py b/tests/functional/authentication/test_auth_allow.py index 41e0e78f5..194ea189c 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 ddda9a1f1..7fd514b71 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 9dd519f1d..083b08e1b 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 d9b87ed5f..dab0baab3 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 5b403f4ed..19bafdff7 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 a98b29937..d51e61443 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 bb3da6f96..646ab3520 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): """ -- cgit