diff options
author | kshithijiyer <kshithij.ki@gmail.com> | 2020-02-20 12:54:40 +0530 |
---|---|---|
committer | Bala Konda Reddy M <bala12352@gmail.com> | 2020-02-26 07:07:13 +0000 |
commit | 9be561b4437c912f78609a15e71bdf4e4f772547 (patch) | |
tree | c9a5dc582dfa7363ba447f68cf468440aff01b9d /tests/functional/glusterd | |
parent | 3e6d5bdc8c45ac3b726ca3b7237e43194805cc56 (diff) |
[Testfix] Remove python version dependency(Part 4)
Please refer to commit message of patch [1].
[1] https://review.gluster.org/#/c/glusto-tests/+/24140/
Change-Id: I25d30f7bdb20f0825709c4c852140e1906870ce7
Signed-off-by: kshithijiyer <kshithij.ki@gmail.com>
Diffstat (limited to 'tests/functional/glusterd')
7 files changed, 21 insertions, 41 deletions
diff --git a/tests/functional/glusterd/test_brick_log_messages.py b/tests/functional/glusterd/test_brick_log_messages.py index e0ba39ce1..1313fbe14 100644 --- a/tests/functional/glusterd/test_brick_log_messages.py +++ b/tests/functional/glusterd/test_brick_log_messages.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 @@ -19,8 +19,6 @@ from mountpoint """ -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -103,13 +101,12 @@ class TestAddBrickFunctionality(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 5 " "--max-num-of-dirs 3 " - "--num-of-files 10 %s" % (sys.version_info.major, - self.script_upload_path, + "--num-of-files 10 %s" % (self.script_upload_path, self.counter, mount_obj.mountpoint)) diff --git a/tests/functional/glusterd/test_change_reserve_limit.py b/tests/functional/glusterd/test_change_reserve_limit.py index 0be88490e..fb6c09edd 100644 --- a/tests/functional/glusterd/test_change_reserve_limit.py +++ b/tests/functional/glusterd/test_change_reserve_limit.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 @@ -121,13 +119,12 @@ class TestChangeReservcelimit(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 5 " "--max-num-of-dirs 3 " - "--num-of-files 10 %s" % (sys.version_info.major, - self.script_upload_path, + "--num-of-files 10 %s" % (self.script_upload_path, self.counter, mount_obj.mountpoint)) @@ -210,13 +207,12 @@ class TestChangeReservcelimit(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 5 " "--max-num-of-dirs 3 " - "--num-of-files 10 %s" % (sys.version_info.major, - self.script_upload_path, + "--num-of-files 10 %s" % (self.script_upload_path, self.counter, mount_obj.mountpoint)) diff --git a/tests/functional/glusterd/test_create_vol_with_used_bricks.py b/tests/functional/glusterd/test_create_vol_with_used_bricks.py index 531829e9f..a5f94c077 100644 --- a/tests/functional/glusterd/test_create_vol_with_used_bricks.py +++ b/tests/functional/glusterd/test_create_vol_with_used_bricks.py @@ -18,8 +18,6 @@ Create volume using bricks of deleted volume """ -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -123,11 +121,10 @@ class TestCreateVolWithUsedBricks(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 5 --max-num-of-dirs 3 " - "--num-of-files 10 %s" % (sys.version_info.major, - self.script_upload_path, + "--num-of-files 10 %s" % (self.script_upload_path, self.counter, mount_obj.mountpoint)) diff --git a/tests/functional/glusterd/test_profile_operations.py b/tests/functional/glusterd/test_profile_operations.py index 6bde0af48..9eb304a92 100644 --- a/tests/functional/glusterd/test_profile_operations.py +++ b/tests/functional/glusterd/test_profile_operations.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,8 +19,6 @@ Tests to check basic profile operations. """ -import sys - from glusto.core import Glusto as g from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on @@ -113,13 +111,13 @@ class TestProfileOpeartions(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 " "--dir-depth 4 " "--dir-length 6 " "--dirname-start-num %d " "--max-num-of-dirs 3 " "--num-of-files 5 %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, counter, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/glusterd/test_profile_operations_with_one_node_down.py b/tests/functional/glusterd/test_profile_operations_with_one_node_down.py index b33a4b59b..ad745cdf7 100644 --- a/tests/functional/glusterd/test_profile_operations_with_one_node_down.py +++ b/tests/functional/glusterd/test_profile_operations_with_one_node_down.py @@ -20,7 +20,6 @@ """ from random import randint -import sys from glusto.core import Glusto as g @@ -111,13 +110,13 @@ class TestProfileOpeartionsWithOneNodeDown(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 " "--dir-depth 4 " "--dirname-start-num %d " "--dir-length 6 " "--max-num-of-dirs 3 " "--num-of-files 5 %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, counter, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/glusterd/test_readonly_option_on_volume.py b/tests/functional/glusterd/test_readonly_option_on_volume.py index ad411f1d3..d4250b164 100644 --- a/tests/functional/glusterd/test_readonly_option_on_volume.py +++ b/tests/functional/glusterd/test_readonly_option_on_volume.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 @@ -18,8 +18,6 @@ Test read-only option on volumes """ -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -100,13 +98,12 @@ class TestReadOnlyOptionOnVolume(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 2 " "--max-num-of-dirs 2 " - "--num-of-files 5 %s" % (sys.version_info.major, - self.script_upload_path, + "--num-of-files 5 %s" % (self.script_upload_path, self.counter, mount_obj.mountpoint)) @@ -138,13 +135,12 @@ class TestReadOnlyOptionOnVolume(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 2 " "--max-num-of-dirs 2 " - "--num-of-files 5 %s" % (sys.version_info.major, - self.script_upload_path, + "--num-of-files 5 %s" % (self.script_upload_path, self.counter, mount_obj.mountpoint)) diff --git a/tests/functional/glusterd/test_rebalance_new_node.py b/tests/functional/glusterd/test_rebalance_new_node.py index 0934149d5..6c5777543 100644 --- a/tests/functional/glusterd/test_rebalance_new_node.py +++ b/tests/functional/glusterd/test_rebalance_new_node.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 @@ -126,13 +124,12 @@ class TestRebalanceStatus(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 10 " "--dir-length 5 " "--max-num-of-dirs 3 " - "--num-of-files 100 %s" % (sys.version_info.major, - self.script_upload_path, + "--num-of-files 100 %s" % (self.script_upload_path, self.counter, mount_obj.mountpoint)) ret = g.run(mount_obj.client_system, cmd) |