Gitlab CI - Fix tests (using `nc`)

[tpg/opendispense2.git] / tests / _common.sh

diff --git a/tests/_common.sh b/tests/_common.sh
index 4058bb5..cb31ac7 100644 (file)
--- a/tests/_common.sh
+++ b/tests/_common.sh
@@ -46,10 +46,15 @@ server_pid=$!
 
 cleanup() {
        LOG "Killing ${server_pid}"
-       kill ${server_pid}
+       kill ${server_pid}; true
 }
 trap cleanup EXIT
 
 LOG "Server running on PID ${server_pid}"
 sleep 1
-echo "" | nc localhost ${PORT}
+# - Make sure that the server started
+if ! (echo "" | nc localhost ${PORT}); then
+       LOG "Server not responding on ${PORT}"
+       LOG "Server log contents:"
+       cat ${BASEDIR}server.log
+fi