diff options
author | Valerii Ponomarov <vponomar@redhat.com> | 2019-12-09 22:29:05 +0530 |
---|---|---|
committer | Bala Konda Reddy M <bmekala@redhat.com> | 2019-12-12 11:35:30 +0000 |
commit | 79e82b1f04184d895638a78c7c57ea49d936efe7 (patch) | |
tree | c96902c06a689418378d9afc9bba3774c24a6539 | |
parent | a3ea01c342573a02f7717960affa51ed141d7737 (diff) |
[py2to3] Add py3 support in 'tests/functional/fuse_subdir'
Change-Id: I56194047ac6105cddb43d3f413b03bcdbbcde587
Signed-off-by: Valerii Ponomarov <kiparis.kh@gmail.com>
14 files changed, 56 insertions, 32 deletions
diff --git a/tests/functional/fuse_subdir/test_auth_allow_fqdn.py b/tests/functional/fuse_subdir/test_auth_allow_fqdn.py index 5428ea913..b8149acdc 100644 --- a/tests/functional/fuse_subdir/test_auth_allow_fqdn.py +++ b/tests/functional/fuse_subdir/test_auth_allow_fqdn.py @@ -38,7 +38,7 @@ class FuseSubDirAuthAllowFqdn(GlusterBaseClass): """ Setup and mount volume """ - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Setup Volume and Mount Volume g.log.info("Starting volume setup and mount %s", cls.volname) diff --git a/tests/functional/fuse_subdir/test_auth_allow_ip_fqdn.py b/tests/functional/fuse_subdir/test_auth_allow_ip_fqdn.py index bd980e63a..897a108a8 100644 --- a/tests/functional/fuse_subdir/test_auth_allow_ip_fqdn.py +++ b/tests/functional/fuse_subdir/test_auth_allow_ip_fqdn.py @@ -39,7 +39,7 @@ class AuthAllowIpFqdn(GlusterBaseClass): """ Create and start volume """ - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Create and start volume g.log.info("Starting volume setup process %s", cls.volname) ret = cls.setup_volume() diff --git a/tests/functional/fuse_subdir/test_auth_reject.py b/tests/functional/fuse_subdir/test_auth_reject.py index 609e26dd0..65ef338e1 100644 --- a/tests/functional/fuse_subdir/test_auth_reject.py +++ b/tests/functional/fuse_subdir/test_auth_reject.py @@ -38,7 +38,7 @@ class FuseSubDirAuthReject(GlusterBaseClass): """ Setup and mount volume """ - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Setup Volume and Mount Volume g.log.info("Starting volume setup and mount %s", cls.volname) diff --git a/tests/functional/fuse_subdir/test_fusesubdir_rename.py b/tests/functional/fuse_subdir/test_fusesubdir_rename.py index 91f38e466..ee8199cf4 100644 --- a/tests/functional/fuse_subdir/test_fusesubdir_rename.py +++ b/tests/functional/fuse_subdir/test_fusesubdir_rename.py @@ -14,7 +14,10 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import copy +import sys + from glusto.core import Glusto as g + from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) from glustolibs.gluster.mount_ops import (mount_volume, @@ -41,7 +44,7 @@ class SubdirWithRename(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", @@ -135,13 +138,14 @@ class SubdirWithRename(GlusterBaseClass): for mount_obj in self.subdir_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/fuse_subdir/test_fusesubdir_with_addbrick.py b/tests/functional/fuse_subdir/test_fusesubdir_with_addbrick.py index 13a21becc..e00666121 100644 --- a/tests/functional/fuse_subdir/test_fusesubdir_with_addbrick.py +++ b/tests/functional/fuse_subdir/test_fusesubdir_with_addbrick.py @@ -14,7 +14,10 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import copy +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 @@ -43,7 +46,7 @@ class SubdirWithAddBrick(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", @@ -133,13 +136,14 @@ class SubdirWithAddBrick(GlusterBaseClass): for mount_obj in self.subdir_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/fuse_subdir/test_fusesubdir_with_quota_objects.py b/tests/functional/fuse_subdir/test_fusesubdir_with_quota_objects.py index 01ca474f2..a3810f160 100644 --- a/tests/functional/fuse_subdir/test_fusesubdir_with_quota_objects.py +++ b/tests/functional/fuse_subdir/test_fusesubdir_with_quota_objects.py @@ -43,7 +43,7 @@ class SubdirWithQuotaObject(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", diff --git a/tests/functional/fuse_subdir/test_fusesubdir_with_removebrick.py b/tests/functional/fuse_subdir/test_fusesubdir_with_removebrick.py index 1b43ac668..3b94fc1ff 100644 --- a/tests/functional/fuse_subdir/test_fusesubdir_with_removebrick.py +++ b/tests/functional/fuse_subdir/test_fusesubdir_with_removebrick.py @@ -14,7 +14,10 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import copy +import sys + from glusto.core import Glusto as g + from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) from glustolibs.gluster.mount_ops import (mount_volume, @@ -42,7 +45,7 @@ class SubdirWithRemoveBrick(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", @@ -145,13 +148,14 @@ class SubdirWithRemoveBrick(GlusterBaseClass): for mount_obj in self.subdir_mounts: g.log.info("Starting IO on %s:%s", mount_obj.client_system, self.mpoint) - 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, - self.mpoint)) + "--num-of-files 5 %s" % ( + sys.version_info.major, self.script_upload_path, count, + self.mpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) all_mounts_procs.append(proc) diff --git a/tests/functional/fuse_subdir/test_fusesubdir_with_replacebrick.py b/tests/functional/fuse_subdir/test_fusesubdir_with_replacebrick.py index 2d565b4b2..88eb6ee40 100644 --- a/tests/functional/fuse_subdir/test_fusesubdir_with_replacebrick.py +++ b/tests/functional/fuse_subdir/test_fusesubdir_with_replacebrick.py @@ -14,7 +14,10 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import copy +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 @@ -43,7 +46,7 @@ class SubdirWithReplaceBrick(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", @@ -134,13 +137,14 @@ class SubdirWithReplaceBrick(GlusterBaseClass): for mount_obj in self.subdir_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/fuse_subdir/test_leveldownsubdir_with_multiclient.py b/tests/functional/fuse_subdir/test_leveldownsubdir_with_multiclient.py index eef05896c..968323806 100644 --- a/tests/functional/fuse_subdir/test_leveldownsubdir_with_multiclient.py +++ b/tests/functional/fuse_subdir/test_leveldownsubdir_with_multiclient.py @@ -36,7 +36,7 @@ class SubdirLevelDownDirMapping(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", cls.volname) diff --git a/tests/functional/fuse_subdir/test_multisubdir_with_multiclient.py b/tests/functional/fuse_subdir/test_multisubdir_with_multiclient.py index ccd513e15..42cd6391e 100644 --- a/tests/functional/fuse_subdir/test_multisubdir_with_multiclient.py +++ b/tests/functional/fuse_subdir/test_multisubdir_with_multiclient.py @@ -35,7 +35,7 @@ class MultipleDirMappingClient(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", cls.volname) diff --git a/tests/functional/fuse_subdir/test_node_reboot_subdir_mounted.py b/tests/functional/fuse_subdir/test_node_reboot_subdir_mounted.py index 1de782a34..fed17b6ad 100644 --- a/tests/functional/fuse_subdir/test_node_reboot_subdir_mounted.py +++ b/tests/functional/fuse_subdir/test_node_reboot_subdir_mounted.py @@ -19,7 +19,10 @@ is mounted """ import copy +import sys + from glusto.core import Glusto as g + from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) from glustolibs.gluster.glusterdir import mkdir @@ -43,7 +46,7 @@ class NodeRebootSubDirsMounted(GlusterBaseClass): """ Setup and mount volume """ - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Setup Volume and Mount Volume g.log.info("Starting volume setup and mount %s", cls.volname) @@ -135,13 +138,14 @@ class NodeRebootSubDirsMounted(GlusterBaseClass): for mount_obj in self.subdir_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/fuse_subdir/test_quota_limits_fusesubdir_.py b/tests/functional/fuse_subdir/test_quota_limits_fusesubdir_.py index 69daa8a91..775639850 100644 --- a/tests/functional/fuse_subdir/test_quota_limits_fusesubdir_.py +++ b/tests/functional/fuse_subdir/test_quota_limits_fusesubdir_.py @@ -40,7 +40,7 @@ class FuseSubdirQuotaTest(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", diff --git a/tests/functional/fuse_subdir/test_subdir_mount.py b/tests/functional/fuse_subdir/test_subdir_mount.py index dac00d0ec..e6adcfa78 100644 --- a/tests/functional/fuse_subdir/test_subdir_mount.py +++ b/tests/functional/fuse_subdir/test_subdir_mount.py @@ -37,7 +37,7 @@ class FuseSubDirMount(GlusterBaseClass): """ Setup and mount volume """ - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Setup Volume and Mount Volume g.log.info("Starting volume setup and mount %s", cls.volname) diff --git a/tests/functional/fuse_subdir/test_volume_set_ops_sub_dirs_mounted.py b/tests/functional/fuse_subdir/test_volume_set_ops_sub_dirs_mounted.py index 292ccfd8f..b86a4849a 100644 --- a/tests/functional/fuse_subdir/test_volume_set_ops_sub_dirs_mounted.py +++ b/tests/functional/fuse_subdir/test_volume_set_ops_sub_dirs_mounted.py @@ -19,7 +19,10 @@ operations when sub-dirs are mounted """ import copy +import sys + from glusto.core import Glusto as g + from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) from glustolibs.gluster.glusterdir import mkdir @@ -43,7 +46,7 @@ class VolumeSetOpsSubDirsMounted(GlusterBaseClass): """ Setup and mount volume """ - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Setup Volume and Mount Volume g.log.info("Starting volume setup and mount %s", cls.volname) @@ -122,13 +125,14 @@ class VolumeSetOpsSubDirsMounted(GlusterBaseClass): for mount_obj in self.subdir_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) |