From a01271b7adc9eb58700bfbbc9c47cd04a2ad7e35 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 27 Aug 2010 13:24:13 +0200 Subject: [PATCH] try to avoid pazpar2 left-overs (taking up a port!) --- test/run_pazpar2.sh | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh index a0bc9a0..e59aa4f 100755 --- a/test/run_pazpar2.sh +++ b/test/run_pazpar2.sh @@ -9,6 +9,20 @@ # srcdir might be set by make srcdir=${srcdir:-"."} +# terminate pazpar2 if test takes more than this (in seconds) +WAIT=120 + +kill_pazpar2() +{ + if test -n "$PP2PID"; then + kill $PP2PID + fi + if test -n "$SLEEP_PID"; then + kill $SLEEP_PID + SLEEP_PID="" + fi +} + # look for curl in PATH oIFS=$IFS IFS=: @@ -50,27 +64,25 @@ else YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -v all -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 & fi - PP2PID=$! -# Give it a chance to start properly.. -sleep 3 - -# Set to success by default.. Will be set to non-zero in case of failure -code=0 - if [ -z "$SKIP_PAZPAR2" ] ; then if ps -p $PP2PID >/dev/null 2>&1; then - : + (sleep $WAIT; kill_pazpar2 >/dev/null) & + SLEEP_PID=$! + trap kill_pazpar2 INT + trap kill_pazpar2 HUP + sleep 3 else - code=1 - PP2PID="" echo "pazpar2 failed to start" + exit 1 fi fi -# We can start test for real +# Set to success by default.. Will be set to non-zero in case of failure +code=0 +# We can start test for real testno=1 for f in `cat ${srcdir}/${URLS}`; do if echo $f | grep '^http' >/dev/null; then @@ -122,7 +134,11 @@ for f in `cat ${srcdir}/${URLS}`; do : else IFS="$oIFS" - echo "Test $testno: pazpar2 died" + if test -n "$SLEEP_PID"; then + echo "Test $testno: pazpar2 terminated (timeout, probably)" + else + echo "Test $testno: pazpar2 died" + fi exit 1 fi fi @@ -131,10 +147,8 @@ done # Kill programs if [ -z "$SKIP_PAZPAR2" ] ; then - if test -n "$PP2PID"; then - kill $PP2PID - sleep 2 - fi + kill_pazpar2 + sleep 2 fi exit $code -- 1.7.10.4