diff options
Diffstat (limited to 'tests/functional/fuse_subdir/test_fusesubdir_with_replacebrick.py')
| -rw-r--r-- | tests/functional/fuse_subdir/test_fusesubdir_with_replacebrick.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/tests/functional/fuse_subdir/test_fusesubdir_with_replacebrick.py b/tests/functional/fuse_subdir/test_fusesubdir_with_replacebrick.py index f38e9fe3d..def9ffeba 100644 --- a/tests/functional/fuse_subdir/test_fusesubdir_with_replacebrick.py +++ b/tests/functional/fuse_subdir/test_fusesubdir_with_replacebrick.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 @@ -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. import copy + from glusto.core import Glusto as g + from glustolibs.gluster.gluster_base_class import (GlusterBaseClass, runs_on) from glustolibs.gluster.exceptions import ExecutionError @@ -29,7 +31,8 @@ from glustolibs.gluster.volume_libs import ( from glustolibs.gluster.heal_libs import monitor_heal_completion -@runs_on([['replicated', 'distributed-replicated'], +@runs_on([['replicated', 'distributed-replicated', + 'dispersed', 'distributed-dispersed'], ['glusterfs']]) class SubdirWithReplaceBrick(GlusterBaseClass): """ @@ -42,7 +45,7 @@ class SubdirWithReplaceBrick(GlusterBaseClass): setup volume and mount volume calling GlusterBaseClass setUpClass """ - GlusterBaseClass.setUpClass.im_func(cls) + cls.get_super_method(cls, 'setUpClass')() # Setup Volume and Mount Volume g.log.info("Starting to Setup and Mount Volume %s", @@ -56,11 +59,9 @@ class SubdirWithReplaceBrick(GlusterBaseClass): # 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) @@ -102,8 +103,8 @@ class SubdirWithReplaceBrick(GlusterBaseClass): g.log.info('Setting authentication on subdir25 and subdir15' 'for client %s and %s', self.clients[0], self.clients[1]) ret = set_auth_allow(self.volname, self.mnode, - {'/subdir25': [self.clients[0]], - '/subdir15': [self.clients[1]]}) + {'/subdir25': [self.mounts[0].client_system], + '/subdir15': [self.mounts[1].client_system]}) self.assertTrue(ret, 'Failed to set Authentication on volume %s' % self.volume) @@ -133,13 +134,14 @@ class SubdirWithReplaceBrick(GlusterBaseClass): for mount_obj in self.subdir_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 %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" % (self.script_upload_path, count, - mount_obj.mountpoint)) + "--num-of-files 5 %s" % ( + self.script_upload_path, count, + mount_obj.mountpoint)) proc = g.run_async(mount_obj.client_system, cmd, user=mount_obj.user) all_mounts_procs.append(proc) |