From 7f14da0b81d47639803ebb91ff315bf7ba85a3f2 Mon Sep 17 00:00:00 2001 From: Valerii Ponomarov Date: Mon, 9 Dec 2019 22:41:38 +0530 Subject: [py2to3] Add py3 support in 'tests/functional/glusterfind' Change-Id: I5b36fe5144ebca05d17fb14e05b5dc75c63f7a29 Signed-off-by: Valerii Ponomarov --- tests/functional/glusterfind/test_gfind_create_cli.py | 4 ++-- tests/functional/glusterfind/test_gfind_delete_cli.py | 8 ++++---- tests/functional/glusterfind/test_gfind_delete_file.py | 8 ++++---- tests/functional/glusterfind/test_gfind_post_cli.py | 6 +++--- tests/functional/glusterfind/test_gfind_pre_cli.py | 8 ++++---- tests/functional/glusterfind/test_gfind_query_cli.py | 8 ++++---- tests/functional/glusterfind/test_gfind_rename.py | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/functional/glusterfind/test_gfind_create_cli.py b/tests/functional/glusterfind/test_gfind_create_cli.py index d3cfd09cf..fe5a56012 100644 --- a/tests/functional/glusterfind/test_gfind_create_cli.py +++ b/tests/functional/glusterfind/test_gfind_create_cli.py @@ -36,7 +36,7 @@ class TestGlusterFindCreateCLI(GlusterBaseClass): """ # calling GlusterBaseClass setUpClass - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() # Setup Volume and Mount Volume g.log.info("Starting to Setup %s", self.volname) @@ -67,7 +67,7 @@ class TestGlusterFindCreateCLI(GlusterBaseClass): g.log.info("Successful in Cleanup Volume") # Calling GlusterBaseClass tearDown - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() def test_gfind_create_cli(self): """ diff --git a/tests/functional/glusterfind/test_gfind_delete_cli.py b/tests/functional/glusterfind/test_gfind_delete_cli.py index 69e392070..ac56c19b1 100644 --- a/tests/functional/glusterfind/test_gfind_delete_cli.py +++ b/tests/functional/glusterfind/test_gfind_delete_cli.py @@ -36,8 +36,8 @@ class GlusterFindDeleteCLI(GlusterBaseClass): Setup volume and mount volume """ - # calling GlusterBaseClass setUpClass - GlusterBaseClass.setUp.im_func(self) + # calling GlusterBaseClass setUp + self.get_super_method(self, 'setUp')() # Setup Volume and Mount Volume g.log.info("Starting to Setup %s", self.volname) @@ -73,8 +73,8 @@ class GlusterFindDeleteCLI(GlusterBaseClass): raise ExecutionError("Failed to Cleanup Volume") g.log.info("Successful in Cleanup Volume") - # calling GlusterBaseClass tearDownClass - GlusterBaseClass.tearDown.im_func(self) + # calling GlusterBaseClass tearDown + self.get_super_method(self, 'tearDown')() def test_gfind_delete_cli(self): """ diff --git a/tests/functional/glusterfind/test_gfind_delete_file.py b/tests/functional/glusterfind/test_gfind_delete_file.py index 997d26a31..df02184b5 100644 --- a/tests/functional/glusterfind/test_gfind_delete_file.py +++ b/tests/functional/glusterfind/test_gfind_delete_file.py @@ -43,8 +43,8 @@ class TestGlusterFindDeletes(GlusterBaseClass): Initiate necessary variables """ - # calling GlusterBaseClass setUpClass - GlusterBaseClass.setUp.im_func(self) + # calling GlusterBaseClass setUp + self.get_super_method(self, 'setUp')() # Setup Volume and Mount Volume g.log.info("Starting to Setup %s", self.volname) @@ -99,8 +99,8 @@ class TestGlusterFindDeletes(GlusterBaseClass): raise ExecutionError("Failed to Cleanup Volume") g.log.info("Successful in Cleanup Volume") - # calling GlusterBaseClass tearDownClass - GlusterBaseClass.tearDown.im_func(self) + # calling GlusterBaseClass tearDown + self.get_super_method(self, 'tearDown')() def test_gfind_deletes(self): """ diff --git a/tests/functional/glusterfind/test_gfind_post_cli.py b/tests/functional/glusterfind/test_gfind_post_cli.py index 250e6920c..0daf46201 100644 --- a/tests/functional/glusterfind/test_gfind_post_cli.py +++ b/tests/functional/glusterfind/test_gfind_post_cli.py @@ -42,7 +42,7 @@ class TestGlusterFindPostCLI(GlusterBaseClass): """ # calling GlusterBaseClass setUpClass - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() # Setup Volume and Mount Volume g.log.info("Starting to Setup %s", self.volname) @@ -77,8 +77,8 @@ class TestGlusterFindPostCLI(GlusterBaseClass): raise ExecutionError("Failed to Cleanup Volume") g.log.info("Successful in Cleanup Volume") - # calling GlusterBaseClass tearDownClass - GlusterBaseClass.tearDown.im_func(self) + # calling GlusterBaseClass tearDown + self.get_super_method(self, 'tearDown')() def test_gfind_post_cli(self): """ diff --git a/tests/functional/glusterfind/test_gfind_pre_cli.py b/tests/functional/glusterfind/test_gfind_pre_cli.py index 99bb38825..8165bad7f 100644 --- a/tests/functional/glusterfind/test_gfind_pre_cli.py +++ b/tests/functional/glusterfind/test_gfind_pre_cli.py @@ -41,8 +41,8 @@ class TestGlusterFindPreCLI(GlusterBaseClass): Initiate necessary variables """ - # calling GlusterBaseClass setUpClass - GlusterBaseClass.setUp.im_func(self) + # calling GlusterBaseClass setUp + self.get_super_method(self, 'setUp')() # Setup Volume and Mount Volume g.log.info("Starting to Setup %s", self.volname) @@ -77,8 +77,8 @@ class TestGlusterFindPreCLI(GlusterBaseClass): raise ExecutionError("Failed to Cleanup Volume") g.log.info("Successful in Cleanup Volume") - # calling GlusterBaseClass tearDownClass - GlusterBaseClass.tearDown.im_func(self) + # calling GlusterBaseClass tearDown + self.get_super_method(self, 'tearDown')() def test_gfind_pre_cli(self): """ diff --git a/tests/functional/glusterfind/test_gfind_query_cli.py b/tests/functional/glusterfind/test_gfind_query_cli.py index b8d764e0f..ef9b431c2 100644 --- a/tests/functional/glusterfind/test_gfind_query_cli.py +++ b/tests/functional/glusterfind/test_gfind_query_cli.py @@ -37,8 +37,8 @@ class TestGlusterFindQueryCLI(GlusterBaseClass): Initiate necessary variables """ - # calling GlusterBaseClass setUpClass - GlusterBaseClass.setUp.im_func(self) + # calling GlusterBaseClass setUp + self.get_super_method(self, 'setUp')() # Setup Volume and Mount Volume g.log.info("Starting to Setup %s", self.volname) @@ -66,8 +66,8 @@ class TestGlusterFindQueryCLI(GlusterBaseClass): raise ExecutionError("Failed to Cleanup Volume") g.log.info("Successful in Cleanup Volume") - # calling GlusterBaseClass tearDownClass - GlusterBaseClass.tearDown.im_func(self) + # calling GlusterBaseClass tearDown + self.get_super_method(self, 'tearDown')() def test_gfind_query_cli(self): """ diff --git a/tests/functional/glusterfind/test_gfind_rename.py b/tests/functional/glusterfind/test_gfind_rename.py index 53dbee806..88e526155 100644 --- a/tests/functional/glusterfind/test_gfind_rename.py +++ b/tests/functional/glusterfind/test_gfind_rename.py @@ -44,8 +44,8 @@ class TestGlusterFindRenames(GlusterBaseClass): Initiate necessary variables """ - # calling GlusterBaseClass setUpClass - GlusterBaseClass.setUp.im_func(self) + # calling GlusterBaseClass setUp + self.get_super_method(self, 'setUp')() # Setup Volume and Mount Volume g.log.info("Starting to Setup %s", self.volname) @@ -100,8 +100,8 @@ class TestGlusterFindRenames(GlusterBaseClass): raise ExecutionError("Failed to Cleanup Volume") g.log.info("Successful in Cleanup Volume") - # calling GlusterBaseClass tearDownClass - GlusterBaseClass.tearDown.im_func(self) + # calling GlusterBaseClass tearDown + self.get_super_method(self, 'tearDown')() def test_gfind_renames(self): """ -- cgit