From a7b8abe275c123a4ac980f414ce9ac284d15b3c6 Mon Sep 17 00:00:00 2001 From: Valerii Ponomarov Date: Mon, 9 Dec 2019 22:01:05 +0530 Subject: [py2to3] Add py3 support in 'tests/functional/disperse' Change-Id: I308f95d16ac18ec80c5c78aac9152d9ae41449bb Signed-off-by: Valerii Ponomarov --- tests/functional/disperse/test_ec_verify_full_heal.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'tests/functional/disperse/test_ec_verify_full_heal.py') diff --git a/tests/functional/disperse/test_ec_verify_full_heal.py b/tests/functional/disperse/test_ec_verify_full_heal.py index e0074d513..1941b5ec7 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) -- cgit