tests: Avoid sleep

Change-Id: I7169be3532232754b9461c4e1b27bf6bc857f7a6
BUG: 1092850
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/8083
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>

22 files changed, 66 insertions, 129 deletions

diff --git a/tests/bugs/brick-uid-reset-on-volume-restart.t b/tests/bugs/brick-uid-reset-on-volume-restart.t
index 99629733f9b..26c4d00e9ae 100755
--- a/tests/bugs/brick-uid-reset-on-volume-restart.t
+++ b/tests/bugs/brick-uid-reset-on-volume-restart.t
@@ -39,7 +39,14 @@ EXPECT 101 get_gid $M0;
 TEST $CLI volume stop $V0;
 TEST $CLI volume start $V0;
 
-sleep 10;
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 2
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 3
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 4
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 5
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 6
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 7
 
 EXPECT 100 get_uid $M0;
 EXPECT 101 get_gid $M0;
diff --git a/tests/bugs/bug-1037501.t b/tests/bugs/bug-1037501.t
index 596122a727e..aff3d6c28b7 100755
--- a/tests/bugs/bug-1037501.t
+++ b/tests/bugs/bug-1037501.t
@@ -40,11 +40,38 @@ TEST $CLI volume add-brick $V0 replica 4 $H0:$B0/$V0-3 force
 TEST $CLI volume add-brick $V0 replica 5 $H0:$B0/$V0-4 force
 TEST $CLI volume add-brick $V0 replica 6 $H0:$B0/$V0-5 force
 
-sleep 5
-
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 3
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 4
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 5
 TEST gluster volume heal $V0 full
-
-sleep 5
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-0/File
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-1/File
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-2/File
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-3/File
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-4/File
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-5/File
+
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-0/Link
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-1/Link
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-2/Link
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-3/Link
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-4/Link
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-5/Link
+
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-0/Dir
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-1/Dir
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-2/Dir
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-3/Dir
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-4/Dir
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-5/Dir
+
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-0/FIFO
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-1/FIFO
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-2/FIFO
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-3/FIFO
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-4/FIFO
+EXPECT_WITHIN $HEAL_TIMEOUT "Y" path_exists $B0/$V0-5/FIFO
 
 EXPECT 10 stat -c '%s' $B0/$V0-0/File
 EXPECT 10 stat -c '%s' $B0/$V0-1/File
diff --git a/tests/bugs/bug-1043886.t b/tests/bugs/bug-1043886.t
index edebdc2cd2e..9a125c2de2c 100755
--- a/tests/bugs/bug-1043886.t
+++ b/tests/bugs/bug-1043886.t
@@ -10,7 +10,6 @@ TEST pidof glusterd
 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
 TEST $CLI volume start $V0
 
-sleep 2;
 ## Mount FUSE with caching disabled
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
 
@@ -30,8 +29,6 @@ TEST $CLI volume set $V0 server.root-squash on;
 TEST $CLI volume set $V0 server.anonuid $uid;
 TEST $CLI volume set $V0 server.anongid $gid;
 
-sleep 2;
-
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
 
 # create files and directories in the root of the glusterfs and nfs mount
diff --git a/tests/bugs/bug-1045333.t b/tests/bugs/bug-1045333.t
index f5985d29cba..d877d14c204 100755
--- a/tests/bugs/bug-1045333.t
+++ b/tests/bugs/bug-1045333.t
@@ -30,16 +30,8 @@ TEST snapshot_exists 0 $S3
 
 
 TEST glusterfs -s $H0 --volfile-id=/snaps/$S1/$V0 $M0
-sleep 2
-TEST umount -f $M0
-
-TEST glusterfs -s $H0 --volfile-id=/snaps/$S2/$V0 $M0
-sleep 2
-TEST umount -f $M0
-
-TEST glusterfs -s $H0 --volfile-id=/snaps/$S3/$V0 $M0
-sleep 2
-TEST umount -f $M0
+TEST glusterfs -s $H0 --volfile-id=/snaps/$S2/$V0 $M1
+TEST glusterfs -s $H0 --volfile-id=/snaps/$S3/$V0 $M2
 
 #Clean up
 #TEST $CLI snapshot delete $S1
diff --git a/tests/bugs/bug-1046624.t b/tests/bugs/bug-1046624.t
index bd46b5eafea..2bfa0745ce7 100755
--- a/tests/bugs/bug-1046624.t
+++ b/tests/bugs/bug-1046624.t
@@ -6,11 +6,8 @@
 cleanup;
 TEST glusterd
 TEST pidof glusterd
-TEST $CLI volume info;
 
 ## Start and create a volume
-mkdir -p ${B0}/${V0}-0
-mkdir -p ${B0}/${V0}-1
 TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}-{0,1}
 
 ## Verify volume is created
@@ -20,7 +17,7 @@ EXPECT 'Created' volinfo_field $V0 'Status';
 
 ## Make sure automatic self-heal doesn't perturb our results.
 TEST $CLI volume set $V0 cluster.self-heal-daemon off
-
+TEST $CLI volume set $V0 stat-prefetch off
 TEST $CLI volume set $V0 background-self-heal-count 0
 
 ## Start volume and verify
@@ -28,7 +25,7 @@ TEST $CLI volume start $V0;
 EXPECT 'Started' volinfo_field $V0 'Status';
 
 ## Mount native
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
+TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0 --use-readdirp=no
 
 TEST `echo "TEST-FILE" > $M0/File`
 TEST `mkdir $M0/Dir`
@@ -38,11 +35,10 @@ TEST `ln -s $M0/File $M0/Link1`
 TEST `ln -s $M0/Dir $M0/Link2`
 
 TEST $CLI volume start $V0 force
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0
 
 TEST `find $M0/ | xargs stat 2>/dev/null 1>/dev/null`
 
-sleep 60
-
 TEST stat $B0/${V0}-0/Link1
 TEST stat $B0/${V0}-0/Link2
 
diff --git a/tests/bugs/bug-797171.t b/tests/bugs/bug-797171.t
index a1b28d9ff66..93809eb1f40 100755
--- a/tests/bugs/bug-797171.t
+++ b/tests/bugs/bug-797171.t
@@ -14,12 +14,9 @@ TEST $CLI volume set $V0 debug.log-history on
 
 TEST $CLI volume start $V0;
 
-sleep 1;
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 \
 $M0;
 
-sleep 5;
-
 touch $M0/{1..22};
 rm -f $M0/*;
 
diff --git a/tests/bugs/bug-844688.t b/tests/bugs/bug-844688.t
index 154d35e48b7..49494ea7f41 100755
--- a/tests/bugs/bug-844688.t
+++ b/tests/bugs/bug-844688.t
@@ -9,9 +9,6 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 $H0:$B0/brick0
 TEST $CLI volume start $V0
-
-sleep 5
-
 TEST glusterfs -s $H0 --volfile-id $V0 $M0
 
 mount_pid=$(get_mount_process_pid $V0);
diff --git a/tests/bugs/bug-858215.t b/tests/bugs/bug-858215.t
index aee7d5fcb5a..eafb4a9621d 100755
--- a/tests/bugs/bug-858215.t
+++ b/tests/bugs/bug-858215.t
@@ -33,9 +33,6 @@ EXPECT 'Started' volinfo_field $V0 'Status';
 ## Mount FUSE with caching disabled
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
 
-## Wait for volume to register with rpc.mountd
-sleep 5;
-
 ## Test for checking whether the fops have been saved in the event-history
 TEST ! stat $M0/newfile;
 TEST touch $M0/newfile;
diff --git a/tests/bugs/bug-860663.t b/tests/bugs/bug-860663.t
index 05dea5fbc05..dd3fcc6793b 100644
--- a/tests/bugs/bug-860663.t
+++ b/tests/bugs/bug-860663.t
@@ -25,7 +25,6 @@ TEST $CLI volume start $V0
 
 ## Mount FUSE
 TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-sleep 5;
 
 TEST touch $M0/files{1..10000};
 
diff --git a/tests/bugs/bug-863068.t b/tests/bugs/bug-863068.t
deleted file mode 100644
index 931aad62396..00000000000
--- a/tests/bugs/bug-863068.t
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-. $(dirname $0)/../include.rc
-
-cleanup;
-
-## This function get the No. of entries for
-## gluster volume heal volnmae info healed command for brick1 and brick2
-## and compare the initial value (Before volume heal full) and final value
-## (After gluster volume heal vol full) and compare.
-
-function getdiff()
-{
-	val=10
-	if [ "$1" == "$3" ]
-	then
-		if [ "$2" == "$4" ]
-			then
-				val=0
-		else
-				val=20
-		fi
-      fi
-
-      echo $val
-}
-
-
-TEST glusterd
-TEST pidof glusterd
-TEST $CLI volume info;
-TEST $CLI volume create $V0 replica 2  $H0:$B0/brick1 $H0:$B0/brick2;
-TEST $CLI volume start $V0;
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
-B0_hiphenated=`echo $B0 | tr '/' '-'`
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0$B0_hiphenated-brick1.pid` ;
-
-mkdir $M0/{a,b,c};
-echo "GLUSTERFS" >> $M0/a/file;
-
-TEST $CLI volume start $V0 force;
-sleep 5
-TEST $CLI volume heal $V0 full;
-sleep 5
-
-##First Brick Initial(Before full type self heal) value
-FBI=`gluster volume heal $V0 info healed | grep entries | awk '{print $4}' | head -n 1`
-
-##Second Brick Initial Value
-SBI=`gluster volume heal $V0 info healed | grep entries | awk '{print $4}' | tail -n 1`
-TEST $CLI volume heal $V0 full;
-
-sleep 5
-
-##First Brick Final value
-##Number of entries from output of <gluster volume heal volname info healed>
-
-FBF=`gluster volume heal $V0 info healed | grep entries | awk '{print $4}' | head -n 1`
-
-##Second Brick Final Value
-SBF=`gluster volume heal $V0 info healed | grep entries | awk '{print $4}' | tail -n 1`
-
-##get the difference of values
-EXPECT "0"  getdiff $FBI $SBI $FBF $SBF;
-
-## Tests after this comment checks for the background self heal
-
-TEST mkdir $M0/d
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0$B0_hiphenated-brick1.pid` ;
-TEST $CLI volume set $V0 self-heal-daemon off
-dd if=/dev/random of=$M0/d/file1 bs=100M count=1 2>/dev/null;
-TEST $CLI volume start $V0 force
-sleep 3
-TEST ls -l $M0/d
-
-cleanup;
diff --git a/tests/bugs/bug-865825.t b/tests/bugs/bug-865825.t
index 7ca076dcc84..9c642161988 100755
--- a/tests/bugs/bug-865825.t
+++ b/tests/bugs/bug-865825.t
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 . $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
 
 cleanup;
 
@@ -58,7 +59,10 @@ setfattr -x trusted.afr.${V0}-client-2 $B0/${V0}-1/a_file
 echo "wrong_data" > $B0/${V0}-2/a_file
 
 gluster volume set $V0 cluster.self-heal-daemon on
-sleep 10
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 2
 gluster volume heal $V0 full
 
 ## Make sure brick 2 now has the correct contents.
diff --git a/tests/bugs/bug-866459.t b/tests/bugs/bug-866459.t
index d66f70c69ca..94ef2695062 100644
--- a/tests/bugs/bug-866459.t
+++ b/tests/bugs/bug-866459.t
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 . $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
 
 cleanup;
 
@@ -23,13 +24,13 @@ TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $
 dd of=$M0/a if=/dev/urandom bs=1M count=1 2>&1 > /dev/null
 B0_hiphenated=`echo $B0 | tr '/' '-'`
 ## Bring a brick down
-kill -9 `cat /var/lib/glusterd/vols/$V0/run/$H0$B0_hiphenated-${V0}1.pid`
+TEST kill_brick $V0 $H0 $B0/${V0}1
 EXPECT '1' echo `pgrep glusterfsd | wc -l`
 ## Rewrite the file
 dd of=$M0/a if=/dev/urandom bs=1M count=1 2>&1 > /dev/null
 TEST $CLI volume start $V0 force
 ## Wait for the brick to give CHILD_UP in client protocol
-sleep 5
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0
 md5offile2=`md5sum $B0/${V0}2/a | awk '{print $1}'`
 
 ##trigger self-heal
diff --git a/tests/bugs/bug-867253.t b/tests/bugs/bug-867253.t
index ae4e243af7d..ed27565ebd1 100644
--- a/tests/bugs/bug-867253.t
+++ b/tests/bugs/bug-867253.t
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 . $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
+. $(dirname $0)/../nfs.rc
 
 cleanup;
 
@@ -26,7 +28,7 @@ TEST pidof glusterd
 TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1
 TEST $CLI volume start $V0
 
-sleep 5;
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
 ## Mount nfs, with nocache option
 TEST mount -o vers=3,nolock,noac -t nfs $H0:/$V0 $M0;
 
diff --git a/tests/bugs/bug-872923.t b/tests/bugs/bug-872923.t
index e94fd905e3b..be7babc0bc8 100755
--- a/tests/bugs/bug-872923.t
+++ b/tests/bugs/bug-872923.t
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 . $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
 . $(dirname $0)/../nfs.rc
 
 cleanup;
@@ -28,10 +29,7 @@ do
 done;
 
 cd ..
-kill  `cat /var/lib/glusterd/vols/$V0/run/$H0-d-backends-brick0.pid`
-sleep 2
-
-
+TEST kill_brick $V0 $H0 $B0/brick0
 cd test_hardlink_self_heal;
 
 RET=0
diff --git a/tests/bugs/bug-874498.t b/tests/bugs/bug-874498.t
index de58aef4d39..fa74115960f 100644
--- a/tests/bugs/bug-874498.t
+++ b/tests/bugs/bug-874498.t
@@ -1,5 +1,6 @@
 #!/bin/bash
 . $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
 . $(dirname $0)/../afr.rc
 
 cleanup;
@@ -48,7 +49,9 @@ EXPECT "3" echo $count
 
 
 TEST $CLI volume start $V0 force
-sleep 5
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1
 TEST $CLI volume heal $V0
 
 
diff --git a/tests/bugs/bug-887145.t b/tests/bugs/bug-887145.t
index afd39da1616..ee19036e0c1 100755
--- a/tests/bugs/bug-887145.t
+++ b/tests/bugs/bug-887145.t
@@ -11,7 +11,6 @@ TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
 TEST $CLI volume set $V0 performance.open-behind off;
 TEST $CLI volume start $V0
 
-sleep 2;
 ## Mount FUSE with caching disabled
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
 
@@ -32,8 +31,6 @@ chown -R tmp_user:tmp_user $M0/other;
 
 TEST $CLI volume set $V0 server.root-squash on;
 
-sleep 2;
-
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
 
 # create files and directories in the root of the glusterfs and nfs mount
diff --git a/tests/bugs/bug-915280.t b/tests/bugs/bug-915280.t
index 2c3553be540..9fdc48180fc 100755
--- a/tests/bugs/bug-915280.t
+++ b/tests/bugs/bug-915280.t
@@ -32,7 +32,7 @@ TEST $CLI volume set $V0 debug.error-gen client
 TEST $CLI volume set $V0 debug.error-fops stat
 TEST $CLI volume set $V0 debug.error-failure 100
 
-sleep 1
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
 
 pid_file=$(read_nfs_pidfile);
 
diff --git a/tests/bugs/bug-927616.t b/tests/bugs/bug-927616.t
index d19327ca268..58f961dc80a 100755
--- a/tests/bugs/bug-927616.t
+++ b/tests/bugs/bug-927616.t
@@ -11,7 +11,6 @@ TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{1,2};
 TEST $CLI volume set $V0 performance.open-behind off;
 TEST $CLI volume start $V0
 
-sleep 1;
 ## Mount FUSE with caching disabled
 TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0;
 
diff --git a/tests/bugs/bug-957877.t b/tests/bugs/bug-957877.t
index e2b74bf52f5..90836679de9 100644
--- a/tests/bugs/bug-957877.t
+++ b/tests/bugs/bug-957877.t
@@ -17,7 +17,9 @@ TEST setfattr -n "user.foo" -v "test" $M0/f1
 BRICK=$B0"/${V0}1"
 
 TEST $CLI volume start $V0 force
-sleep 5
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1
 TEST $CLI volume heal $V0
 
 # Wait for self-heal to complete
diff --git a/tests/bugs/bug-958691.t b/tests/bugs/bug-958691.t
index cd38d46e1e4..60727fc4922 100644
--- a/tests/bugs/bug-958691.t
+++ b/tests/bugs/bug-958691.t
@@ -14,8 +14,6 @@ TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
 TEST mount_nfs $H0:/$V0 $N0 nolock;
 
-sleep 2;
-
 # Tests for the fuse mount
 TEST mkdir $M0/dir;
 TEST chmod 1777 $M0/dir;
diff --git a/tests/bugs/bug-970070.t b/tests/bugs/bug-970070.t
index da28b1ed7ba..08ab4a3f8c4 100755
--- a/tests/bugs/bug-970070.t
+++ b/tests/bugs/bug-970070.t
@@ -8,7 +8,6 @@ TEST pidof glusterd
 
 TEST $CLI volume create $V0 $H0:$B0/$V0
 TEST $CLI volume start $V0
-sleep 5
 TEST $CLI volume set $V0 nfs.acl off
 TEST $CLI volume set $V0 nfs.acl on
 cleanup
diff --git a/tests/include.rc b/tests/include.rc
index 5dbbc7c7336..5cdc503e29d 100644
--- a/tests/include.rc
+++ b/tests/include.rc
@@ -1,5 +1,6 @@
 M0=${M0:=/mnt/glusterfs/0};   # 0th mount point for FUSE
 M1=${M1:=/mnt/glusterfs/1};   # 1st mount point for FUSE
+M2=${M1:=/mnt/glusterfs/2};   # 2nd mount point for FUSE
 N0=${N0:=/mnt/nfs/0};         # 0th mount point for NFS
 N1=${N1:=/mnt/nfs/1};         # 1st mount point for NFS
 V0=${V0:=patchy};             # volume name to use in tests