From 79e82b1f04184d895638a78c7c57ea49d936efe7 Mon Sep 17 00:00:00 2001 From: Valerii Ponomarov Date: Mon, 9 Dec 2019 22:29:05 +0530 Subject: [py2to3] Add py3 support in 'tests/functional/fuse_subdir' Change-Id: I56194047ac6105cddb43d3f413b03bcdbbcde587 Signed-off-by: Valerii Ponomarov --- .../functional/fuse_subdir/test_fusesubdir_with_addbrick.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tests/functional/fuse_subdir/test_fusesubdir_with_addbrick.py') 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) -- cgit