X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Ftiming1.sh;h=29893ac5b90b3b0f9811d7f43e9c7396531911c2;hb=ae2d0647bd3a555df77397b6c2f9c129fda0733a;hp=c8ba247f2fb08c755135f1b05a7fe4f6597f7c0f;hpb=d04590889450ad503a8979703370d3c7cdc7f0fc;p=idzebra-moved-to-github.git

diff --git a/test/gils/timing1.sh b/test/gils/timing1.sh
index c8ba247..29893ac 100755
--- a/test/gils/timing1.sh
+++ b/test/gils/timing1.sh
@@ -1,120 +1,137 @@
-# timing1.sh - tests that updates are reflected immediately
-# in the registers. Repeatedly modifies a record and counts hits.
-# Because of the timing aspect of this, if may fail at any time
-# or not at all. 
-
-echo "Testing timings of updates"
-echo "  init..."
-rm -f idx.log log
+#!/bin/sh
+# $Id: timing1.sh,v 1.7 2003-05-24 22:34:48 adam Exp $
+# tests that updates are reflected immediately # in the registers.
+# Repeatedly modifies a record and counts hits.
+# Test 1: with good sleeps in every between - should pass always
+
+LOG=timing1.log
+
+rm -f $LOG
+
+echo "  init..." >>$LOG
 rm -f records/esdd000[12].grs # these should not be here, will be created later
-../../index/zebraidx -l idx.log init || exit 1
+../../index/zebraidx -c zebra2.cfg -l $LOG init || exit 1
 
-echo "  killing old server (if any)..."
+echo "  killing old server (if any)..." >>$LOG
 test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
-rm -f zebrasrv.pid
-rm -f srv.log
 
-echo "  starting server..."
-../../index/zebrasrv -S -c zebra2.cfg -l srv.log tcp:@:9901 &
+echo "  starting server..." >>$LOG
+../../index/zebrasrv -S -c zebra2.cfg -l $LOG tcp:@:9901 &
 sleep 1
 test -f zebrasrv.pid || exit 1
+sleep 2
 
-echo "  update 1..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "  update 1..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
+sleep 2
 
-echo "  search 1..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 9$" log || exit 1
+echo "  search 1..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 9$" log >/dev/null || exit 1
+sleep 2
 
-echo "making a test record..."
+echo "making a test record..." >>$LOG
 cp records/esdd0006.grs records/esdd0002.grs
 
-echo "  indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "  indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
+sleep 2
+
+echo "  search 2..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 10$" log >/dev/null || exit 1
 
-echo "  search 2..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 10$" log || exit 1
-echo "  1a: modifying a test record (xyz)..."
+sleep 2
+echo "  1a: modifying a test record (xyz)..." >>$LOG
 sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
 
-echo "    indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "    indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 
-echo "    search 3..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-echo "    checking..."
-grep "^Result count: 9$" log || exit 1
+sleep 2
+echo "    search 3..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..." >>$LOG
+grep "^Result count: 9$" log >/dev/null || exit 1
 
-echo "  1b: modifying the test record back (utah)..."
+sleep 2
+echo "  1b: modifying the test record back (utah)..." >>$LOG
 sed 's/XYZ/UTAH/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
 
-echo "    indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "    indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 
-echo "    search 4..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-echo "    checking..."
-grep "^Result count: 10$" log || exit 1
+sleep 2
+echo "    search 4..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..." >>$LOG
+grep "^Result count: 10$" log >/dev/null || exit 1
 
-echo "  2a: modifying the test record (xyz)..."
+sleep 2
+echo "  2a: modifying the test record (xyz)..." >>$LOG
 sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
 
-echo "    indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "    indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 
-echo "    search 5..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-echo "    checking..."
-grep "^Result count: 9$" log || exit 1
+sleep 2
+echo "    search 5..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..." >>$LOG
+grep "^Result count: 9$" log >/dev/null || exit 1
 
-echo "  2b: modifying the test record back (utah)..."
+sleep 2
+echo "  2b: modifying the test record back (utah)..." >>$LOG
 sed 's/XYZ/UTAH/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
 
-echo "    indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+sleep 2
+echo "    indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 
-echo "    search 6..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-echo "    checking..."
-grep "^Result count: 10$" log || exit 1
+sleep 2
+echo "    search 6..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..." >>$LOG
+grep "^Result count: 10$" log >/dev/null || exit 1
 
+sleep 2
 
-echo "  3a: modifying the test record (xyz)..."
+echo "  3a: modifying the test record (xyz)..." >>$LOG
 sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
 
-echo "    indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+sleep 2
+echo "    indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 
-echo "    search 7..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-echo "    checking..."
-grep "^Result count: 9$" log || exit 1
+sleep 2
+echo "    search 7..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..." >>$LOG
+grep "^Result count: 9$" log >/dev/null || exit 1
 
-echo "  3b: modifying the test record back (utah)..."
+sleep 2
+echo "  3b: modifying the test record back (utah)..." >>$LOG
 sed 's/XYZ/UTAH/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
 
-echo "    indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
-
-echo "    search 8..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-echo "    checking..."
-grep "^Result count: 10$" log || exit 1
+echo "    indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 
+sleep 2
+echo "    search 8..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..." >>$LOG
+grep "^Result count: 10$" log >/dev/null || exit 1
 
-echo "stopping server..."
+echo "stopping server..." >>$LOG
 test -f zebrasrv.pid || exit 1
-kill -9 `cat zebrasrv.pid` || exit 1
-rm -f idx.log log
+kill `cat zebrasrv.pid` || exit 1
+rm -f log
 rm -f records/esdd000[12].grs 
 rm -f zebrasrv.pid
-rm -f srv.log
 
-echo ok