From df5846416b7ba9c75a8ee6298af5629fabb2aec2 Mon Sep 17 00:00:00 2001 From: Sri Vignesh Date: Wed, 19 Feb 2020 17:52:02 +0530 Subject: [testfix] removed the rmdir which was merged in baseclass Change-Id: I04f7b7c894d48d0188379028412d9c6b48eac210 Signed-off-by: Sri Vignesh --- tests/functional/glusterd/test_change_reserve_limit.py | 5 ----- tests/functional/glusterd/test_create_vol_with_used_bricks.py | 6 ------ tests/functional/glusterd/test_detach_node_used_to_mount.py | 6 +----- .../glusterd/test_mount_after_removing_client_logs_dir.py | 7 +------ tests/functional/glusterd/test_rebalance_hang.py | 6 ------ tests/functional/glusterd/test_rebalance_new_node.py | 8 +------- tests/functional/glusterd/test_rebalance_spurious.py | 7 +------ .../glusterd/test_remove_brick_after_restart_glusterd.py | 6 ------ 8 files changed, 4 insertions(+), 47 deletions(-) (limited to 'tests/functional/glusterd') diff --git a/tests/functional/glusterd/test_change_reserve_limit.py b/tests/functional/glusterd/test_change_reserve_limit.py index 9650e5fa1..0be88490e 100644 --- a/tests/functional/glusterd/test_change_reserve_limit.py +++ b/tests/functional/glusterd/test_change_reserve_limit.py @@ -27,7 +27,6 @@ from glustolibs.gluster.mount_ops import mount_volume, umount_volume from glustolibs.io.utils import validate_io_procs from glustolibs.gluster.brick_libs import get_all_bricks from glustolibs.gluster.brick_ops import remove_brick -from glustolibs.gluster.glusterdir import rmdir @runs_on([['distributed-replicated'], ['glusterfs']]) @@ -58,10 +57,6 @@ class TestChangeReservcelimit(GlusterBaseClass): if ret: raise ExecutionError("Volume %s is not unmounted" % self.volname) g.log.info("Volume unmounted successfully : %s", self.volname) - ret = rmdir(self.mounts[0].client_system, self.mounts[0].mountpoint) - if not ret: - raise ExecutionError("Failed to remove directory mount directory.") - g.log.info("Mount directory is removed successfully") # clean up all volumes vol_list = get_volume_list(self.mnode) diff --git a/tests/functional/glusterd/test_create_vol_with_used_bricks.py b/tests/functional/glusterd/test_create_vol_with_used_bricks.py index 2c18bcb6c..531829e9f 100644 --- a/tests/functional/glusterd/test_create_vol_with_used_bricks.py +++ b/tests/functional/glusterd/test_create_vol_with_used_bricks.py @@ -19,7 +19,6 @@ """ import sys -from time import sleep from glusto.core import Glusto as g @@ -27,7 +26,6 @@ from glustolibs.gluster.exceptions import ExecutionError from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on from glustolibs.gluster.brick_ops import add_brick from glustolibs.gluster.brick_libs import get_all_bricks -from glustolibs.gluster.glusterdir import rmdir from glustolibs.gluster.lib_utils import form_bricks_list from glustolibs.misc.misc_libs import upload_scripts from glustolibs.io.utils import validate_io_procs @@ -150,10 +148,6 @@ class TestCreateVolWithUsedBricks(GlusterBaseClass): self.assertEqual(ret, 0, "Volume %s is not unmounted" % ( self.volname)) g.log.info("Volume unmounted successfully : %s", self.volname) - sleep(2) - ret = rmdir(mount_obj.client_system, mount_obj.mountpoint) - self.assertTrue(ret, "Failed to remove directory mount directory.") - g.log.info("Mount directory is removed successfully") # Getting brick list self.brick_list = get_all_bricks(self.mnode, self.volname) diff --git a/tests/functional/glusterd/test_detach_node_used_to_mount.py b/tests/functional/glusterd/test_detach_node_used_to_mount.py index 6b541e26a..bbc2acc77 100644 --- a/tests/functional/glusterd/test_detach_node_used_to_mount.py +++ b/tests/functional/glusterd/test_detach_node_used_to_mount.py @@ -20,7 +20,7 @@ from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on from glustolibs.gluster.exceptions import ExecutionError from glustolibs.gluster.volume_libs import (setup_volume, cleanup_volume, form_bricks_list_to_add_brick) -from glustolibs.gluster.glusterdir import mkdir, rmdir +from glustolibs.gluster.glusterdir import mkdir from glustolibs.gluster.rebalance_ops import (rebalance_start, rebalance_stop) from glustolibs.gluster.peer_ops import (peer_detach, @@ -76,10 +76,6 @@ class TestChangeReservcelimit(GlusterBaseClass): if ret: raise ExecutionError("Unable to unmount volume %s" % self.volname) g.log.info("Volume unmounted successfully %s", self.volname) - ret = rmdir(self.mounts[0].client_system, self.mounts[0].mountpoint) - if not ret: - raise ExecutionError("Failed to remove directory mount directory.") - g.log.info("Mount directory is removed successfully") ret = cleanup_volume(self.mnode, self.volname) if not ret: diff --git a/tests/functional/glusterd/test_mount_after_removing_client_logs_dir.py b/tests/functional/glusterd/test_mount_after_removing_client_logs_dir.py index 5a8fd308f..886a441e4 100644 --- a/tests/functional/glusterd/test_mount_after_removing_client_logs_dir.py +++ b/tests/functional/glusterd/test_mount_after_removing_client_logs_dir.py @@ -21,7 +21,7 @@ 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.glusterdir import (get_dir_contents, mkdir, rmdir) +from glustolibs.gluster.glusterdir import (get_dir_contents, mkdir) from glustolibs.gluster.mount_ops import mount_volume, umount_volume @@ -68,11 +68,6 @@ class TestRemoveCientLogDirAndMount(GlusterBaseClass): raise ExecutionError("Volume %s is not unmounted" % self.volname) g.log.info("Volume unmounted successfully : %s", self.volname) - ret = rmdir(self.mounts[0].client_system, self.mounts[0].mountpoint) - if not ret: - raise ExecutionError("Failed to remove directory mount directory.") - g.log.info("Mount directory is removed successfully") - # clean up all volumes ret = self.cleanup_volume() if not ret: diff --git a/tests/functional/glusterd/test_rebalance_hang.py b/tests/functional/glusterd/test_rebalance_hang.py index 9c5eb93cf..7911eb277 100644 --- a/tests/functional/glusterd/test_rebalance_hang.py +++ b/tests/functional/glusterd/test_rebalance_hang.py @@ -19,7 +19,6 @@ from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on from glustolibs.gluster.volume_ops import (volume_create, volume_start, get_volume_list, get_volume_status) from glustolibs.gluster.brick_libs import get_all_bricks -from glustolibs.gluster.glusterdir import rmdir from glustolibs.gluster.volume_libs import (cleanup_volume) from glustolibs.gluster.peer_ops import (peer_probe, peer_detach, peer_probe_servers, @@ -58,11 +57,6 @@ class TestRebalanceHang(GlusterBaseClass): self.assertTrue(ret, ("Failed to Unmount Volume %s" % self.volname)) g.log.info("Successfully Unmounted Volume %s", self.volname) - ret = rmdir(self.mounts[0].client_system, self.mounts[0].mountpoint) - if not ret: - raise ExecutionError("Failed to remove directory mount directory.") - g.log.info("Mount directory is removed successfully") - # Clean up all volumes and peer probe to form cluster vol_list = get_volume_list(self.mnode) if vol_list is not None: diff --git a/tests/functional/glusterd/test_rebalance_new_node.py b/tests/functional/glusterd/test_rebalance_new_node.py index 71ce4565b..0934149d5 100644 --- a/tests/functional/glusterd/test_rebalance_new_node.py +++ b/tests/functional/glusterd/test_rebalance_new_node.py @@ -19,7 +19,6 @@ import sys from glusto.core import Glusto as g from glustolibs.gluster.gluster_base_class import GlusterBaseClass, runs_on -from glustolibs.gluster.glusterdir import rmdir from glustolibs.gluster.exceptions import ExecutionError from glustolibs.gluster.volume_libs import (setup_volume, cleanup_volume) from glustolibs.gluster.volume_ops import (get_volume_list) @@ -68,12 +67,7 @@ class TestRebalanceStatus(GlusterBaseClass): # unmount the volume ret = self.unmount_volume(self.mounts) self.assertTrue(ret, "Volume unmount failed for %s" % self.volname) - for mount_obj in self.mounts: - ret = rmdir(mount_obj.client_system, mount_obj.mountpoint) - if not ret: - raise ExecutionError("Failed to remove directory " - "mount directory.") - g.log.info("Mount directory is removed successfully") + g.log.info("Volume unmounted successfully : %s", self.volname) # get volumes list and clean up all the volumes vol_list = get_volume_list(self.mnode) diff --git a/tests/functional/glusterd/test_rebalance_spurious.py b/tests/functional/glusterd/test_rebalance_spurious.py index d0e792bd6..dab69b7b2 100644 --- a/tests/functional/glusterd/test_rebalance_spurious.py +++ b/tests/functional/glusterd/test_rebalance_spurious.py @@ -30,7 +30,7 @@ from glustolibs.gluster.brick_ops import remove_brick from glustolibs.gluster.exceptions import ExecutionError from glustolibs.gluster.rebalance_ops import (rebalance_start, wait_for_fix_layout_to_complete) -from glustolibs.gluster.glusterdir import mkdir, rmdir +from glustolibs.gluster.glusterdir import mkdir from glustolibs.gluster.mount_ops import mount_volume, umount_volume from glustolibs.gluster.glusterfile import get_fattr @@ -57,11 +57,6 @@ class TestSpuriousRebalance(GlusterBaseClass): self.assertTrue(ret, ("Failed to Unmount Volume %s" % self.volname)) g.log.info("Successfully Unmounted Volume %s", self.volname) - ret = rmdir(self.mounts[0].client_system, self.mounts[0].mountpoint) - if not ret: - raise ExecutionError("Failed to remove directory mount directory.") - g.log.info("Mount directory is removed successfully") - # Clean up all volumes and peer probe to form cluster vol_list = get_volume_list(self.mnode) if vol_list is not None: diff --git a/tests/functional/glusterd/test_remove_brick_after_restart_glusterd.py b/tests/functional/glusterd/test_remove_brick_after_restart_glusterd.py index 1cca5bc88..90e962b39 100644 --- a/tests/functional/glusterd/test_remove_brick_after_restart_glusterd.py +++ b/tests/functional/glusterd/test_remove_brick_after_restart_glusterd.py @@ -30,7 +30,6 @@ from glustolibs.gluster.brick_ops import remove_brick from glustolibs.gluster.exceptions import ExecutionError from glustolibs.gluster.mount_ops import mount_volume, umount_volume from glustolibs.io.utils import validate_io_procs, wait_for_io_to_complete -from glustolibs.gluster.glusterdir import rmdir from glustolibs.gluster.gluster_init import restart_glusterd @@ -54,11 +53,6 @@ class TestRemoveBrickAfterRestartGlusterd(GlusterBaseClass): ret = umount_volume(self.mounts[0].client_system, self.mounts[0].mountpoint, mtype=self.mount_type) self.assertTrue(ret, ("Failed to Unmount Volume %s" % self.volname)) - g.log.info("Successfully Unmounted Volume %s", self.volname) - ret = rmdir(self.mounts[0].client_system, self.mounts[0].mountpoint) - if not ret: - raise ExecutionError("Failed to remove directory mount directory.") - g.log.info("Mount directory is removed successfully") # Clean up all volumes and peer probe to form cluster vol_list = get_volume_list(self.mnode) -- cgit