summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerii Ponomarov <vponomar@redhat.com>2019-12-09 22:01:05 +0530
committerBala Konda Reddy M <bmekala@redhat.com>2019-12-12 11:28:00 +0000
commita7b8abe275c123a4ac980f414ce9ac284d15b3c6 (patch)
treee8728a8929bbae81fca82119f362f77925c35940
parent7f14da0b81d47639803ebb91ff315bf7ba85a3f2 (diff)
[py2to3] Add py3 support in 'tests/functional/disperse'
Change-Id: I308f95d16ac18ec80c5c78aac9152d9ae41449bb Signed-off-by: Valerii Ponomarov <kiparis.kh@gmail.com>
-rw-r--r--tests/functional/disperse/test_ec_add_brick.py19
-rw-r--r--tests/functional/disperse/test_ec_fops.py16
-rw-r--r--tests/functional/disperse/test_ec_remove_brick.py19
-rw-r--r--tests/functional/disperse/test_ec_verify_full_heal.py13
-rw-r--r--tests/functional/disperse/test_nonfop_ecversion.py4
5 files changed, 44 insertions, 27 deletions
diff --git a/tests/functional/disperse/test_ec_add_brick.py b/tests/functional/disperse/test_ec_add_brick.py
index 1c19b83..52efa91 100644
--- a/tests/functional/disperse/test_ec_add_brick.py
+++ b/tests/functional/disperse/test_ec_add_brick.py
@@ -13,7 +13,10 @@
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+import sys
+
from glusto.core import Glusto as g
+
from glustolibs.gluster.gluster_base_class import (GlusterBaseClass,
runs_on)
from glustolibs.gluster.exceptions import ExecutionError
@@ -39,7 +42,7 @@ class DispersedWithAddBrick(GlusterBaseClass):
Setup volume and mount volume
Calling GlusterBaseClass setUpClass
"""
- GlusterBaseClass.setUpClass.im_func(cls)
+ cls.get_super_method(cls, 'setUpClass')()
# Setup Volume and Mount Volume
g.log.info("Starting to Setup and Mount Volume %s",
@@ -82,13 +85,14 @@ class DispersedWithAddBrick(GlusterBaseClass):
for mount_obj in self.mounts:
g.log.info("Starting IO on %s:%s", mount_obj.client_system,
mount_obj.mountpoint)
- cmd = ("python %s create_deep_dirs_with_files "
+ cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
"--dirname-start-num %d "
"--dir-depth 2 "
"--dir-length 10 "
"--max-num-of-dirs 5 "
- "--num-of-files 5 %s" % (self.script_upload_path, count,
- mount_obj.mountpoint))
+ "--num-of-files 5 %s" % (
+ sys.version_info.major, self.script_upload_path, count,
+ mount_obj.mountpoint))
proc = g.run_async(mount_obj.client_system, cmd,
user=mount_obj.user)
all_mounts_procs.append(proc)
@@ -148,13 +152,14 @@ class DispersedWithAddBrick(GlusterBaseClass):
for mount_obj in self.mounts:
g.log.info("Starting IO on %s:%s", mount_obj.client_system,
mount_obj.mountpoint)
- cmd = ("python %s create_deep_dirs_with_files "
+ cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
"--dirname-start-num %d "
"--dir-depth 2 "
"--dir-length 10 "
"--max-num-of-dirs 5 "
- "--num-of-files 5 %s" % (self.script_upload_path, count,
- mount_obj.mountpoint))
+ "--num-of-files 5 %s" % (
+ sys.version_info.major, self.script_upload_path, count,
+ mount_obj.mountpoint))
proc = g.run_async(mount_obj.client_system, cmd,
user=mount_obj.user)
all_mounts_procs.append(proc)
diff --git a/tests/functional/disperse/test_ec_fops.py b/tests/functional/disperse/test_ec_fops.py
index 98d90dd..518635a 100644
--- a/tests/functional/disperse/test_ec_fops.py
+++ b/tests/functional/disperse/test_ec_fops.py
@@ -19,7 +19,10 @@ Test Description:
Tests File Operations on a healthy EC volume
"""
from os import getcwd
+import sys
+
from glusto.core import Glusto as g
+
from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on)
from glustolibs.gluster.exceptions import ExecutionError
from glustolibs.misc.misc_libs import upload_scripts
@@ -36,7 +39,7 @@ class TestFops(GlusterBaseClass):
@classmethod
def setUpClass(cls):
# 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 mounts",
@@ -54,7 +57,7 @@ class TestFops(GlusterBaseClass):
def setUp(self):
# Calling GlusterBaseClass setUp
- GlusterBaseClass.setUp.im_func(self)
+ self.get_super_method(self, 'setUp')()
self.all_mounts_procs = []
self.io_validation_complete = False
@@ -82,7 +85,7 @@ class TestFops(GlusterBaseClass):
g.log.info("Successful in umounting the volume and Cleanup")
# Calling GlusterBaseClass teardown
- GlusterBaseClass.tearDown.im_func(self)
+ self.get_super_method(self, 'tearDown')()
def test_fops_ec_volume(self):
# pylint: disable=too-many-branches,too-many-statements,too-many-locals
@@ -249,13 +252,14 @@ class TestFops(GlusterBaseClass):
for mount_obj in self.mounts:
g.log.info("Starting IO on %s:%s", mount_obj.client_system,
mount_obj.mountpoint)
- cmd = ("python %s create_deep_dirs_with_files "
+ cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
"--dirname-start-num %d "
"--dir-depth 2 "
"--dir-length 10 "
"--max-num-of-dirs 5 "
- "--num-of-files 5 %s" % (self.script_upload_path, count,
- mount_obj.mountpoint))
+ "--num-of-files 5 %s" % (
+ sys.version_info.major, self.script_upload_path, count,
+ mount_obj.mountpoint))
proc = g.run_async(mount_obj.client_system, cmd,
user=mount_obj.user)
all_mounts_procs.append(proc)
diff --git a/tests/functional/disperse/test_ec_remove_brick.py b/tests/functional/disperse/test_ec_remove_brick.py
index cb82388..b664f58 100644
--- a/tests/functional/disperse/test_ec_remove_brick.py
+++ b/tests/functional/disperse/test_ec_remove_brick.py
@@ -13,7 +13,10 @@
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+import sys
+
from glusto.core import Glusto as g
+
from glustolibs.gluster.gluster_base_class import (GlusterBaseClass,
runs_on)
from glustolibs.gluster.exceptions import ExecutionError
@@ -37,7 +40,7 @@ class DispersedWithAddBrick(GlusterBaseClass):
Setup volume and mount volume
Calling GlusterBaseClass setUpClass
"""
- GlusterBaseClass.setUpClass.im_func(cls)
+ cls.get_super_method(cls, 'setUpClass')()
# Setup Volume and Mount Volume
g.log.info("Starting to Setup and Mount Volume %s",
@@ -80,13 +83,14 @@ class DispersedWithAddBrick(GlusterBaseClass):
for mount_obj in self.mounts:
g.log.info("Starting IO on %s:%s", mount_obj.client_system,
mount_obj.mountpoint)
- cmd = ("python %s create_deep_dirs_with_files "
+ cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
"--dirname-start-num %d "
"--dir-depth 2 "
"--dir-length 10 "
"--max-num-of-dirs 5 "
- "--num-of-files 5 %s" % (self.script_upload_path, count,
- mount_obj.mountpoint))
+ "--num-of-files 5 %s" % (
+ sys.version_info.major, self.script_upload_path, count,
+ mount_obj.mountpoint))
proc = g.run_async(mount_obj.client_system, cmd,
user=mount_obj.user)
all_mounts_procs.append(proc)
@@ -128,13 +132,14 @@ class DispersedWithAddBrick(GlusterBaseClass):
for mount_obj in self.mounts:
g.log.info("Starting IO on %s:%s", mount_obj.client_system,
mount_obj.mountpoint)
- cmd = ("python %s create_deep_dirs_with_files "
+ cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
"--dirname-start-num %d "
"--dir-depth 2 "
"--dir-length 10 "
"--max-num-of-dirs 5 "
- "--num-of-files 5 %s" % (self.script_upload_path, count,
- mount_obj.mountpoint))
+ "--num-of-files 5 %s" % (
+ sys.version_info.major, self.script_upload_path, count,
+ mount_obj.mountpoint))
proc = g.run_async(mount_obj.client_system, cmd,
user=mount_obj.user)
all_mounts_procs.append(proc)
diff --git a/tests/functional/disperse/test_ec_verify_full_heal.py b/tests/functional/disperse/test_ec_verify_full_heal.py
index e0074d5..1941b5e 100644
--- a/tests/functional/disperse/test_ec_verify_full_heal.py
+++ b/tests/functional/disperse/test_ec_verify_full_heal.py
@@ -13,8 +13,10 @@
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+import sys
from glusto.core import Glusto as g
+
from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on)
from glustolibs.gluster.exceptions import ExecutionError
from glustolibs.gluster.volume_libs import get_subvols
@@ -36,7 +38,7 @@ class TestHealFull(GlusterBaseClass):
@classmethod
def setUpClass(cls):
# 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 mounts",
@@ -54,7 +56,7 @@ class TestHealFull(GlusterBaseClass):
def setUp(self):
# Calling GlusterBaseClass setUp
- GlusterBaseClass.setUp.im_func(self)
+ self.get_super_method(self, 'setUp')()
# Setup Volumes
if self.volume_type == "distributed-replicated":
@@ -101,7 +103,7 @@ class TestHealFull(GlusterBaseClass):
g.log.info("Successful in umounting the volume and Cleanup")
# Calling GlusterBaseClass teardown
- GlusterBaseClass.tearDown.im_func(self)
+ self.get_super_method(self, 'tearDown')()
def test_heal_full_after_deleting_files(self):
"""
@@ -120,13 +122,14 @@ class TestHealFull(GlusterBaseClass):
mount_obj.client_system, mount_obj.mountpoint)
# Create dirs with file
g.log.info('Creating dirs with file...')
- command = ("python %s create_deep_dirs_with_files "
+ command = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
"-d 2 "
"-l 2 "
"-n 2 "
"-f 20 "
"%s"
- % (self.script_upload_path, mount_obj.mountpoint))
+ % (sys.version_info.major, self.script_upload_path,
+ mount_obj.mountpoint))
proc = g.run_async(mount_obj.client_system, command,
user=mount_obj.user)
diff --git a/tests/functional/disperse/test_nonfop_ecversion.py b/tests/functional/disperse/test_nonfop_ecversion.py
index d005a0c..8f24a4f 100644
--- a/tests/functional/disperse/test_nonfop_ecversion.py
+++ b/tests/functional/disperse/test_nonfop_ecversion.py
@@ -32,7 +32,7 @@ class TestEcVersion(GlusterBaseClass):
def setUp(self):
# Calling GlusterBaseClass setUp
- GlusterBaseClass.setUp.im_func(self)
+ self.get_super_method(self, 'setUp')()
self.all_mounts_procs = []
self.io_validation_complete = False
@@ -58,7 +58,7 @@ class TestEcVersion(GlusterBaseClass):
g.log.info("Successful in umounting the volume and Cleanup")
# Calling GlusterBaseClass teardown
- GlusterBaseClass.tearDown.im_func(self)
+ self.get_super_method(self, 'tearDown')()
def test_ec_version_nonfop(self):
# pylint: disable=too-many-statements,too-many-branches,too-many-locals