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

diff --git a/test/gils/timing1.sh b/test/gils/timing1.sh
index c8ba247..1f373f7 100755
--- a/test/gils/timing1.sh
+++ b/test/gils/timing1.sh
@@ -1,13 +1,12 @@
 # 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. 
+# Test 1: with good sleeps in every between - should pass always
 
 echo "Testing timings of updates"
 echo "  init..."
 rm -f idx.log 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 idx.log init || exit 1
 
 echo "  killing old server (if any)..."
 test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
@@ -18,23 +17,29 @@ echo "  starting server..."
 ../../index/zebrasrv -S -c zebra2.cfg -l srv.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
+sleep 2
 
 echo "  search 1..."
 ../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 9$" log || exit 1
+sleep 2
 
 echo "making a test record..."
 cp records/esdd0006.grs records/esdd0002.grs
 
 echo "  indexing it..."
 ../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+sleep 2
 
 echo "  search 2..."
 ../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 10$" log || exit 1
+
+sleep 2
 echo "  1a: modifying a test record (xyz)..."
 sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
@@ -42,11 +47,13 @@ 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 "    search 3..."
 ../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 echo "    checking..."
 grep "^Result count: 9$" log || exit 1
 
+sleep 2
 echo "  1b: modifying the test record back (utah)..."
 sed 's/XYZ/UTAH/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
@@ -54,11 +61,13 @@ 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 "    search 4..."
 ../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 echo "    checking..."
 grep "^Result count: 10$" log || exit 1
 
+sleep 2
 echo "  2a: modifying the test record (xyz)..."
 sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
@@ -66,36 +75,44 @@ 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 "    search 5..."
 ../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 echo "    checking..."
 grep "^Result count: 9$" log || exit 1
 
+sleep 2
 echo "  2b: modifying the test record back (utah)..."
 sed 's/XYZ/UTAH/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
 
+sleep 2
 echo "    indexing it..."
 ../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
 
+sleep 2
 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 "  3a: modifying the test record (xyz)..."
 sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
 
+sleep 2
 echo "    indexing it..."
 ../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
 
+sleep 2
 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 "  3b: modifying the test record back (utah)..."
 sed 's/XYZ/UTAH/g' <records/esdd0002.grs >records/esdd0002x.grs
 mv records/esdd0002x.grs records/esdd0002.grs
@@ -103,6 +120,7 @@ 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 "    search 8..."
 ../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 echo "    checking..."