From 1d39a34e871d67a1c734dea8bd3ebc2e33838393 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 16 May 2007 08:31:17 +0000 Subject: [PATCH] Fire test against z3950.indexdata.com/marc instead. --- test/test_http.sh | 70 +++++++++++++++++++------------------------------- test/test_http.xml | 4 +-- test/test_http_5.res | 40 +++++++++++++++++++++-------- test/test_http_urls | 1 + 4 files changed, 59 insertions(+), 56 deletions(-) diff --git a/test/test_http.sh b/test/test_http.sh index 2c62d4b..dafd629 100755 --- a/test/test_http.sh +++ b/test/test_http.sh @@ -1,39 +1,22 @@ #!/bin/sh -# $Id: test_http.sh,v 1.3 2007-05-15 21:40:57 adam Exp $ +# $Id: test_http.sh,v 1.4 2007-05-16 08:31:17 adam Exp $ # -# Regression test using pazpar2 against yaz-ztest +# Regression test using pazpar2 against z3950.indexdata.com/marc # Reads Pazpar2 URLs from test_http_urls # Outputs to test_http_.log -# Matches against results in test_htttp_.res +# Matches against results in test_http_.res # # srcdir might be set by make srcdir=${srcdir:-"."} -# Find a suitable yaz-ztest -yt="" -for d in /usr/bin /usr/local/bin ${srcdir}/../../yaz/ztest ${srcdir}/../../../yaz/ztest; do - yt=${d}/yaz-ztest - if test -x ${yt}; then - break - fi -done -if test ! -x "${yt}"; then - echo "No yaz-ztest found. Skipping" - exit 0 -fi - -# Fire up yaz-ztest (should match port in test_http.xml) -$yt -l test_http_ztest.log tcp:@:9764 & -YTPID=$! - # Fire yp pazpar2 rm -f pazpar2.log ../src/pazpar2 -l pazpar2.log -f ${srcdir}/test_http.cfg -t ${srcdir}/test_http.xml >extra_pazpar2.log 2>&1 & PP2PID=$! -# Give both programs room to start properly.. +# Give it a chance to start properly.. sleep 1 # Set to success by default.. Will be set to non-zero in case of failure @@ -47,42 +30,41 @@ else echo "pazpar2 failed to start" fi -if ps -p $YTPID >/dev/null 2>&1; then - : -else - code=1 - YTPID="" - echo "yaz-ztest failed to start" -fi # We can start test for real +oIFS="$IFS" +IFS=' +' + testno=1 for f in `cat ${srcdir}/test_http_urls`; do - OUT1=${srcdir}/test_http_${testno}.res - OUT2=test_http_${testno}.log - DIFF=test_http_${testno}.dif - if test -f $OUT1; then - rm -f $OUT2 - wget -q -O $OUT2 $f - if diff $OUT1 $OUT2 >$DIFF; then - : + if echo $f | grep '^http' >/dev/null; then + OUT1=${srcdir}/test_http_${testno}.res + OUT2=test_http_${testno}.log + DIFF=test_http_${testno}.dif + if test -f $OUT1; then + rm -f $OUT2 + wget -q -O $OUT2 $f + if diff $OUT1 $OUT2 >$DIFF; then + : + else + echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF" + code=1 + fi else - echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF" + echo "Test $testno: Making for the first time" + wget -q -O $OUT1 $f code=1 fi + testno=`expr $testno + 1` else - echo "Test $testno: Making for the first time" - wget -q -O $OUT1 $f - code=1 + sleep $f fi - testno=`expr $testno + 1` done +IFS="$oIFS" sleep 1 # Kill programs -if test -n "$YTPID"; then - kill $YTPID -fi if test -n "$PP2PID"; then kill $PP2PID diff --git a/test/test_http.xml b/test/test_http.xml index a0f1089..386a4f9 100644 --- a/test/test_http.xml +++ b/test/test_http.xml @@ -1,7 +1,7 @@ - + - + diff --git a/test/test_http_5.res b/test/test_http_5.res index e9f1ea8..d09a94a 100644 --- a/test/test_http_5.res +++ b/test/test_http_5.res @@ -1,15 +1,15 @@ OK 0 -6 -7 +9 +10 0 -6 +9 How to program a computer -Jack Collins - +Jack Collins + 2 0 @@ -17,35 +17,55 @@ The Computer Bible 1973-1980 -Freedman, David Noel +Freedman, David Noel 2 +A plan for community college computer development +1971 +8 + + + +Washington metropolitan area rail computer feasibility study; final report +1971 +Englund, Carl R +7 + + + +The use of passwords for controlled access to computer resources +1977 +Wood, Helen M +6 + + + The Puget Sound Region : a portfolio of thematic computer maps 1974 -Hoerauf, Eugene A +Hoerauf, Eugene A 3 Computer processing of dynamic images from an Anger scintillation camera : the proceedings of a workshop 1974 -Larson, Kenneth B +Larson, Kenneth B 1 Computer science & technology : proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 -Evans, John Martin +Evans, John Martin 5 Reconstruction tomography in diagnostic radiology and nuclear medicine : proceedings of the workshop 1977 -Ter-Pogossian, Michel M +Ter-Pogossian, Michel M 4 diff --git a/test/test_http_urls b/test/test_http_urls index 90eceae..7ccb1e7 100644 --- a/test/test_http_urls +++ b/test/test_http_urls @@ -2,4 +2,5 @@ http://localhost:9763/search.pz2?command=init http://localhost:9763/search.pz2?session=1&command=stat http://localhost:9763/search.pz2?session=1&command=ping http://localhost:9763/search.pz2?session=1&command=search&query=computer +2 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1 -- 1.7.10.4