From 5189557f8c3332e936842b3a21e44b5df21f7698 Mon Sep 17 00:00:00 2001 From: Valerii Ponomarov Date: Mon, 9 Dec 2019 22:49:55 +0530 Subject: [py2to3] Add py3 support in 'tests/functional/samba' Change-Id: Iae0f6e729c26e466d82c4133439bdd7021485e7f Signed-off-by: Valerii Ponomarov --- glustolibs-gluster/glustolibs/gluster/samba_libs.py | 2 +- tests/functional/samba/test_stat_prefetch.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/glustolibs-gluster/glustolibs/gluster/samba_libs.py b/glustolibs-gluster/glustolibs/gluster/samba_libs.py index c25eeb891..5c0f20a52 100644 --- a/glustolibs-gluster/glustolibs/gluster/samba_libs.py +++ b/glustolibs-gluster/glustolibs/gluster/samba_libs.py @@ -295,7 +295,7 @@ def share_volume_over_smb(mnode, volname, smb_users_info): g.log.error("Failed to enable mounting volumes using SMB") return False g.log.info("Successfully enabled mounting volumes using SMV for the " - "smbusers: %s", str(smb_users_info.keys())) + "smbusers: %s", str(list(smb_users_info.keys()))) # Verify if volume is shared ret = is_volume_exported(mnode, volname, "smb") diff --git a/tests/functional/samba/test_stat_prefetch.py b/tests/functional/samba/test_stat_prefetch.py index 6c876fd8b..ac3e6a674 100644 --- a/tests/functional/samba/test_stat_prefetch.py +++ b/tests/functional/samba/test_stat_prefetch.py @@ -21,7 +21,11 @@ Description: set stat-prefetch off-on this should fail the IO running on the mount point. """ + +import sys + from glusto.core import Glusto as g + from glustolibs.gluster.mount_ops import mount_volume from glustolibs.gluster.exceptions import (ExecutionError) from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on @@ -41,7 +45,7 @@ class TestValidateCifs(GlusterBaseClass): setup volume and initialize necessary variables """ - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() g.log.info("Starting %s:", cls.__name__) # Setup volume g.log.info("Starting to Setup Volume and Mount Volume") @@ -77,7 +81,7 @@ class TestValidateCifs(GlusterBaseClass): g.log.info("Successful in Cleanup Volume and mount") # calling GlusterBaseClass tearDownClass - GlusterBaseClass.tearDownClass.im_func(cls) + cls.get_super_method(cls, 'tearDownClass')() def test_stat_prefetch(self): @@ -99,10 +103,10 @@ class TestValidateCifs(GlusterBaseClass): self.assertEqual(ret, 0, "Cifs Mount Failed") g.log.info("Starting IO on %s:%s", mount_obj.client_system, mount_obj.mountpoint) - cmd = ("python %s create_files -f 10000" + cmd = ("/usr/bin/env python%d %s create_files -f 10000" " --base-file-name ctdb-cifs " " --fixed-file-size 10k %s/samba/" - % (self.script_upload_path, + % (sys.version_info.major, self.script_upload_path, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, -- cgit