summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerii Ponomarov <vponomar@redhat.com>2019-12-09 22:41:38 +0530
committerBala Konda Reddy M <bmekala@redhat.com>2019-12-12 11:26:21 +0000
commit7f14da0b81d47639803ebb91ff315bf7ba85a3f2 (patch)
tree0b305c4a1647c932e270b8870763e4adfd765213
parentc0831bdd436d389fe45b3d8fa9061fe3d6827d10 (diff)
[py2to3] Add py3 support in 'tests/functional/glusterfind'
Change-Id: I5b36fe5144ebca05d17fb14e05b5dc75c63f7a29 Signed-off-by: Valerii Ponomarov <kiparis.kh@gmail.com>
-rw-r--r--tests/functional/glusterfind/test_gfind_create_cli.py4
-rw-r--r--tests/functional/glusterfind/test_gfind_delete_cli.py8
-rw-r--r--tests/functional/glusterfind/test_gfind_delete_file.py8
-rw-r--r--tests/functional/glusterfind/test_gfind_post_cli.py6
-rw-r--r--tests/functional/glusterfind/test_gfind_pre_cli.py8
-rw-r--r--tests/functional/glusterfind/test_gfind_query_cli.py8
-rw-r--r--tests/functional/glusterfind/test_gfind_rename.py8
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 d3cfd09..fe5a560 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 69e3920..ac56c19 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 997d26a..df02184 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 250e692..0daf462 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 99bb388..8165bad 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 b8d764e..ef9b431 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 53dbee8..88e5261 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):
"""