From cab83e31489002beda2478109aaa7daadddc215c Mon Sep 17 00:00:00 2001 From: Valerii Ponomarov Date: Thu, 5 Dec 2019 21:03:46 +0530 Subject: [py2to3] Add py3 support in 'tests/functional/arbiter/brick_cases' Change-Id: Ieecf4707ee6cb7b3c58380306bf105e282986b1b Signed-off-by: Valerii Ponomarov --- .../arbiter/brick_cases/test_brickcases.py | 27 ++++++++++++---------- .../brick_cases/test_cyclic_brick_kill_list.py | 14 +++++++---- .../test_impact_of_replace_brick_for_glustershd.py | 6 ++--- .../brick_cases/test_replica3_to_arbiter.py | 8 +++---- .../arbiter/brick_cases/test_rmvrf_files.py | 21 +++++++++-------- 5 files changed, 43 insertions(+), 33 deletions(-) (limited to 'tests/functional/arbiter') diff --git a/tests/functional/arbiter/brick_cases/test_brickcases.py b/tests/functional/arbiter/brick_cases/test_brickcases.py index ec5ac0a0e..51f89714c 100755 --- a/tests/functional/arbiter/brick_cases/test_brickcases.py +++ b/tests/functional/arbiter/brick_cases/test_brickcases.py @@ -16,7 +16,10 @@ """ Test Arbiter Specific Cases""" +import sys + from glusto.core import Glusto as g + from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) from glustolibs.gluster.volume_libs import ( log_volume_info_and_status, replace_brick_from_volume, @@ -41,7 +44,7 @@ class GlusterArbiterVolumeTypeChangeClass(GlusterBaseClass): @classmethod def setUpClass(cls): # Calling GlusterBaseClass setUpClass - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Overriding the volume type to specifically test the volume type # change from replicated to arbiter @@ -91,8 +94,8 @@ class GlusterArbiterVolumeTypeChangeClass(GlusterBaseClass): """ - Setup Volume and Mount Volume """ - # Calling GlusterBaseClass setUpClass - GlusterBaseClass.setUpClass.im_func(self) + # Calling GlusterBaseClass setUp + self.get_super_method(self, 'setUp')() self.all_mounts_procs = [] self.io_validation_complete = False @@ -135,7 +138,7 @@ class GlusterArbiterVolumeTypeChangeClass(GlusterBaseClass): g.log.info("Successful in Unmount Volume and Cleanup Volume") # Calling GlusterBaseClass tearDown - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() def test_replicated_to_arbiter_volume_change_with_volume_ops(self): """ @@ -152,14 +155,14 @@ class GlusterArbiterVolumeTypeChangeClass(GlusterBaseClass): for mount_obj in self.mounts: g.log.info("Starting IO on %s:%s", mount_obj.client_system, mount_obj.mountpoint) - cmd = ("python %s create_deep_dirs_with_files " + cmd = ("/usr/bin/env python%d %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" % (self.script_upload_path, - self.counter, - mount_obj.mountpoint)) + "--num-of-files 5 %s" % ( + sys.version_info.major, self.script_upload_path, + self.counter, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) self.all_mounts_procs.append(proc) @@ -221,14 +224,14 @@ class GlusterArbiterVolumeTypeChangeClass(GlusterBaseClass): for mount_obj in self.mounts: g.log.info("Starting IO on %s:%s", mount_obj.client_system, mount_obj.mountpoint) - cmd = ("python %s create_deep_dirs_with_files " + cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files " "--dirname-start-num %d " "--dir-depth 2 " "--dir-length 35 " "--max-num-of-dirs 5 " - "--num-of-files 5 %s" % (self.script_upload_path, - self.counter, - mount_obj.mountpoint)) + "--num-of-files 5 %s" % ( + sys.version_info.major, self.script_upload_path, + self.counter, 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/arbiter/brick_cases/test_cyclic_brick_kill_list.py b/tests/functional/arbiter/brick_cases/test_cyclic_brick_kill_list.py index 8dbf0bcac..61e73d3e1 100755 --- a/tests/functional/arbiter/brick_cases/test_cyclic_brick_kill_list.py +++ b/tests/functional/arbiter/brick_cases/test_cyclic_brick_kill_list.py @@ -14,8 +14,11 @@ # 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 + from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on from glustolibs.gluster.volume_libs import log_volume_info_and_status from glustolibs.gluster.brick_libs import ( @@ -41,7 +44,7 @@ class ListMount(GlusterBaseClass): @classmethod def setUpClass(cls): # Calling GlusterBaseClass setUpClass - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Upload io scripts for running IO on mounts g.log.info("Upload io scripts to clients %s for running IO on mounts", @@ -73,7 +76,7 @@ class ListMount(GlusterBaseClass): def setUp(self): # Calling GlusterBaseClass setUp - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() self.all_mounts_procs = [] self.io_validation_complete = False @@ -117,7 +120,7 @@ class ListMount(GlusterBaseClass): g.log.info("Successful in Unmount Volume and Cleanup Volume") # Calling GlusterBaseClass tearDown - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() def test_files_on_mount(self): """"" @@ -134,13 +137,14 @@ class ListMount(GlusterBaseClass): for mount_obj in self.mounts: g.log.info("Starting IO on %s:%s", mount_obj.client_system, mount_obj.mountpoint) - cmd = ("python %s " + cmd = ("/usr/bin/env python%d %s " "--file-sizes-list 1G " "--chunk-sizes-list 128 " "--write-time 900 " "--num-of-files 2 " "--base-file-name test_brick_down_from_client_%s.txt " - "--dir %s " % (self.script_upload_path, + "--dir %s " % (sys.version_info.major, + self.script_upload_path, mount_obj.client_system, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, diff --git a/tests/functional/arbiter/brick_cases/test_impact_of_replace_brick_for_glustershd.py b/tests/functional/arbiter/brick_cases/test_impact_of_replace_brick_for_glustershd.py index a8a222c24..9e4cfee46 100644 --- a/tests/functional/arbiter/brick_cases/test_impact_of_replace_brick_for_glustershd.py +++ b/tests/functional/arbiter/brick_cases/test_impact_of_replace_brick_for_glustershd.py @@ -41,7 +41,7 @@ class ImpactOfReplaceBrickForGlustershdTests(GlusterBaseClass): @classmethod def setUpClass(cls): # Calling GlusterBaseClass setUpClass - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Override Volumes if cls.volume_type == "distributed-replicated": @@ -61,7 +61,7 @@ class ImpactOfReplaceBrickForGlustershdTests(GlusterBaseClass): """ # calling GlusterBaseClass setUp - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() self.all_mounts_procs = [] self.io_validation_complete = False @@ -88,7 +88,7 @@ class ImpactOfReplaceBrickForGlustershdTests(GlusterBaseClass): g.log.info("Successful in umounting the volume and Cleanup") # Calling GlusterBaseClass teardown - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() def test_impact_of_replace_brick_for_glustershd(self): # pylint: disable=too-many-statements,too-many-branches,too-many-locals diff --git a/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py b/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py index 33e92e9ee..167098c06 100755 --- a/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py +++ b/tests/functional/arbiter/brick_cases/test_replica3_to_arbiter.py @@ -33,7 +33,7 @@ class GlusterArbiterVolumeTypeClass(GlusterBaseClass): @classmethod def setUpClass(cls): # Calling GlusterBaseClass setUpClass - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Overriding the volume type to specifically test the volume type @@ -47,8 +47,8 @@ class GlusterArbiterVolumeTypeClass(GlusterBaseClass): """ Setup Volume """ - # Calling GlusterBaseClass setUpClass - GlusterBaseClass.setUpClass.im_func(self) + # Calling GlusterBaseClass setUp + self.get_super_method(self, 'setUp')() # Setup Volume g.log.info("Starting to Setup Volume") @@ -68,7 +68,7 @@ class GlusterArbiterVolumeTypeClass(GlusterBaseClass): g.log.info("Successful Cleanup Volume") # Calling GlusterBaseClass tearDown - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() # Clearing bricks for subvol in self.subvols: diff --git a/tests/functional/arbiter/brick_cases/test_rmvrf_files.py b/tests/functional/arbiter/brick_cases/test_rmvrf_files.py index 5d8e87ed5..25e876f00 100755 --- a/tests/functional/arbiter/brick_cases/test_rmvrf_files.py +++ b/tests/functional/arbiter/brick_cases/test_rmvrf_files.py @@ -14,7 +14,10 @@ # 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.volume_libs import ( log_volume_info_and_status) @@ -40,7 +43,7 @@ class TestRmrfMount(GlusterBaseClass): @classmethod def setUpClass(cls): # Calling GlusterBaseClass setUpClass - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Upload io scripts for running IO on mounts g.log.info("Upload io scripts to clients %s for running IO on mounts", @@ -72,7 +75,7 @@ class TestRmrfMount(GlusterBaseClass): def setUp(self): # Calling GlusterBaseClass setUp - GlusterBaseClass.setUp.im_func(self) + self.get_super_method(self, 'setUp')() self.all_mounts_procs = [] self.io_validation_complete = False @@ -110,7 +113,7 @@ class TestRmrfMount(GlusterBaseClass): g.log.info("Successful in Unmount Volume and Cleanup Volume") # Calling GlusterBaseClass tearDown - GlusterBaseClass.tearDown.im_func(self) + self.get_super_method(self, 'tearDown')() def test_self_heal(self): """ @@ -130,14 +133,14 @@ class TestRmrfMount(GlusterBaseClass): for mount_obj in self.mounts: g.log.info("Starting IO on %s:%s", mount_obj.client_system, mount_obj.mountpoint) - cmd = ("python %s create_deep_dirs_with_files " + cmd = ("/usr/bin/env python%d %s create_deep_dirs_with_files " "--dirname-start-num %d " "--dir-depth 2 " "--dir-length 35 " "--max-num-of-dirs 5 " - "--num-of-files 5 %s" % (self.script_upload_path, - self.counter, - mount_obj.mountpoint)) + "--num-of-files 5 %s" % ( + sys.version_info.major, self.script_upload_path, + self.counter, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) self.all_mounts_procs.append(proc) @@ -146,10 +149,10 @@ class TestRmrfMount(GlusterBaseClass): # Select bricks to bring offline bricks_to_bring_offline_dict = (select_bricks_to_bring_offline( self.mnode, self.volname)) - bricks_to_bring_offline = filter(None, ( + bricks_to_bring_offline = list(filter(None, ( bricks_to_bring_offline_dict['hot_tier_bricks'] + bricks_to_bring_offline_dict['cold_tier_bricks'] + - bricks_to_bring_offline_dict['volume_bricks'])) + bricks_to_bring_offline_dict['volume_bricks']))) # Killing one brick from the volume set g.log.info("Bringing bricks: %s offline", bricks_to_bring_offline) -- cgit