[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>

7 files changed, 31 insertions, 47 deletions

diff --git a/tests/functional/disperse/test_ec_add_brick.py b/tests/functional/disperse/test_ec_add_brick.py
index 09b729c2f..27571e36e 100644
--- a/tests/functional/disperse/test_ec_add_brick.py
+++ b/tests/functional/disperse/test_ec_add_brick.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
@@ -13,7 +13,6 @@
 #  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
 
@@ -83,13 +82,13 @@ class DispersedWithAddBrick(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 10 "
                    "--max-num-of-dirs 5 "
                    "--num-of-files 5 %s" % (
-                       sys.version_info.major, self.script_upload_path, count,
+                       self.script_upload_path, count,
                        mount_obj.mountpoint))
             proc = g.run_async(mount_obj.client_system, cmd,
                                user=mount_obj.user)
@@ -150,13 +149,13 @@ class DispersedWithAddBrick(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 10 "
                    "--max-num-of-dirs 5 "
                    "--num-of-files 5 %s" % (
-                       sys.version_info.major, self.script_upload_path, count,
+                       self.script_upload_path, count,
                        mount_obj.mountpoint))
             proc = g.run_async(mount_obj.client_system, cmd,
                                user=mount_obj.user)
diff --git a/tests/functional/disperse/test_ec_fops.py b/tests/functional/disperse/test_ec_fops.py
index a9339581e..53583f37e 100644
--- a/tests/functional/disperse/test_ec_fops.py
+++ b/tests/functional/disperse/test_ec_fops.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2019  Red Hat, Inc. <http://www.redhat.com>
+#  Copyright (C) 2019-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
@@ -19,7 +19,6 @@ Test Description:
     Tests File Operations on a healthy EC volume
 """
 from os import getcwd
-import sys
 
 from glusto.core import Glusto as g
 
@@ -250,13 +249,13 @@ class TestFops(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 10 "
                    "--max-num-of-dirs 5 "
                    "--num-of-files 5 %s" % (
-                       sys.version_info.major, self.script_upload_path, count,
+                       self.script_upload_path, count,
                        mount_obj.mountpoint))
             proc = g.run_async(mount_obj.client_system, cmd,
                                user=mount_obj.user)
diff --git a/tests/functional/disperse/test_ec_fops_brickdown.py b/tests/functional/disperse/test_ec_fops_brickdown.py
index f7cac1fcf..906714456 100644
--- a/tests/functional/disperse/test_ec_fops_brickdown.py
+++ b/tests/functional/disperse/test_ec_fops_brickdown.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2019  Red Hat, Inc. <http://www.redhat.com>
+#  Copyright (C) 2019-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
@@ -20,8 +20,6 @@ Test Description:
     brought down
 """
 
-import sys
-
 from glusto.core import Glusto as g
 
 from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on)
@@ -265,13 +263,13 @@ class TestFopsBrickdown(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 10 "
                    "--max-num-of-dirs 5 "
                    "--num-of-files 5 %s/dir1" % (
-                       sys.version_info.major, self.script_upload_path, count,
+                       self.script_upload_path, count,
                        mount_obj.mountpoint))
             proc = g.run_async(mount_obj.client_system, cmd,
                                user=mount_obj.user)
@@ -304,13 +302,13 @@ class TestFopsBrickdown(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 10 "
                    "--max-num-of-dirs 5 "
                    "--num-of-files 5 %s/dir2" % (
-                       sys.version_info.major, self.script_upload_path, count,
+                       self.script_upload_path, count,
                        mount_obj.mountpoint))
             proc = g.run_async(mount_obj.client_system, cmd,
                                user=mount_obj.user)
diff --git a/tests/functional/disperse/test_ec_remove_brick.py b/tests/functional/disperse/test_ec_remove_brick.py
index a5422f269..a41f78c95 100644
--- a/tests/functional/disperse/test_ec_remove_brick.py
+++ b/tests/functional/disperse/test_ec_remove_brick.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
@@ -13,7 +13,6 @@
 #  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
 
@@ -81,13 +80,13 @@ class DispersedWithAddBrick(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 10 "
                    "--max-num-of-dirs 5 "
                    "--num-of-files 5 %s" % (
-                       sys.version_info.major, self.script_upload_path, count,
+                       self.script_upload_path, count,
                        mount_obj.mountpoint))
             proc = g.run_async(mount_obj.client_system, cmd,
                                user=mount_obj.user)
@@ -130,13 +129,13 @@ class DispersedWithAddBrick(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 10 "
                    "--max-num-of-dirs 5 "
                    "--num-of-files 5 %s" % (
-                       sys.version_info.major, self.script_upload_path, count,
+                       self.script_upload_path, count,
                        mount_obj.mountpoint))
             proc = g.run_async(mount_obj.client_system, cmd,
                                user=mount_obj.user)
diff --git a/tests/functional/disperse/test_ec_reset.py b/tests/functional/disperse/test_ec_reset.py
index 6b115ccb4..4b797a055 100644
--- a/tests/functional/disperse/test_ec_reset.py
+++ b/tests/functional/disperse/test_ec_reset.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2018  Red Hat, Inc. <http://www.redhat.com>
+#  Copyright (C) 2018-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
@@ -22,7 +22,6 @@ Test Description:
 """
 from os import getcwd
 from random import choice
-import sys
 from time import sleep
 
 from glusto.core import Glusto as g
@@ -168,9 +167,9 @@ class TestBrickReset(GlusterBaseClass):
 
             # Create dirs with file
             g.log.info('Creating dirs with file...')
-            command = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
+            command = ("/usr/bin/env python %s create_deep_dirs_with_files "
                        "-d 2 -l 2 -n 2 -f 20 %s/dir2" % (
-                           sys.version_info.major, self.script_upload_path,
+                           self.script_upload_path,
                            mount_obj.mountpoint))
 
             proc = g.run_async(mount_obj.client_system, command,
@@ -341,9 +340,9 @@ class TestBrickReset(GlusterBaseClass):
                        mount_obj.client_system, mount_obj.mountpoint)
             # Create dirs with file
             g.log.info('Creating dirs with file...')
-            command = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
+            command = ("/usr/bin/env python %s create_deep_dirs_with_files "
                        "-d 2 -l 2 -n 2 -f 20 %s/dir1" % (
-                           sys.version_info.major, self.script_upload_path,
+                           self.script_upload_path,
                            mount_obj.mountpoint))
 
             proc = g.run_async(mount_obj.client_system, command,
diff --git a/tests/functional/disperse/test_ec_verify_datacorruption_during_full_heal.py b/tests/functional/disperse/test_ec_verify_datacorruption_during_full_heal.py
index 42f742144..6d91ee0c6 100644
--- a/tests/functional/disperse/test_ec_verify_datacorruption_during_full_heal.py
+++ b/tests/functional/disperse/test_ec_verify_datacorruption_during_full_heal.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2015-2019  Red Hat, Inc. <http://www.redhat.com>
+#  Copyright (C) 2015-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
 from time import sleep
 
 from glusto.core import Glusto as g
@@ -123,13 +122,9 @@ class TestHealFullNodeReboot(GlusterBaseClass):
 
             # Create dirs with file
             g.log.info('Creating dirs with file...')
-            command = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
-                       "-d 2 "
-                       "-l 2 "
-                       "-n 2 "
-                       "-f 20 "
-                       "%s" % (
-                           sys.version_info.major, self.script_upload_path,
+            command = ("/usr/bin/env python %s create_deep_dirs_with_files "
+                       "-d 2 -l 2 -n 2 -f 20 %s" % (
+                           self.script_upload_path,
                            mount_obj.mountpoint))
 
             proc = g.run_async(mount_obj.client_system, command,
diff --git a/tests/functional/disperse/test_ec_verify_full_heal.py b/tests/functional/disperse/test_ec_verify_full_heal.py
index 1ae873841..3051076f9 100644
--- a/tests/functional/disperse/test_ec_verify_full_heal.py
+++ b/tests/functional/disperse/test_ec_verify_full_heal.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2015-2016  Red Hat, Inc. <http://www.redhat.com>
+#  Copyright (C) 2015-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
@@ -13,7 +13,6 @@
 #  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
 
@@ -120,13 +119,9 @@ class TestHealFull(GlusterBaseClass):
                        mount_obj.client_system, mount_obj.mountpoint)
             # Create dirs with file
             g.log.info('Creating dirs with file...')
-            command = ("/usr/bin/env python%d %s create_deep_dirs_with_files "
-                       "-d 2 "
-                       "-l 2 "
-                       "-n 2 "
-                       "-f 20 "
-                       "%s"
-                       % (sys.version_info.major, self.script_upload_path,
+            command = ("/usr/bin/env python %s create_deep_dirs_with_files "
+                       "-d 2 -l 2 -n 2 -f 20 %s"
+                       % (self.script_upload_path,
                           mount_obj.mountpoint))
 
             proc = g.run_async(mount_obj.client_system, command,