From d3bd3319afb208acfa905696fb0be5545f5883f6 Mon Sep 17 00:00:00 2001
From: Pranith Kumar K <pkarampu@redhat.com>
Date: Sun, 15 Jun 2014 08:40:49 +0530
Subject: 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>
---
 tests/bugs/bug-1046624.t | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'tests/bugs/bug-1046624.t')

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
 
-- 
cgit