summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2012-01-05 23:36:09 -0800
committerGerrit Code Review <root@dev.gluster.com>2012-01-05 23:36:09 -0800
commit44cca17938d0a9e0a420d3528f46ca8e22d8800a (patch)
tree90a94b3e001f4a63ba6d5ed4f29d5a01880e4f14
parent66c16fab6dae17c71af0e480ee48dc2c814c7ec5 (diff)
parentf0d1a0db24dcd5d220b9b8906a4b15975f764ad7 (diff)
Merge "2059: changes in the testcase in accordance with the changes in statedump for glusterfs"
-rwxr-xr-xdvm/2059/testcase15
1 files changed, 10 insertions, 5 deletions
diff --git a/dvm/2059/testcase b/dvm/2059/testcase
index 14b83e4..1dae3dd 100755
--- a/dvm/2059/testcase
+++ b/dvm/2059/testcase
@@ -10,13 +10,15 @@ $GLUSTERFSDIR/gluster volume start $VOLNAME 2>/dev/null 1>/dev/null;
$GLUSTERFSDIR/glusterfs -s $(hostname) -p /tmp/client.pid -l /tmp/regr.log --volfile-id=$VOLNAME $FUSE_MOUNT;
-FUSE_PID=`cat /tmp/client.pid`
+sleep 5;
-sleep 5
+FUSE_PID=`cat /tmp/client.pid`;
-kill -USR1 $FUSE_PID
+kill -USR1 $FUSE_PID &>/dev/null;
-OUT=`grep 'xlator.mount.fuse.entry_timeout=1.000000' /tmp/glusterdump.$FUSE_PID | wc -l`
+sleep 1;
+
+OUT=`grep "entry_timeout=1.000000" /tmp/glusterdump.$FUSE_PID.dump | wc -l` &>/dev/null;
if [ "$OUT" -eq "0" ]; then
RET="1";
@@ -24,5 +26,8 @@ else
RET="0";
fi
-rm -f /tmp/glusterdump.$FUSE_PID
+rm -f /tmp/glusterdump.$FUSE_PID.dump &>/dev/null;
+rm -f /tmp/client.pid &>/dev/null;
+rm -f /tmp/regr.log &>/dev/null;
+
exit $RET;