diff options
Diffstat (limited to 'tests/functional/afr/heal')
3 files changed, 14 insertions, 21 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) |