From 25064013d6c0889db3d2bf931b0b2d01c72f6a96 Mon Sep 17 00:00:00 2001 From: Sri Vignesh Date: Fri, 27 Dec 2019 12:16:33 +0530 Subject: Add steps to stabilize the existing content in glusterd Added wait_for_io_to_complete function to testcases used wait_for_glusterd function and wait_for_peer_connect function Change-Id: I4811848aad8cca4198cc93d8e200dfc47ae7ac9b Signed-off-by: Sri Vignesh --- tests/functional/glusterd/test_rebalance_spurious.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'tests/functional/glusterd/test_rebalance_spurious.py') diff --git a/tests/functional/glusterd/test_rebalance_spurious.py b/tests/functional/glusterd/test_rebalance_spurious.py index 7b8fc513b..d0e792bd6 100644 --- a/tests/functional/glusterd/test_rebalance_spurious.py +++ b/tests/functional/glusterd/test_rebalance_spurious.py @@ -1,4 +1,4 @@ -# Copyright (C) 2018 Red Hat, Inc. +# Copyright (C) 2018-2020 Red Hat, Inc. # # 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 @@ -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 +from glustolibs.gluster.glusterdir import mkdir, rmdir from glustolibs.gluster.mount_ops import mount_volume, umount_volume from glustolibs.gluster.glusterfile import get_fattr @@ -57,6 +57,11 @@ 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: -- cgit