9 files changed, 14 insertions, 12 deletions
diff --git a/tests/bugs/distribute/bug-1117851.t b/tests/bugs/distribute/bug-1117851.t
index 4e35debae9d..678103869cf 100755
--- a/tests/bugs/distribute/bug-1117851.t
+++ b/tests/bugs/distribute/bug-1117851.t
@@ -85,8 +85,8 @@ TEST move_files $M1
 EXPECT_WITHIN 120 "done" cat $M0/status_0
 EXPECT_WITHIN 120 "done" cat $M1/status_1
 
-TEST umount $M0
-TEST umount $M1
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M1
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
 TEST check_files $M0
 
diff --git a/tests/bugs/distribute/bug-1161311.t b/tests/bugs/distribute/bug-1161311.t
index d1bd47826f9..c5a7f041ac8 100755
--- a/tests/bugs/distribute/bug-1161311.t
+++ b/tests/bugs/distribute/bug-1161311.t
@@ -63,7 +63,7 @@ dd if=/dev/urandom of=$M0/dir1/FILE2 bs=64k count=10240
 TEST mv $M0/dir1/FILE2 $M0/dir1/FILE1
 
 # unmount and remount the volume
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
 TEST glusterfs -s $H0 --volfile-id $V0 $M0;
 
 # Start the rebalance
diff --git a/tests/bugs/distribute/bug-1190734.t b/tests/bugs/distribute/bug-1190734.t
index 895dd771ed6..ae34ec84729 100644
--- a/tests/bugs/distribute/bug-1190734.t
+++ b/tests/bugs/distribute/bug-1190734.t
@@ -22,7 +22,7 @@ function get_file_count {
 
 function reset {
     $CLI volume stop $V0
-    umount $1
+    ${UMOUNT_F} $1
     $CLI volume delete $V0
 }
 
diff --git a/tests/bugs/geo-replication/bug-1111490.t b/tests/bugs/geo-replication/bug-1111490.t
index c29a79a492e..28291f25b9b 100644
--- a/tests/bugs/geo-replication/bug-1111490.t
+++ b/tests/bugs/geo-replication/bug-1111490.t
@@ -24,7 +24,7 @@ EXPECT "$uuid" getfattr --only-values -n glusterfs.gfid.string $M0/file0
 
 # unmount and mount again so as to start with a fresh inode table
 # or use another mount...
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
 TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 --aux-gfid-mount
 
 # touch the file again (gfid-access.py handles errno)
diff --git a/tests/bugs/glusterfs/bug-867253.t b/tests/bugs/glusterfs/bug-867253.t
index aee27c87158..41972a7731b 100644
--- a/tests/bugs/glusterfs/bug-867253.t
+++ b/tests/bugs/glusterfs/bug-867253.t
@@ -37,7 +37,7 @@ touch $M0/files{1..1000};
 # Kill a brick process
 kill -9 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0-d-backends-${V0}0.pid`;
 
-( cd $M0 ; umount $M0 ) # fail but drops kernel cache
+drop_cache $M0
 
 ls -l $M0 >/dev/null;
 
@@ -48,7 +48,7 @@ TEST $CLI volume start $V0 force
 # Kill a brick process
 kill -9 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0-d-backends-${V0}1.pid`;
 
-( cd $M0 ; umount $M0 )
+drop_cache $M0
 
 ls -l $M0 >/dev/null;
 
diff --git a/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t b/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t
index cd4a9bad87b..f332019d893 100644
--- a/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t
+++ b/tests/bugs/replicate/bug-1221481-allow-fops-on-dir-split-brain.t
@@ -33,5 +33,5 @@ EXPECT "6" echo $(ls | wc -l)
 TEST ! cat FILE
 TEST `echo hello>hello.txt`
 cd -
-TEST umount $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
 cleanup
diff --git a/tests/bugs/rpc/bug-954057.t b/tests/bugs/rpc/bug-954057.t
index faaf261d88b..65af274f09d 100755
--- a/tests/bugs/rpc/bug-954057.t
+++ b/tests/bugs/rpc/bug-954057.t
@@ -8,7 +8,7 @@
 # Note on re-reading $M0/new after enabling root-squash:
 # Since we have readen it once, the file is present in various caches.
 # In order to actually fail on second attempt we must:
-# 1) drop kernel cache, by ( cd $M0 ; umount $M0 )
+# 1) drop kernel cache
 # 2) make sure FUSE does not cache the entry. This is also
 #    in the kernel, but not flushed by a failed umount.
 #    Using $GFS enforces this because it sets --entry-timeout=0
@@ -33,7 +33,7 @@ TEST cat $M0/new
 
 TEST $CLI volume set $V0 performance.stat-prefetch off
 TEST $CLI volume set $V0 server.root-squash enable
-( cd $M0 ; umount $M0 ) # fails but drops kernel cache
+drop_cache $M0
 TEST ! mkdir $M0/other
 TEST mkdir $M0/nobody/other
 TEST cat $M0/file
diff --git a/tests/bugs/snapshot/bug-1162498.t b/tests/bugs/snapshot/bug-1162498.t
index afc065000d5..a97e4429ee7 100755
--- a/tests/bugs/snapshot/bug-1162498.t
+++ b/tests/bugs/snapshot/bug-1162498.t
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 . $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 . $(dirname $0)/../../snapshot.rc
 
 cleanup;
@@ -35,7 +36,7 @@ TEST $CLI volume stop $V0
 TEST $CLI snapshot restore snap2
 TEST $CLI volume start $V0
 
-umount -f $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
 TEST glusterfs -s $H0 --volfile-id=$V0 $M0
 
 #Dir xyz exists in snap1
diff --git a/tests/bugs/snapshot/bug-1164613.t b/tests/bugs/snapshot/bug-1164613.t
index d7f956ce369..225234dc43e 100644
--- a/tests/bugs/snapshot/bug-1164613.t
+++ b/tests/bugs/snapshot/bug-1164613.t
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 . $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
 . $(dirname $0)/../../snapshot.rc
 
 cleanup;
@@ -23,7 +24,7 @@ TEST $CLI volume set $V0 snapshot-directory snaps
 
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $M0/snaps/snaps/testfile
 
-umount -f $M0
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
 
 #Clean up
 TEST $CLI snapshot delete snaps