From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 7 Feb 2025 12:23:09 +0000 (+0100)
Subject: Start using quit-nicely in rec bulk test
X-Git-Tag: dnsdist-2.0.0-alpha1~96^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccf158906b8a6c317e2c39a9ec43193b092d0270;p=thirdparty%2Fpdns.git

Start using quit-nicely in rec bulk test
---

diff --git a/regression-tests/recursor-test b/regression-tests/recursor-test
index c8d1419477..59c5fbc2c7 100755
--- a/regression-tests/recursor-test
+++ b/regression-tests/recursor-test
@@ -71,16 +71,16 @@ ${DNSBULKTEST} --www=false -qe 127.0.0.1 $port $limit < ${CSV} > bulktest.result
 kill -USR1 $(cat pdns_recursor.pid) || true
 ${RECCONTROL} --timeout=20 --socket-dir=. --config-dir=. get-all || true
 
-# give it a chance to write the log requested by the kill
 sleep 1
+${RECCONTROL} --timeout=20 --socket-dir=. --config-dir=. ping
+${RECCONTROL} --timeout=20 --socket-dir=. --config-dir=. quit-nicely
+#
+# Since quit-nicely is now synchronous, we should not need to wait for the log to be up-date-date anymore
+#sleep 1
 echo
 echo "=== RECURSOR LOG ==="
 cat recursor.log
 echo "=== END RECURSOR LOG ==="
-sleep 1
-${RECCONTROL} --timeout=20 --socket-dir=. --config-dir=. ping
-kill $(cat pdns_recursor.pid)
-sleep 5
 
 . ./bulktest.results