[Testfix] Remove python version dependency(Part 2)

Please refer to commit message of patch [1].
[1] https://review.gluster.org/#/c/glusto-tests/+/24140/

Change-Id: Ic0b3b1333ac7b1ae02f701943d49510e6d46c259
Signed-off-by: kshithijiyer <kshithij.ki@gmail.com>

3 files changed, 9 insertions, 14 deletions

diff --git a/tests/functional/arbiter/brick_cases/test_brickcases.py b/tests/functional/arbiter/brick_cases/test_brickcases.py
index 2b006cb92..766012bd5 100755
--- a/tests/functional/arbiter/brick_cases/test_brickcases.py
+++ b/tests/functional/arbiter/brick_cases/test_brickcases.py
@@ -16,7 +16,6 @@
 

 """ Test Arbiter Specific Cases"""

 

-import sys

 from glusto.core import Glusto as g

 from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on)

 from glustolibs.gluster.volume_libs import (

@@ -126,10 +125,10 @@ class GlusterArbiterVolumeTypeChangeClass(GlusterBaseClass):
         self.all_mounts_procs = []

         g.log.info("Starting IO on %s:%s", self.mounts[0].client_system,

                    self.mounts[0].mountpoint)

-        cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files "

+        cmd = ("/usr/bin/env python %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.script_upload_path,

                    self.mounts[0].mountpoint))

         proc = g.run_async(self.mounts[0].client_system, cmd,

                            user=self.mounts[0].user)

@@ -186,10 +185,10 @@ class GlusterArbiterVolumeTypeChangeClass(GlusterBaseClass):
         self.all_mounts_procs = []

         g.log.info("Starting IO on %s:%s", self.mounts[0].client_system,

                    self.mounts[0].mountpoint)

-        cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files "

+        cmd = ("/usr/bin/env python %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.script_upload_path,

                    self.mounts[0].mountpoint))

         proc = g.run_async(self.mounts[0].client_system, cmd,

                            user=self.mounts[0].user)

diff --git a/tests/functional/arbiter/brick_cases/test_cyclic_brick_kill_list.py b/tests/functional/arbiter/brick_cases/test_cyclic_brick_kill_list.py
index cbfdbfa29..642c6f011 100755
--- a/tests/functional/arbiter/brick_cases/test_cyclic_brick_kill_list.py
+++ b/tests/functional/arbiter/brick_cases/test_cyclic_brick_kill_list.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2017-2018  Red Hat, Inc. <http://www.redhat.com>

+#  Copyright (C) 2017-2020  Red Hat, Inc. <http://www.redhat.com>

 #

 #  This program is free software; you can redistribute it and/or modify

 #  it under the terms of the GNU General Public License as published by

@@ -14,7 +14,6 @@
 #  with this program; if not, write to the Free Software Foundation, Inc.,

 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 

-import sys

 import time

 

 from glusto.core import Glusto as g

@@ -135,14 +134,13 @@ class ListMount(GlusterBaseClass):
         for mount_obj in self.mounts:

             g.log.info("Starting IO on %s:%s", mount_obj.client_system,

                        mount_obj.mountpoint)

-            cmd = ("/usr/bin/env python%d %s "

+            cmd = ("/usr/bin/env python %s "

                    "--file-sizes-list 1G "

                    "--chunk-sizes-list 128 "

                    "--write-time 900 "

                    "--num-of-files 2 "

                    "--base-file-name test_brick_down_from_client_%s.txt "

-                   "--dir %s " % (sys.version_info.major,

-                                  self.script_upload_path,

+                   "--dir %s " % (self.script_upload_path,

                                   mount_obj.client_system,

                                   mount_obj.mountpoint))

             proc = g.run_async(mount_obj.client_system, cmd,

diff --git a/tests/functional/arbiter/brick_cases/test_rmvrf_files.py b/tests/functional/arbiter/brick_cases/test_rmvrf_files.py
index 80bd05b86..9dbaa74fc 100755
--- a/tests/functional/arbiter/brick_cases/test_rmvrf_files.py
+++ b/tests/functional/arbiter/brick_cases/test_rmvrf_files.py
@@ -14,8 +14,6 @@
 #  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)
@@ -131,13 +129,13 @@ class TestRmrfMount(GlusterBaseClass):
         for mount_obj in self.mounts:
             g.log.info("Starting IO on %s:%s", mount_obj.client_system,
                        mount_obj.mountpoint)
-            cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
+            cmd = ("/usr/bin/env python %s create_deep_dirs_with_files "
                    "--dirname-start-num %d "
                    "--dir-depth 2 "
                    "--dir-length 35 "
                    "--max-num-of-dirs 5 "
                    "--num-of-files 5 %s" % (
-                       sys.version_info.major, self.script_upload_path,
+                       self.script_upload_path,
                        self.counter, mount_obj.mountpoint))
             proc = g.run_async(mount_obj.client_system, cmd,
                                user=mount_obj.user)