From 8d92734f289ab55910045ba7b92bbef1d0dd123c Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Thu, 19 Jun 2014 13:51:41 +0530 Subject: tests: Change umount with force_umount with 5 retries Change-Id: I0e2dbdfd34080328dfa6b4eebef0366f2b0fcb04 BUG: 1092850 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/8117 Tested-by: Justin Clift Reviewed-by: Harshavardhana Tested-by: Harshavardhana Reviewed-by: Sachin Pandit Reviewed-by: Prashanth Pai Reviewed-by: Vijay Bellur --- tests/bugs/bug-904065.t | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/bugs/bug-904065.t') diff --git a/tests/bugs/bug-904065.t b/tests/bugs/bug-904065.t index ff67745301..01880246ef 100755 --- a/tests/bugs/bug-904065.t +++ b/tests/bugs/bug-904065.t @@ -21,6 +21,7 @@ function count_lines() . $(dirname $0)/../include.rc . $(dirname $0)/../nfs.rc +. $(dirname $0)/../volume.rc cleanup @@ -52,11 +53,11 @@ TEST mount_nfs $H0:/$V0 $N1 nolock EXPECT '2' count_lines /var/lib/glusterd/nfs/rmtab # removing a mount should (even if there are two) should remove the entry -TEST umount $N1 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N1 EXPECT '0' count_lines /var/lib/glusterd/nfs/rmtab # unmounting the other mount should work flawlessly -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 EXPECT '0' count_lines /var/lib/glusterd/nfs/rmtab TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $M0 @@ -79,7 +80,7 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs $H0:/$V0 $N0 nolock EXPECT '4' count_lines $M0/rmtab -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 EXPECT '2' count_lines $M0/rmtab # TODO: nfs/reconfigure() is never called and is therefor disabled. When the -- cgit