From 37155292140a9ad4e19ab87cd026274893df8872 Mon Sep 17 00:00:00 2001 From: Valerii Ponomarov Date: Sat, 30 Nov 2019 01:10:19 +0530 Subject: [py2to3] Add py3 support for tests in 'tests/functional/bvt' Change-Id: I8b8aad4c3e4a2ad924478f1842498289323b7098 Signed-off-by: Valerii Ponomarov --- tests/functional/bvt/test_basic.py | 4 ++-- tests/functional/bvt/test_cvt.py | 6 +++--- tests/functional/bvt/test_vvt.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/functional') diff --git a/tests/functional/bvt/test_basic.py b/tests/functional/bvt/test_basic.py index 4dbb23cb5..a031850cf 100644 --- a/tests/functional/bvt/test_basic.py +++ b/tests/functional/bvt/test_basic.py @@ -32,7 +32,7 @@ class TestGlusterdSanity(GlusterBaseClass): """setUp required for tests """ # Calling GlusterBaseClass setUp - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() # Defining this variable to check if restart glusterd is required # in teardown @@ -128,4 +128,4 @@ class TestGlusterdSanity(GlusterBaseClass): g.log.info("All peers are in connected state") # Calling GlusterBaseClass tearDown - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() diff --git a/tests/functional/bvt/test_cvt.py b/tests/functional/bvt/test_cvt.py index 05578b400..d774400c6 100644 --- a/tests/functional/bvt/test_cvt.py +++ b/tests/functional/bvt/test_cvt.py @@ -71,7 +71,7 @@ class GlusterBasicFeaturesSanityBaseClass(GlusterBaseClass): """Upload the necessary scripts to run tests. """ # Calling GlusterBaseClass setUpClass - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Upload io scripts for running IO on mounts g.log.info("Upload io scripts to clients %s for running IO on " @@ -108,7 +108,7 @@ class GlusterBasicFeaturesSanityBaseClass(GlusterBaseClass): - IO creates deep dirs and files. """ # Calling GlusterBaseClass setUp - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() # Setup Volume and Mount Volume g.log.info("Starting to Setup Volume and Mount Volume") @@ -172,7 +172,7 @@ class GlusterBasicFeaturesSanityBaseClass(GlusterBaseClass): g.log.info("Successful in Unmount Volume and Cleanup Volume") # Calling GlusterBaseClass tearDown - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() @runs_on([['replicated', 'distributed', 'distributed-replicated', diff --git a/tests/functional/bvt/test_vvt.py b/tests/functional/bvt/test_vvt.py index 8b3b69bf3..9534f053a 100644 --- a/tests/functional/bvt/test_vvt.py +++ b/tests/functional/bvt/test_vvt.py @@ -46,7 +46,7 @@ class VolumeAccessibilityTests(GlusterBaseClass): """Upload the necessary scripts to run tests. """ # Calling GlusterBaseClass setUpClass - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Upload io scripts for running IO on mounts g.log.info("Upload io scripts to clients %s for running IO on " @@ -66,7 +66,7 @@ class VolumeAccessibilityTests(GlusterBaseClass): """Setup Volume """ # Calling GlusterBaseClass setUp - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() # Setup_Volume g.log.info("Starting to Setup Volume %s", self.volname) @@ -86,7 +86,7 @@ class VolumeAccessibilityTests(GlusterBaseClass): g.log.info("Successful in Setup Volume %s", self.volname) # Calling GlusterBaseClass tearDown - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() @pytest.mark.bvt_vvt def test_volume_create_start_stop_start(self): -- cgit