From: Alexander Barton <alex@barton.de>
Date: Sun, 1 Nov 2020 16:25:39 +0000 (+0100)
Subject: Test suite: Wait 2 seconds after reloading the daemon
X-Git-Tag: rel-26.1~11
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=5cf0eabd841b644eef8022dad97fa96aa3661c6a;hp=6e382889a30462382e84a426874881d2f7da80e4

Test suite: Wait 2 seconds after reloading the daemon

On reload, all listening ports are closed, configuration updated, and
then opened again. Which leads to subsequent tests running while the
daemon isn't listening on any ports, and that's why the tests fail.

The "proper" way whould be to loop and check for open ports, but waiting
is what the start-server.sh script does right now, so stick with this in
reload-server.sh for now as well.

This fixes the issue, at least on my RaspberryPi ...

Closes #280.
---

diff --git a/src/testsuite/reload-server.sh b/src/testsuite/reload-server.sh
index b17d6721..1f82d8eb 100755
--- a/src/testsuite/reload-server.sh
+++ b/src/testsuite/reload-server.sh
@@ -22,10 +22,11 @@ if [ -z "$pid" ]; then
 fi
 kill -HUP $pid > /dev/null 2>&1; r=$?
 if [ $r -eq 0 ]; then
+  sleep 2
   echo " ok".
-  exit 0
+  kill -0 $pid && exit 0
 fi
-echo " failure: server ${id} could not be restarted"
+echo " failure: server ${id} could not be reloaded!"
 exit 1
 
 # -eof-