From fff20da7fa964453a74206d25e8009c1ae202f56 Mon Sep 17 00:00:00 2001 From: Valerii Ponomarov Date: Tue, 10 Dec 2019 21:57:09 +0530 Subject: [py2to3] Add py3 support in 'tests/functional/snapshot' Change-Id: Ie408d7972452123b63eb5cc17c61bc319a99e304 Signed-off-by: Valerii Ponomarov --- .../snapshot/test_validate_snapshot_rebalance.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'tests/functional/snapshot/test_validate_snapshot_rebalance.py') diff --git a/tests/functional/snapshot/test_validate_snapshot_rebalance.py b/tests/functional/snapshot/test_validate_snapshot_rebalance.py index f9e018d64..61cf748b6 100644 --- a/tests/functional/snapshot/test_validate_snapshot_rebalance.py +++ b/tests/functional/snapshot/test_validate_snapshot_rebalance.py @@ -20,7 +20,10 @@ Description : The purpose of this test is to validate snapshot create """ +import sys + from glusto.core import Glusto as g + from glustolibs.gluster.exceptions import ExecutionError from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on from glustolibs.misc.misc_libs import upload_scripts @@ -61,7 +64,7 @@ class SnapCreateRebal(GlusterBaseClass): """ @classmethod def setUpClass(cls): - 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 " @@ -82,7 +85,7 @@ class SnapCreateRebal(GlusterBaseClass): setUp method """ # Setup_Volume - GlusterBaseClass.setUpClass.im_func(self) + self.get_super_method(self, 'setUp')() ret = self.setup_volume_and_mount_volume(mounts=self.mounts, volume_create_force=True) if not ret: @@ -96,7 +99,7 @@ class SnapCreateRebal(GlusterBaseClass): ret, _, _ = snap_delete_all(self.mnode) if not ret: raise ExecutionError("Failed to delete all snaps") - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() # Clean up the volume & mount g.log.info("Starting volume and mount cleanup") @@ -113,13 +116,14 @@ class SnapCreateRebal(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) -- cgit