diff options
Diffstat (limited to 'tests/functional/arbiter/test_replacing_all_arbiter_bricks_in_the_volume.py')
| -rwxr-xr-x | tests/functional/arbiter/test_replacing_all_arbiter_bricks_in_the_volume.py | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/tests/functional/arbiter/test_replacing_all_arbiter_bricks_in_the_volume.py b/tests/functional/arbiter/test_replacing_all_arbiter_bricks_in_the_volume.py index c1a1b5d7c..26c848171 100755 --- a/tests/functional/arbiter/test_replacing_all_arbiter_bricks_in_the_volume.py +++ b/tests/functional/arbiter/test_replacing_all_arbiter_bricks_in_the_volume.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,7 +14,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + from glusto.core import Glusto as g + from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) from glustolibs.gluster.exceptions import ExecutionError from glustolibs.gluster.volume_libs import ( @@ -33,7 +35,7 @@ from glustolibs.io.utils import (validate_io_procs, wait_for_io_to_complete) -@runs_on([['distributed-replicated'], +@runs_on([['distributed-arbiter'], ['glusterfs']]) class TestArbiterSelfHeal(GlusterBaseClass): """ @@ -44,16 +46,14 @@ class TestArbiterSelfHeal(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", cls.clients) - script_local_path = ("/usr/share/glustolibs/io/scripts/" - "file_dir_ops.py") cls.script_upload_path = ("/usr/share/glustolibs/io/scripts/" "file_dir_ops.py") - ret = upload_scripts(cls.clients, [script_local_path]) + ret = upload_scripts(cls.clients, cls.script_upload_path) if not ret: raise ExecutionError("Failed to upload IO scripts to clients %s" % cls.clients) @@ -62,20 +62,7 @@ class TestArbiterSelfHeal(GlusterBaseClass): def setUp(self): # Calling GlusterBaseClass setUp - GlusterBaseClass.setUp.im_func(self) - - # Setup Volumes - if self.volume_type == "distributed-replicated": - self.volume_configs = [] - - # Redefine distributed-replicated volume - self.volume['voltype'] = { - 'type': 'distributed-replicated', - 'replica_count': 3, - 'dist_count': 4, - 'arbiter_count': 1, - 'transport': 'tcp'} - + self.get_super_method(self, 'setUp')() self.all_mounts_procs = [] self.io_validation_complete = False self.bricks_to_clean = [] @@ -127,7 +114,7 @@ class TestArbiterSelfHeal(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_replacing_all_arbiters(self): """ @@ -159,12 +146,8 @@ class TestArbiterSelfHeal(GlusterBaseClass): mount_obj.client_system, mount_obj.mountpoint) # Create dirs with file g.log.info('Creating dirs with file...') - command = ("python %s create_deep_dirs_with_files " - "-d 3 " - "-l 3 " - "-n 3 " - "-f 20 " - "%s" + command = ("/usr/bin/env python %s create_deep_dirs_with_files " + "-d 3 -l 3 -n 3 -f 20 %s" % (self.script_upload_path, mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, command, |