diff options
Diffstat (limited to 'tests/functional')
27 files changed, 208 insertions, 257 deletions
diff --git a/tests/functional/afr/heal/test_heal_info_while_accessing_file.py b/tests/functional/afr/heal/test_heal_info_while_accessing_file.py index 6f6a27a6f..24450702b 100644 --- a/tests/functional/afr/heal/test_heal_info_while_accessing_file.py +++ b/tests/functional/afr/heal/test_heal_info_while_accessing_file.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,9 +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 from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) @@ -153,8 +150,8 @@ class TestSelfHeal(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Creating files - cmd = "/usr/bin/env python%d %s create_files -f 100 %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s create_files -f 100 %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, diff --git a/tests/functional/afr/heal/test_self_heal.py b/tests/functional/afr/heal/test_self_heal.py index d34cce176..6bbcccdfc 100755 --- a/tests/functional/afr/heal/test_self_heal.py +++ b/tests/functional/afr/heal/test_self_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 @@ -15,9 +15,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # pylint: disable=too-many-lines - -import sys - from glusto.core import Glusto as g from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) @@ -172,9 +169,9 @@ class TestSelfHeal(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create files g.log.info('Creating files...') - command = ("/usr/bin/env python%d %s create_files -f 100 " + command = ("/usr/bin/env python %s create_files -f 100 " "--fixed-file-size 1k %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, command, @@ -246,9 +243,9 @@ class TestSelfHeal(GlusterBaseClass): mount_obj.mountpoint) # Create files g.log.info('Creating files...') - command = ("/usr/bin/env python%d %s create_files -f 100 " + command = ("/usr/bin/env python %s create_files -f 100 " "--fixed-file-size 10k %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, command, @@ -343,8 +340,8 @@ class TestSelfHeal(GlusterBaseClass): mount_obj.mountpoint) # Create files g.log.info('Creating files...') - command = ("/usr/bin/env python%d %s create_files -f 1000 %s" % ( - sys.version_info.major, self.script_upload_path, + command = ("/usr/bin/env python %s create_files -f 1000 %s" % ( + self.script_upload_path, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, command, @@ -472,8 +469,8 @@ class TestSelfHeal(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create 50k files g.log.info('Creating files...') - command = ("/usr/bin/env python%d %s create_files -f 50000 %s" % ( - sys.version_info.major, self.script_upload_path, + command = ("/usr/bin/env python %s create_files -f 50000 %s" % ( + self.script_upload_path, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, command, diff --git a/tests/functional/afr/heal/test_self_heal_daemon_process.py b/tests/functional/afr/heal/test_self_heal_daemon_process.py index cee8c2907..5c88460f6 100755 --- a/tests/functional/afr/heal/test_self_heal_daemon_process.py +++ b/tests/functional/afr/heal/test_self_heal_daemon_process.py @@ -19,7 +19,6 @@ """ import calendar -import sys import time from glusto.core import Glusto as g @@ -557,9 +556,9 @@ class SelfHealDaemonProcessTests(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 100 " + cmd = ("/usr/bin/env python %s create_files -f 100 " "%s/test_dir" % ( - 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/afr/test_afr_cli_gfid_splitbrain.py b/tests/functional/afr/test_afr_cli_gfid_splitbrain.py index 8306ae669..d99aa5b36 100644 --- a/tests/functional/afr/test_afr_cli_gfid_splitbrain.py +++ b/tests/functional/afr/test_afr_cli_gfid_splitbrain.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 @@ -15,9 +15,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # pylint: disable=too-many-statements, too-many-locals - -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -112,9 +109,9 @@ class TestSelfHeal(GlusterBaseClass): g.log.info("creating a file from mount point") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 1 --base-file-name test_file --fixed-file-size 1k %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) all_mounts_procs.append(proc) @@ -139,9 +136,9 @@ class TestSelfHeal(GlusterBaseClass): g.log.info("creating a new file of same name from mount point") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 1 --base-file-name test_file --fixed-file-size 1k %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) all_mounts_procs.append(proc) diff --git a/tests/functional/afr/test_afr_cli_no_splitbrain_resolution.py b/tests/functional/afr/test_afr_cli_no_splitbrain_resolution.py index 85943be67..ad6f336a5 100644 --- a/tests/functional/afr/test_afr_cli_no_splitbrain_resolution.py +++ b/tests/functional/afr/test_afr_cli_no_splitbrain_resolution.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 @@ -15,9 +15,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # pylint: disable=too-many-statements, too-many-locals, unused-variable - -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -116,9 +113,9 @@ class TestSelfHeal(GlusterBaseClass): g.log.info("creating 5 files from mount point") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = ("/usr/bin/env python%d %s create_files -f 5 " + cmd = ("/usr/bin/env python %s create_files -f 5 " "--base-file-name test_file --fixed-file-size 1k %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) @@ -153,9 +150,9 @@ class TestSelfHeal(GlusterBaseClass): g.log.info("creating 5 new files of same name from mount point") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = ("/usr/bin/env python%d %s create_files -f 5 " + cmd = ("/usr/bin/env python %s create_files -f 5 " "--base-file-name test_file --fixed-file-size 10k %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/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) diff --git a/tests/functional/afr/test_brick_process_not_started_on_read_only_node_disks.py b/tests/functional/afr/test_brick_process_not_started_on_read_only_node_disks.py index 42144e5f7..a30c53148 100644 --- a/tests/functional/afr/test_brick_process_not_started_on_read_only_node_disks.py +++ b/tests/functional/afr/test_brick_process_not_started_on_read_only_node_disks.py @@ -1,5 +1,19 @@ +# Copyright (C) 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 +# the Free Software Foundation; either version 2 of the License, or +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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 calendar -import sys import time from glusto.core import Glusto as g @@ -134,9 +148,9 @@ class SelfHealDaemonProcessTests(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 100 " + cmd = ("/usr/bin/env python %s create_files -f 100 " "%s/%s/test_dir" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, mount_obj.mountpoint, mount_obj.client_system)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/afr/test_client_side_quorum_with_auto_option.py b/tests/functional/afr/test_client_side_quorum_with_auto_option.py index 750ca19ed..8a319f609 100755 --- a/tests/functional/afr/test_client_side_quorum_with_auto_option.py +++ b/tests/functional/afr/test_client_side_quorum_with_auto_option.py @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2019 Red Hat, Inc. <http://www.redhat.com> +# Copyright (C) 2016-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 @@ -17,9 +17,6 @@ """ Description: Test Cases in this module tests the client side quorum. """ - -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -101,9 +98,9 @@ class ClientSideQuorumTests(GlusterBaseClass): # write files on all mounts g.log.info("Starting IO on all mounts...") g.log.info("mounts: %s", self.mounts) - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name file %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, self.mounts[0].mountpoint)) ret, _, err = g.run(self.mounts[0].client_system, cmd) self.assertFalse(ret, "IO failed on %s with %s" diff --git a/tests/functional/afr/test_client_side_quorum_with_auto_option_overwrite_fixed.py b/tests/functional/afr/test_client_side_quorum_with_auto_option_overwrite_fixed.py index 160307034..1a6a85946 100755 --- a/tests/functional/afr/test_client_side_quorum_with_auto_option_overwrite_fixed.py +++ b/tests/functional/afr/test_client_side_quorum_with_auto_option_overwrite_fixed.py @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2019 Red Hat, Inc. <http://www.redhat.com> +# Copyright (C) 2016-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 @@ -17,9 +17,6 @@ """ Description: Test Cases in this module tests the client side quorum. """ - -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -153,9 +150,9 @@ class ClientSideQuorumTests(GlusterBaseClass): # create files g.log.info("Starting IO on all mounts...") g.log.info("mounts: %s", self.mounts) - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name file %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, self.mounts[0].mountpoint)) ret, _, err = g.run(self.mounts[0].client_system, cmd) self.assertFalse(ret, "IO failed on %s with '%s'" @@ -185,9 +182,9 @@ class ClientSideQuorumTests(GlusterBaseClass): # create files g.log.info("Starting IO on all mounts...") g.log.info("mounts: %s", self.mounts) - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name second_file %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, self.mounts[0].mountpoint)) ret, _, err = g.run(self.mounts[0].client_system, cmd) self.assertFalse(ret, "IO failed on %s with '%s'" diff --git a/tests/functional/afr/test_client_side_quorum_with_cross2.py b/tests/functional/afr/test_client_side_quorum_with_cross2.py index 86e51ef86..6df722fb8 100644 --- a/tests/functional/afr/test_client_side_quorum_with_cross2.py +++ b/tests/functional/afr/test_client_side_quorum_with_cross2.py @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2017 Red Hat, Inc. <http://www.redhat.com> +# Copyright (C) 2016-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 @@ -17,9 +17,6 @@ """ Description: Test Cases in this module tests the client side quorum. """ - -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -127,9 +124,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # Start IO on mounts g.log.info("Starting IO .....") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name file %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) @@ -165,9 +162,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # create new file named newfile0.txt g.log.info("Start creating new file on all mounts...") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 1 --base-file-name newfile %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) @@ -182,8 +179,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # create directory user1 g.log.info("Start creating directory on all mounts...") all_mounts_procs = [] - cmd = "/usr/bin/env python%d %s create_deep_dir %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s create_deep_dir %s" % ( + self.script_upload_path, self.mounts[0].mountpoint) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) @@ -253,8 +250,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Starting reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -279,8 +276,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # stat on dir g.log.info("stat on directory on all mounts") for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s stat %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s stat %s" % ( + self.script_upload_path, mount_obj.mountpoint) ret, _, _ = g.run(mount_obj.client_system, cmd) self.assertFalse(ret, 'Failed to stat directory on %s' @@ -291,8 +288,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # ls on mount point g.log.info("ls on mount point on all mounts") for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s ls %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s ls %s" % ( + self.script_upload_path, mount_obj.mountpoint) ret, _, _ = g.run(mount_obj.client_system, cmd) self.assertFalse(ret, 'Failed to ls on %s' @@ -360,9 +357,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Starting IO on all mounts...") g.log.info("mounts: %s", self.mounts) all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name file %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) @@ -378,8 +375,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Start reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -418,9 +415,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Starting IO on all mounts...") g.log.info("mounts: %s", self.mounts) all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name second_file %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) @@ -436,8 +433,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Start reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -461,9 +458,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mount.....") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name third_file %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) @@ -479,8 +476,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Start reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -504,9 +501,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # start I/0 ( write and read ) - read must pass, write will fail g.log.info("Starting IO on mount......") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name fourth_file %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) @@ -524,8 +521,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Start reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -550,9 +547,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mount.....") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name fifth_file %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) @@ -568,8 +565,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Start reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -593,9 +590,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # start I/0 ( write and read ) - read must pass, write will fail g.log.info("Start creating files on mounts.....") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name sixth_file %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) @@ -613,8 +610,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Start reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -638,9 +635,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mount.....") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name seventh_file %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) @@ -656,8 +653,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Start reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -682,9 +679,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mount.....") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name eigth_file %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) @@ -700,8 +697,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Start reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -735,9 +732,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # start I/0 ( write and read ) - read must pass, write will fail g.log.info("Start creating files on mounts.....") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name ninth_file %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) @@ -755,8 +752,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Start reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) @@ -780,9 +777,9 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mount.....") all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name tenth_file %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) @@ -798,8 +795,8 @@ class ClientSideQuorumCross2Tests(GlusterBaseClass): g.log.info("Start reading files on all mounts") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + 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/afr/test_client_side_quorum_with_fixed_for_cross3.py b/tests/functional/afr/test_client_side_quorum_with_fixed_for_cross3.py index ca5f7dfe3..0d7241aef 100755 --- a/tests/functional/afr/test_client_side_quorum_with_fixed_for_cross3.py +++ b/tests/functional/afr/test_client_side_quorum_with_fixed_for_cross3.py @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2019 Red Hat, Inc. <http://www.redhat.com> +# Copyright (C) 2016-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 @@ -17,8 +17,6 @@ """ Description: Test Cases in this module tests the client side quorum. """ - -import sys from time import sleep from glusto.core import Glusto as g @@ -153,9 +151,9 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): # start I/O( write ) - must succeed all_mounts_procs = [] g.log.info("Starting IO on mountpoint %s", self.mounts[0].mountpoint) - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name file %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) @@ -169,8 +167,8 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): # read the file g.log.info("Start reading files on %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, self.mounts[0].mountpoint) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) @@ -205,9 +203,9 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name testfile %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) @@ -222,8 +220,8 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): g.log.info("Start reading files on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, self.mounts[0].mountpoint) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) @@ -252,9 +250,9 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + 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, self.mounts[0].mountpoint)) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) @@ -269,8 +267,8 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): g.log.info("Start reading files on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, self.mounts[0].mountpoint) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) @@ -292,9 +290,9 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name filename %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) @@ -309,8 +307,8 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): g.log.info("Start reading files on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, self.mounts[0].mountpoint) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) @@ -381,9 +379,9 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name newfilename %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) @@ -398,8 +396,8 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): g.log.info("Start reading files on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, self.mounts[0].mountpoint) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) @@ -424,9 +422,9 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name textfile %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) @@ -441,8 +439,8 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): g.log.info("Start reading files on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, self.mounts[0].mountpoint) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) @@ -464,9 +462,9 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name newtextfile %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) @@ -481,8 +479,8 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): g.log.info("Start reading files on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, self.mounts[0].mountpoint) proc = g.run_async(self.mounts[0].client_system, cmd, user=self.mounts[0].user) @@ -652,9 +650,9 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): # start I/0 ( write and read ) - must succeed g.log.info("Starting IO on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = ("/usr/bin/env python%d %s create_files " + cmd = ("/usr/bin/env python %s create_files " "-f 10 --base-file-name lastfile %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) @@ -669,8 +667,8 @@ class ClientSideQuorumTestsWithSingleVolumeCross3(GlusterBaseClass): g.log.info("Start reading files on mountpoint %s", self.mounts[0].mountpoint) all_mounts_procs = [] - cmd = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s read %s" % ( + 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/afr/test_client_side_quorum_with_multiple_volumes.py b/tests/functional/afr/test_client_side_quorum_with_multiple_volumes.py index 7e060be9a..e3ed906f2 100644 --- a/tests/functional/afr/test_client_side_quorum_with_multiple_volumes.py +++ b/tests/functional/afr/test_client_side_quorum_with_multiple_volumes.py @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2017 Red Hat, Inc. <http://www.redhat.com> +# Copyright (C) 2016-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 @@ -17,8 +17,6 @@ """ Description: Test Cases in this module tests the client side quorum. """ - -import sys import tempfile from glusto.core import Glusto as g @@ -228,9 +226,9 @@ class ClientSideQuorumTestsMultipleVols(GlusterBaseClass): for mount_point in self.mount_points: self.all_mounts_procs = [] g.log.info('Creating files...') - command = ("/usr/bin/env python%d %s create_files -f 50 " + command = ("/usr/bin/env python %s create_files -f 50 " "--fixed-file-size 1k %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, mount_point)) proc = g.run_async(self.mounts[0].client_system, command) diff --git a/tests/functional/afr/test_conservative_merge_of_files_heal_command.py b/tests/functional/afr/test_conservative_merge_of_files_heal_command.py index e8752357b..eab9d870e 100644 --- a/tests/functional/afr/test_conservative_merge_of_files_heal_command.py +++ b/tests/functional/afr/test_conservative_merge_of_files_heal_command.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2018 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,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) @@ -161,9 +159,9 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create files g.log.info('Creating files...') - command = ("/usr/bin/env python%d %s create_deep_dirs_with_files " + command = ("/usr/bin/env python %s create_deep_dirs_with_files " "-d 0 -l 5 -f 10 --dirname-start-num 1 %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, command, @@ -206,9 +204,9 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create files g.log.info('Creating files...') - command = ("/usr/bin/env python%d %s create_deep_dirs_with_files " + command = ("/usr/bin/env python %s create_deep_dirs_with_files " "-d 0 -l 5 -f 10 --dirname-start-num 6 %s" % ( - 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/afr/test_creating_deleting_files_reflect_available_space.py b/tests/functional/afr/test_creating_deleting_files_reflect_available_space.py index 1ef3ebbeb..edf4569bc 100644 --- a/tests/functional/afr/test_creating_deleting_files_reflect_available_space.py +++ b/tests/functional/afr/test_creating_deleting_files_reflect_available_space.py @@ -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 glusto.core import Glusto as g from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) from glustolibs.gluster.exceptions import ExecutionError @@ -93,9 +92,8 @@ class VerifyAvaliableSpaceBeforeAfterDelete(GlusterBaseClass): # Create 1M file on client side g.log.info('Creating file on %s', self.mounts[0].mountpoint) - cmd = ("/usr/bin/env python%d %s create_files -f 1" - " --fixed-file-size 1M %s" % (sys.version_info.major, - self.script_upload_path, + cmd = ("/usr/bin/env python %s create_files -f 1" + " --fixed-file-size 1M %s" % (self.script_upload_path, self.mounts[0].mountpoint)) ret, _, err = g.run(self.mounts[0].client_system, cmd) self.assertFalse(ret, err) @@ -110,10 +108,9 @@ class VerifyAvaliableSpaceBeforeAfterDelete(GlusterBaseClass): # Create 1M file on client side g.log.info('Creating file on %s', self.mounts[0].mountpoint) - cmd = ("/usr/bin/env python%d %s create_files -f 1 " + cmd = ("/usr/bin/env python %s create_files -f 1 " "--fixed-file-size 1M --base-file-name newfile %s/newdir" - % (sys.version_info.major, - self.script_upload_path, self.mounts[0].mountpoint)) + % (self.script_upload_path, self.mounts[0].mountpoint)) ret, _, err = g.run(self.mounts[0].client_system, cmd) self.assertFalse(ret, err) @@ -139,9 +136,8 @@ class VerifyAvaliableSpaceBeforeAfterDelete(GlusterBaseClass): # Delete file on client side g.log.info('Deleting file on %s', self.mounts[0].mountpoint) - cmd = ("/usr/bin/env python%d %s delete %s/newdir" - % (sys.version_info.major, - self.script_upload_path, self.mounts[0].mountpoint)) + cmd = ("/usr/bin/env python %s delete %s/newdir" + % (self.script_upload_path, self.mounts[0].mountpoint)) ret, _, err = g.run(self.mounts[0].client_system, cmd) self.assertFalse(ret, err) diff --git a/tests/functional/afr/test_dist_to_repl_automatic_heal_should_be_triggered.py b/tests/functional/afr/test_dist_to_repl_automatic_heal_should_be_triggered.py index 949292e50..074e18d09 100755 --- a/tests/functional/afr/test_dist_to_repl_automatic_heal_should_be_triggered.py +++ b/tests/functional/afr/test_dist_to_repl_automatic_heal_should_be_triggered.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2018 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,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) @@ -118,12 +116,12 @@ class TestSelfHeal(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-length 1 " "--dir-depth 1 " "--max-num-of-dirs 1 " "--num-of-files 10 %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) @@ -232,9 +230,9 @@ class TestSelfHeal(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 100 " + cmd = ("/usr/bin/env python %s create_files -f 100 " "--fixed-file-size 1k %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/afr/test_gfid_assignment_on_dist_rep_vol.py b/tests/functional/afr/test_gfid_assignment_on_dist_rep_vol.py index 9ce7a1c8d..d49a95fec 100644 --- a/tests/functional/afr/test_gfid_assignment_on_dist_rep_vol.py +++ b/tests/functional/afr/test_gfid_assignment_on_dist_rep_vol.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 @@ -21,8 +21,6 @@ is getting the gfids assigned on both the subvols of a dist-rep volume when lookup comes on that directory from the mount point. """ - -import sys import time from glusto.core import Glusto as g @@ -114,8 +112,8 @@ class AssignGfidsOnAllSubvols(GlusterBaseClass): # Create a directory on the mount g.log.info("Creating a directory") - cmd = "/usr/bin/env python%d %s create_deep_dir -d 0 -l 0 %s/dir1 " % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s create_deep_dir -d 0 -l 0 %s/dir1 " % ( + self.script_upload_path, self.mounts[0].mountpoint) ret, _, _ = g.run(self.clients[0], cmd) self.assertEqual(ret, 0, "Failed to create directory on mountpoint") diff --git a/tests/functional/afr/test_gfid_assignment_on_lookup.py b/tests/functional/afr/test_gfid_assignment_on_lookup.py index a7fde8a13..c84a9a19c 100644 --- a/tests/functional/afr/test_gfid_assignment_on_lookup.py +++ b/tests/functional/afr/test_gfid_assignment_on_lookup.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 diff --git a/tests/functional/afr/test_heal_fail_1x3.py b/tests/functional/afr/test_heal_fail_1x3.py index 9227646f0..e47832936 100644 --- a/tests/functional/afr/test_heal_fail_1x3.py +++ b/tests/functional/afr/test_heal_fail_1x3.py @@ -16,8 +16,6 @@ # pylint: disable=too-many-statements, too-many-locals -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -102,9 +100,9 @@ class TestSelfHeal(GlusterBaseClass): g.log.info("creating a file from mount point") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = ("/usr/bin/env python%d %s create_files -f 1 " + cmd = ("/usr/bin/env python %s create_files -f 1 " "--base-file-name test_file --fixed-file-size 10k %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) @@ -135,9 +133,9 @@ class TestSelfHeal(GlusterBaseClass): "from mount point") all_mounts_procs = [] for mount_obj in self.mounts: - cmd = ("/usr/bin/env python%d %s create_files -f 1 " + cmd = ("/usr/bin/env python %s create_files -f 1 " "--base-file-name test_file --fixed-file-size 1M %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/afr/test_heal_info_should_have_fixed_fields.py b/tests/functional/afr/test_heal_info_should_have_fixed_fields.py index 3ff7d9f49..92fc8868e 100644 --- a/tests/functional/afr/test_heal_info_should_have_fixed_fields.py +++ b/tests/functional/afr/test_heal_info_should_have_fixed_fields.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2018 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,9 +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 from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) @@ -112,9 +109,9 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create files g.log.info('Creating files...') - 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 -f 50 %s" % ( - 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/afr/test_manual_heal_should_trigger_heal.py b/tests/functional/afr/test_manual_heal_should_trigger_heal.py index 4d3cbb5c9..89ca9fef5 100755 --- a/tests/functional/afr/test_manual_heal_should_trigger_heal.py +++ b/tests/functional/afr/test_manual_heal_should_trigger_heal.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2018 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,9 +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 from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) @@ -113,12 +110,12 @@ class TestSelfHeal(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-length 1 " "--dir-depth 1 " "--max-num-of-dirs 1 " "--num-of-files 10 %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/afr/test_multiple_clients_dd_on_same_file_default.py b/tests/functional/afr/test_multiple_clients_dd_on_same_file_default.py index cdb1ff187..703e0e1ad 100644 --- a/tests/functional/afr/test_multiple_clients_dd_on_same_file_default.py +++ b/tests/functional/afr/test_multiple_clients_dd_on_same_file_default.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2018 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,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) @@ -146,8 +144,8 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create files g.log.info('Reading files...') - command = "/usr/bin/env python%d %s read %s" % ( - sys.version_info.major, self.script_upload_path, + command = "/usr/bin/env python %s read %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, command, diff --git a/tests/functional/afr/test_self_heal_when_dir_quota_exceeded.py b/tests/functional/afr/test_self_heal_when_dir_quota_exceeded.py index ed7837c0d..22ff5e151 100644 --- a/tests/functional/afr/test_self_heal_when_dir_quota_exceeded.py +++ b/tests/functional/afr/test_self_heal_when_dir_quota_exceeded.py @@ -20,9 +20,6 @@ Test cases in this module tests whether SHD heals the files in a directory when directory quota is exceeded. """ - -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -99,8 +96,8 @@ class HealFilesWhenDirQuotaExceeded(GlusterBaseClass): g.log.info("Creating a directory") self.all_mounts_procs = [] for mount_object in self.mounts: - cmd = "/usr/bin/env python%d %s create_deep_dir -d 0 -l 0 %s%s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s create_deep_dir -d 0 -l 0 %s%s" % ( + self.script_upload_path, mount_object.mountpoint, path) ret = g.run(mount_object.client_system, cmd) self.assertTrue(ret, "Failed to create directory on mountpoint") diff --git a/tests/functional/afr/test_self_heal_with_quota_object_limit.py b/tests/functional/afr/test_self_heal_with_quota_object_limit.py index 39d49e675..e340c0a39 100644 --- a/tests/functional/afr/test_self_heal_with_quota_object_limit.py +++ b/tests/functional/afr/test_self_heal_with_quota_object_limit.py @@ -20,9 +20,6 @@ Test cases in this module tests whether SHD heals the files in a directory when quota-object-limit is set. """ - -import sys - from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -99,8 +96,8 @@ class HealFilesWhenQuotaObjectLimitExceeded(GlusterBaseClass): g.log.info("Creating a directory") self.all_mounts_procs = [] for mount_object in self.mounts: - cmd = "/usr/bin/env python%d %s create_deep_dir -d 0 -l 0 %s%s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s create_deep_dir -d 0 -l 0 %s%s" % ( + self.script_upload_path, mount_object.mountpoint, path) ret = g.run(mount_object.client_system, cmd) self.assertTrue(ret, "Failed to create directory on mountpoint") @@ -140,9 +137,9 @@ class HealFilesWhenQuotaObjectLimitExceeded(GlusterBaseClass): for mount_object in self.mounts: g.log.info("Creating Files on %s:%s", mount_object.client_system, path) - cmd = ("/usr/bin/env python%d %s create_files -f 3 " + cmd = ("/usr/bin/env python %s create_files -f 3 " "--base-file-name file-0 %s%s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, mount_object.mountpoint, path)) ret, _, _ = g.run(mount_object.client_system, cmd) self.assertEqual(ret, 0, ("Failed to create files on %s", path)) @@ -165,10 +162,9 @@ class HealFilesWhenQuotaObjectLimitExceeded(GlusterBaseClass): # Try creating 5 more files, which should fail as the quota limit # exceeds - cmd = ("/usr/bin/env python%d %s create_files -f 5 --base-file-name " - "file-1 %s%s" % ( - sys.version_info.major, self.script_upload_path, - mount_object.mountpoint, path)) + cmd = ("/usr/bin/env python %s create_files -f 5 --base-file-name " + "file-1 %s%s" % (self.script_upload_path, + mount_object.mountpoint, path)) ret, _, _ = g.run(mount_object.client_system, cmd) self.assertNotEqual(ret, 0, ("Creating 5 files succeeded while it was" "not supposed to.")) diff --git a/tests/functional/afr/test_shd_should_not_crash_executed_heal_info.py b/tests/functional/afr/test_shd_should_not_crash_executed_heal_info.py index e6a19527d..f8a9725e3 100755 --- a/tests/functional/afr/test_shd_should_not_crash_executed_heal_info.py +++ b/tests/functional/afr/test_shd_should_not_crash_executed_heal_info.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015-2018 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,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) @@ -132,9 +130,9 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create files g.log.info('Creating files...') - command = ("/usr/bin/env python%d %s create_files -f 10 " + command = ("/usr/bin/env python %s create_files -f 10 " "--fixed-file-size 1M %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, command, @@ -170,13 +168,12 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create files g.log.info('Creating files...') - command = ("/usr/bin/env python%d %s create_files " + command = ("/usr/bin/env python %s create_files " "-f %s " "--fixed-file-size 1k " "--base-file-name new_file " "%s" - % (sys.version_info.major, - self.script_upload_path, + % (self.script_upload_path, number_of_files_one_brick_off, mount_obj.mountpoint)) @@ -241,13 +238,12 @@ class VerifySelfHealTriggersHealCommand(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create files g.log.info('Creating files...') - command = ("/usr/bin/env python%d %s create_files " + command = ("/usr/bin/env python %s create_files " "-f %s " "--fixed-file-size 1k " "--base-file-name new_new_file " "%s" - % (sys.version_info.major, - self.script_upload_path, + % (self.script_upload_path, number_of_files_two_brick_off, mount_obj.mountpoint)) diff --git a/tests/functional/afr/test_write_io_mount_point_resumed_quorum_restored.py b/tests/functional/afr/test_write_io_mount_point_resumed_quorum_restored.py index d03713c86..aa2cc0742 100755 --- a/tests/functional/afr/test_write_io_mount_point_resumed_quorum_restored.py +++ b/tests/functional/afr/test_write_io_mount_point_resumed_quorum_restored.py @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2017 Red Hat, Inc. <http://www.redhat.com> +# Copyright (C) 2016-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 @@ -151,8 +150,8 @@ class ClientSideQuorumRestored(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Creating files - cmd = "/usr/bin/env python%d %s create_files -f 30 %s" % ( - sys.version_info.major, self.script_upload_path, + cmd = "/usr/bin/env python %s create_files -f 30 %s" % ( + self.script_upload_path, mount_obj.mountpoint) proc = g.run_async(mount_obj.client_system, cmd, diff --git a/tests/functional/bvt/test_cvt.py b/tests/functional/bvt/test_cvt.py index 11f933ae5..9a2bcd9f7 100644 --- a/tests/functional/bvt/test_cvt.py +++ b/tests/functional/bvt/test_cvt.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 @@ -29,7 +29,6 @@ - n/w failure followed by heal - replace-brick """ -import sys import time from glusto.core import Glusto as g @@ -122,13 +121,13 @@ class GlusterBasicFeaturesSanityBaseClass(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 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) diff --git a/tests/functional/bvt/test_vvt.py b/tests/functional/bvt/test_vvt.py index f9035864b..4ad7bfc6a 100644 --- a/tests/functional/bvt/test_vvt.py +++ b/tests/functional/bvt/test_vvt.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 @@ -19,9 +19,6 @@ Volume Operations like start, status, stop, delete. """ - -import sys - from glusto.core import Glusto as g import pytest @@ -170,13 +167,13 @@ class VolumeAccessibilityTests(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) |