From: W.C.A. Wijngaards Date: Fri, 4 Apr 2025 09:37:42 +0000 (+0200) Subject: - Fix test to speed up common.sh script kill_pid. X-Git-Tag: release-1.23.0rc1~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4074a5b2ba18bc1af272efbade381e85b1f4044a;p=thirdparty%2Funbound.git - Fix test to speed up common.sh script kill_pid. --- diff --git a/doc/Changelog b/doc/Changelog index e60226696..40c58eb48 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -3,6 +3,7 @@ - Fix comment name in the rpz nsdname test. - Fix nettle compile for warnings and ticket keys. - Fix redis_replica test for unused option defaults and log printout. + - Fix test to speed up common.sh script kill_pid. 4 April 2025: Yorgos - Merge #1019: Redis read-only replica support. diff --git a/testdata/common.sh b/testdata/common.sh index bf2d301eb..3f9f9a894 100644 --- a/testdata/common.sh +++ b/testdata/common.sh @@ -309,6 +309,7 @@ kill_pid () { local WAIT_THRES=30 local try kill $1 + sleep .001 for (( try=0 ; try <= $MAX_DOWN_TRY ; try++ )) ; do if kill -0 $1 >/dev/null 2>&1; then : @@ -322,6 +323,8 @@ kill_pid () { fi if test $try -ge $WAIT_THRES; then sleep 1 + else + sleep .01 fi # re-send the signal kill $1 >/dev/null 2>&1