Make smoke test time out instead of hang when server misbehaves

[empserver] / tests / test-common.sh

diff --git a/tests/test-common.sh b/tests/test-common.sh
index d5cf075eec89554a330314f12b027ea85ecff716..16864564be544cd0e1d867da6dd131df844cc4b5 100644 (file)
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -23,22 +23,50 @@ EOF
     cp "$srcdir"/src/lib/global/*.config sandbox/share/empire/builtin
 }
 
+now()
+{
+    # date +%s isn't portable...
+    perl -e 'printf "%s\n", time'
+}
+
 start_server()
 {
+    local pidfile=sandbox/var/empire/server.pid
+    local timeout
     pid=
-    trap 'if [ "$pid" ]; then kill "$pid" 2>/dev/null || true; fi' EXIT
+    trap 'if [ "$pid" ]; then kill -9 "$pid" 2>/dev/null || true; fi' EXIT
     src/server/emp_server -e sandbox/etc/empire/econfig -R 1
+    timeout=$((`now`+5))
+    until pid=`cat $pidfile 2>/dev/null` && [ -n "$pid" ]
+    do
+       if [ `now` -gt $timeout ]
+       then
+           echo "Timed out waiting for server to create $pidfile" >&2
+           exit 1
+       fi
+    done
     while src/client/empire red herring 2>&1 | grep -q "Connection refused"
-    do :              # FIXME hangs here if server crashes on startup
+    do
+       if [ `now` -gt $timeout ]
+       then
+           echo "Timed out waiting for server to accept connections" >&2
+           exit 1
+       fi
     done
-    pid=`cat sandbox/var/empire/server.pid`
 }
 
 stop_server()
 {
+    local timeout
     kill "$pid"
+    timeout=$((`now`+5))
     while kill -0 "$pid" 2>/dev/null
-    do :                   # FIXME hangs here if server fails to exit
+    do
+       if [ `now` -gt $timeout ]
+       then
+           echo "Timed out waiting for server to terminate" >&2
+           exit 1
+       fi
     done
 }