From fea99a7f768b58edea4a6ce3198ce3899e4c2eea Mon Sep 17 00:00:00 2001 From: kshithijiyer Date: Fri, 6 Mar 2020 18:51:49 +0530 Subject: [Testfix] Remove python version dependency(Part 5) Please refer to commit message of patch [1]. [1] https://review.gluster.org/#/c/glusto-tests/+/24140/ Change-Id: I5319ce497ca3359e0e7dbd9ece481bada1ee2205 Signed-off-by: kshithijiyer --- .../glusterd/test_restart_glusterd_while_rebalancing.py | 6 ++---- tests/functional/glusterd/test_volume_network_ping_timeout.py | 7 +++---- tests/functional/glusterd/test_volume_status.py | 8 +++----- tests/functional/glusterd/test_volume_status_fd.py | 8 +++----- 4 files changed, 11 insertions(+), 18 deletions(-) (limited to 'tests/functional/glusterd') diff --git a/tests/functional/glusterd/test_restart_glusterd_while_rebalancing.py b/tests/functional/glusterd/test_restart_glusterd_while_rebalancing.py index ace2f2fb0..f4f082311 100644 --- a/tests/functional/glusterd/test_restart_glusterd_while_rebalancing.py +++ b/tests/functional/glusterd/test_restart_glusterd_while_rebalancing.py @@ -18,7 +18,6 @@ Test restart glusterd while rebalance is in progress """ -import sys from glusto.core import Glusto as g @@ -131,13 +130,12 @@ class TestRestartGlusterdWhileRebalance(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 4 " "--dir-length 6 " "--max-num-of-dirs 3 " - "--num-of-files 25 %s" % (sys.version_info.major, - self.script_upload_path, + "--num-of-files 25 %s" % (self.script_upload_path, self.counter, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, diff --git a/tests/functional/glusterd/test_volume_network_ping_timeout.py b/tests/functional/glusterd/test_volume_network_ping_timeout.py index 5e9e18129..eef9604bc 100644 --- a/tests/functional/glusterd/test_volume_network_ping_timeout.py +++ b/tests/functional/glusterd/test_volume_network_ping_timeout.py @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2018 Red Hat, Inc. +# Copyright (C) 2017-2020 Red Hat, Inc. # # 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 @@ # of the volume. import re -import sys from glusto.core import Glusto as g @@ -113,9 +112,9 @@ class CheckVolumeChecksumAfterChangingNetworkPingTimeOut(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_files -f 10 " + cmd = ("/usr/bin/env python %s create_files -f 10 " "--base-file-name newfile %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/glusterd/test_volume_status.py b/tests/functional/glusterd/test_volume_status.py index ec508eba1..01f874558 100644 --- a/tests/functional/glusterd/test_volume_status.py +++ b/tests/functional/glusterd/test_volume_status.py @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2018 Red Hat, Inc. +# Copyright (C) 2017-2020 Red Hat, Inc. # # 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 Cases in this module related to Glusterd volume status while IOs in progress """ import random -import sys from time import sleep from glusto.core import Glusto as g @@ -130,13 +129,12 @@ class VolumeStatusWhenIOInProgress(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 15 " "--max-num-of-dirs 5 " - "--num-of-files 25 %s" % (sys.version_info.major, - self.script_upload_path, + "--num-of-files 25 %s" % (self.script_upload_path, self.counter, mount_obj.mountpoint)) diff --git a/tests/functional/glusterd/test_volume_status_fd.py b/tests/functional/glusterd/test_volume_status_fd.py index fa99274ba..0c60dd802 100644 --- a/tests/functional/glusterd/test_volume_status_fd.py +++ b/tests/functional/glusterd/test_volume_status_fd.py @@ -1,4 +1,4 @@ -# Copyright (C) 2018 Red Hat, Inc. +# Copyright (C) 2018-2020 Red Hat, Inc. # # 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,7 +20,6 @@ """ import random -import sys from glusto.core import Glusto as g @@ -113,13 +112,12 @@ class VolumeStatusFdWhenIOInProgress(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 15 %s" % (sys.version_info.major, - self.script_upload_path, + "--num-of-files 15 %s" % (self.script_upload_path, self.counter, mount_obj.mountpoint)) -- cgit