From 9be561b4437c912f78609a15e71bdf4e4f772547 Mon Sep 17 00:00:00 2001 From: kshithijiyer Date: Thu, 20 Feb 2020 12:54:40 +0530 Subject: [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 --- .../dht/test_add_brick_while_remove_brick_is_in_progress.py | 8 +++----- tests/functional/dht/test_dir_change_perm_recursive.py | 8 +++----- tests/functional/dht/test_exericse_rebalance_command.py | 9 ++++----- tests/functional/dht/test_rebalance_add_brick_command.py | 8 +++----- .../dht/test_rebalance_dir_file_from_multiple_clients.py | 8 +++----- tests/functional/dht/test_rebalance_start_when_glusterd_down.py | 7 +++---- .../dht/test_rebalance_while_remove_brick_is_in_progress.py | 8 +++----- tests/functional/dht/test_rebalance_with_hidden_files.py | 8 +++----- .../dht/test_remove_brick_while_rebalance_is_running.py | 7 +++---- tests/functional/dht/test_restart_glusterd_after_rebalance.py | 8 +++----- .../dht/test_stop_glusterd_while_rebalance_in_progress.py | 7 +++---- .../dht/test_volume_start_stop_while_rebalance_in_progress.py | 8 +++----- 12 files changed, 37 insertions(+), 57 deletions(-) (limited to 'tests/functional/dht') diff --git a/tests/functional/dht/test_add_brick_while_remove_brick_is_in_progress.py b/tests/functional/dht/test_add_brick_while_remove_brick_is_in_progress.py index ce787f108..9c23c131e 100644 --- a/tests/functional/dht/test_add_brick_while_remove_brick_is_in_progress.py +++ b/tests/functional/dht/test_add_brick_while_remove_brick_is_in_progress.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 @@ -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.brick_ops import add_brick, remove_brick @@ -85,13 +83,13 @@ class RemoveBrickValidation(GlusterBaseClass): for index, mount_obj in enumerate(self.mounts, start=1): 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 10 %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, index + 10, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/dht/test_dir_change_perm_recursive.py b/tests/functional/dht/test_dir_change_perm_recursive.py index ee6a04aa6..10ce65cfb 100644 --- a/tests/functional/dht/test_dir_change_perm_recursive.py +++ b/tests/functional/dht/test_dir_change_perm_recursive.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 @@ -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.constants import \ @@ -108,13 +106,13 @@ class DirChangePermRecursive(GlusterBaseClass): for index, mount_obj in enumerate(self.mounts, start=1): 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 5 " "--num-of-files 5 %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, index + 10, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/dht/test_exericse_rebalance_command.py b/tests/functional/dht/test_exericse_rebalance_command.py index e47f7b7a2..1ab740cb6 100644 --- a/tests/functional/dht/test_exericse_rebalance_command.py +++ b/tests/functional/dht/test_exericse_rebalance_command.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 time import sleep from glusto.core import Glusto as g from glustolibs.gluster.exceptions import ExecutionError @@ -89,14 +88,14 @@ class TestExerciseRebalanceCommand(GlusterBaseClass): for index, mount_obj in enumerate(self.mounts, start=1): 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 10 %s" % ( - sys.version_info.major, self.script_upload_path, - index + 10, mount_obj.mountpoint)) + "--num-of-files 10 %s" % (self.script_upload_path, + index + 10, + mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) self.all_mounts_procs.append(proc) diff --git a/tests/functional/dht/test_rebalance_add_brick_command.py b/tests/functional/dht/test_rebalance_add_brick_command.py index 0ccc8031d..3e3fc190e 100644 --- a/tests/functional/dht/test_rebalance_add_brick_command.py +++ b/tests/functional/dht/test_rebalance_add_brick_command.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 @@ -16,8 +16,6 @@ """Positive test - Exercise Add-brick command""" -import sys - from glusto.core import Glusto as g from glustolibs.gluster.brick_libs import get_all_bricks @@ -136,13 +134,13 @@ class ExerciseAddbrickCommand(GlusterBaseClass): for index, mount_obj in enumerate(self.mounts, start=1): 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 10 %s" % ( - sys.version_info.major, script_location, index + 10, + script_location, index + 10, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/dht/test_rebalance_dir_file_from_multiple_clients.py b/tests/functional/dht/test_rebalance_dir_file_from_multiple_clients.py index 364406147..dd80479bb 100644 --- a/tests/functional/dht/test_rebalance_dir_file_from_multiple_clients.py +++ b/tests/functional/dht/test_rebalance_dir_file_from_multiple_clients.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 @@ -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.constants import FILETYPE_DIRS @@ -112,13 +110,13 @@ class RebalanceValidation(GlusterBaseClass): for index, mount_obj in enumerate(self.mounts, start=1): 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 5 " "--num-of-files 5 %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, index + 10, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/dht/test_rebalance_start_when_glusterd_down.py b/tests/functional/dht/test_rebalance_start_when_glusterd_down.py index c17a44431..885deb2b0 100644 --- a/tests/functional/dht/test_rebalance_start_when_glusterd_down.py +++ b/tests/functional/dht/test_rebalance_start_when_glusterd_down.py @@ -1,4 +1,4 @@ -# Copyright (C) 2019 Red Hat, Inc. +# Copyright (C) 2019-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 @@ -15,7 +15,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from random import choice -import sys from time import sleep from glusto.core import Glusto as g @@ -70,13 +69,13 @@ class RebalanceValidation(GlusterBaseClass): for index, mount_obj in enumerate(cls.mounts, start=1): 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 1 " "--dir-length 1 " "--max-num-of-dirs 1 " "--num-of-files 1 %s" % ( - sys.version_info.major, cls.script_upload_path, + cls.script_upload_path, index + 10, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/dht/test_rebalance_while_remove_brick_is_in_progress.py b/tests/functional/dht/test_rebalance_while_remove_brick_is_in_progress.py index 264e386bb..5baae95c1 100644 --- a/tests/functional/dht/test_rebalance_while_remove_brick_is_in_progress.py +++ b/tests/functional/dht/test_rebalance_while_remove_brick_is_in_progress.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 @@ -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.brick_ops import remove_brick @@ -74,13 +72,13 @@ class RemoveBrickValidation(GlusterBaseClass): for index, mount_obj in enumerate(self.mounts, start=1): 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, index + 10, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/dht/test_rebalance_with_hidden_files.py b/tests/functional/dht/test_rebalance_with_hidden_files.py index b033f40fe..b0cb9b340 100644 --- a/tests/functional/dht/test_rebalance_with_hidden_files.py +++ b/tests/functional/dht/test_rebalance_with_hidden_files.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 @@ -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.constants import FILETYPE_FILES @@ -96,9 +94,9 @@ class RebalanceValidation(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 " + cmd = ("/usr/bin/env python %s create_files " "--base-file-name . -f 99 %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/dht/test_remove_brick_while_rebalance_is_running.py b/tests/functional/dht/test_remove_brick_while_rebalance_is_running.py index 1acfe19db..c3ae26432 100644 --- a/tests/functional/dht/test_remove_brick_while_rebalance_is_running.py +++ b/tests/functional/dht/test_remove_brick_while_rebalance_is_running.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 @@ -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 @@ -94,13 +93,13 @@ class RebalanceValidation(GlusterBaseClass): for index, mount_obj in enumerate(self.mounts, start=1): 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 5 " "--num-of-files 10 %s" % ( - sys.version_info.major, self.script_upload_path, + self.script_upload_path, index + 10, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/dht/test_restart_glusterd_after_rebalance.py b/tests/functional/dht/test_restart_glusterd_after_rebalance.py index 95f194a35..5c278318d 100644 --- a/tests/functional/dht/test_restart_glusterd_after_rebalance.py +++ b/tests/functional/dht/test_restart_glusterd_after_rebalance.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 @@ -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.exceptions import ExecutionError @@ -69,13 +67,13 @@ class RebalanceValidation(GlusterBaseClass): for index, mount_obj in enumerate(cls.mounts, start=1): 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 1 " "--num-of-files 2 %s" % ( - sys.version_info.major, cls.script_upload_path, + cls.script_upload_path, index + 10, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/dht/test_stop_glusterd_while_rebalance_in_progress.py b/tests/functional/dht/test_stop_glusterd_while_rebalance_in_progress.py index b89e9b703..ba689f3c6 100644 --- a/tests/functional/dht/test_stop_glusterd_while_rebalance_in_progress.py +++ b/tests/functional/dht/test_stop_glusterd_while_rebalance_in_progress.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 @@ -15,7 +15,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import random -import sys from time import sleep from glusto.core import Glusto as g @@ -73,13 +72,13 @@ class RebalanceValidation(GlusterBaseClass): for index, mount_obj in enumerate(cls.mounts, start=1): 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 3 " "--dir-length 3 " "--max-num-of-dirs 3 " "--num-of-files 10 %s" % ( - sys.version_info.major, cls.script_upload_path, + cls.script_upload_path, index + 10, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) diff --git a/tests/functional/dht/test_volume_start_stop_while_rebalance_in_progress.py b/tests/functional/dht/test_volume_start_stop_while_rebalance_in_progress.py index df310a819..73f9949ef 100644 --- a/tests/functional/dht/test_volume_start_stop_while_rebalance_in_progress.py +++ b/tests/functional/dht/test_volume_start_stop_while_rebalance_in_progress.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 @@ -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.constants import FILETYPE_DIRS, FILETYPE_FILES @@ -88,13 +86,13 @@ class RebalanceValidation(GlusterBaseClass): for index, mount_obj in enumerate(cls.mounts, start=1): 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 1 " "--dir-length 2 " "--max-num-of-dirs 2 " "--num-of-files 55 %s" % ( - sys.version_info.major, cls.script_upload_path, + cls.script_upload_path, index + 10, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) -- cgit