From c7658429acadb6429d4d64ff04543dfbff478bc1 Mon Sep 17 00:00:00 2001 From: kshithijiyer Date: Wed, 19 Feb 2020 22:12:12 +0530 Subject: [Testfix] Remove python version dependency(Part 1) sys library was added to all the testcases to fetch the `sys.version_info.major` which fetches the version of python with which glusto and glusto-tests is installed and runs the I/O script i.e file_dir_ops.py with that version of python but this creates a problem as older jobs running on older platforms won't run the way they use to, like if the older platform had python2 by default and we are running it tests from a slave which has python3 it'll fails and visa-versa. The problem is introduced due the below code: ``` cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files " "--dirname-start-num 10 --dir-depth 1 --dir-length 1 " "--max-num-of-dirs 1 --num-of-files 5 %s" % ( sys.version_info.major, self.script_upload_path, self.mounts[0].mountpoint)) ``` The solution to this problem is to change `python%d` to `python` which would enable the code to run with whatever version of python is avaliable on that client this would enable us to run any version of framework with both the older and latest platforms. Change-Id: I7c8200a7578f03c482f0c6a91832b8c0fdb33e77 Signed-off-by: kshithijiyer --- tests/functional/afr/test_afr_with_snapshot.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'tests/functional/afr/test_afr_with_snapshot.py') diff --git a/tests/functional/afr/test_afr_with_snapshot.py b/tests/functional/afr/test_afr_with_snapshot.py index b712dee0c..e6c8daf8c 100644 --- a/tests/functional/afr/test_afr_with_snapshot.py +++ b/tests/functional/afr/test_afr_with_snapshot.py @@ -17,7 +17,6 @@ Description: Test cases related to afr snapshot. """ from time import sleep -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 @@ -119,9 +118,9 @@ class TestAFRSnapshot(GlusterBaseClass): # Creating files on client side count = 1 for mount_obj in self.mounts: - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "--base-file-name %d -f 200 %s" - % (sys.version_info.major, self.script_upload_path, + % (self.script_upload_path, count, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -148,8 +147,8 @@ class TestAFRSnapshot(GlusterBaseClass): # Modify the data self.all_mounts_procs = [] for mount_obj in self.mounts: - cmd = ("/usr/bin/env python%d %s append %s" - % (sys.version_info.major, self.script_upload_path, + cmd = ("/usr/bin/env python %s append %s" + % (self.script_upload_path, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -206,9 +205,9 @@ class TestAFRSnapshot(GlusterBaseClass): # Creating files on client side count = 1 for mount_obj in self.mounts: - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "--base-file-name %d -f 25 %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, count, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -302,9 +301,9 @@ class TestAFRSnapshot(GlusterBaseClass): # Creating files on client side count = 1 for mount_obj in self.mounts: - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "--base-file-name %d -f 25 %s" - % (sys.version_info.major, self.script_upload_path, + % (self.script_upload_path, count, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -319,8 +318,8 @@ class TestAFRSnapshot(GlusterBaseClass): # Rename files self.all_mounts_procs, self.io_validation_complete = [], False - cmd = ("/usr/bin/env python%d %s mv -s FirstRename %s" - % (sys.version_info.major, self.script_upload_path, + cmd = ("/usr/bin/env python %s mv -s FirstRename %s" + % (self.script_upload_path, self.mounts[0].mountpoint)) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) @@ -345,8 +344,8 @@ class TestAFRSnapshot(GlusterBaseClass): # Rename files self.all_mounts_procs, self.io_validation_complete = [], False - cmd = ("/usr/bin/env python%d %s mv -s SecondRename %s" - % (sys.version_info.major, self.script_upload_path, + cmd = ("/usr/bin/env python %s mv -s SecondRename %s" + % (self.script_upload_path, self.mounts[0].mountpoint)) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) -- cgit