summaryrefslogtreecommitdiffstats
path: root/tests/basic
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2016-03-05 21:41:33 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-03-11 00:37:40 -0800
commit805a9c7a40e22f811019f4a854636c30c164525b (patch)
tree7e9a23edcf27c6e009973dd60b5be5a5750915b5 /tests/basic
parent07a5d9e1e103c8e3ab69283711ee0832d469e145 (diff)
tests: Use force_umount instead of umount
umount leads to spurious failures with "mount is busy" kind of errors at the time of umount. Use 'force_umount' instead. BUG: 1310171 Change-Id: I5a5579288f002de14effc00b793143fef86eb828 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/13611 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Ravishankar N <ravishankar@redhat.com> Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com>
Diffstat (limited to 'tests/basic')
-rw-r--r--tests/basic/afr/arbiter-mount.t6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/basic/afr/arbiter-mount.t b/tests/basic/afr/arbiter-mount.t
index 37e06bbbfba..7276285202f 100644
--- a/tests/basic/afr/arbiter-mount.t
+++ b/tests/basic/afr/arbiter-mount.t
@@ -23,7 +23,7 @@ TEST kill_brick $V0 $H0 $B0/${V0}1
# So check that stat <mount> fails instead.
TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
TEST ! stat $M0
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
mount_nfs $H0:/$V0 $N0
TEST [ $? -ne 0 ]
@@ -35,10 +35,10 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
TEST stat $M0
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
mount_nfs $H0:/$V0 $N0
TEST [ $? -eq 0 ]
-TEST umount $N0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0
cleanup