Handle dig timing out gracefully in logfileconfig

(cherry picked from commit 8ece026848)
This commit is contained in:
Tom Krizek 2024-01-05 15:08:05 +01:00
parent a095388207
commit 895bd490af
No known key found for this signature in database
GPG key ID: 01623B9B652A20A7

View file

@ -177,7 +177,7 @@ copy_setports ns1/named.versconf.in ns1/named.conf
# a seconds since epoch version number
touch ns1/named_vers.1480039317
rndc_reconfig ns1 10.53.0.1 >rndc.out.test$n
$DIG version.bind txt ch @10.53.0.1 -p ${PORT} >dig.out.test$n
$DIG version.bind txt ch @10.53.0.1 -p ${PORT} >dig.out.test$n || ret=1
grep "status: NOERROR" dig.out.test$n >/dev/null || ret=1
# we are configured to retain five logfiles (a current file
# and 4 backups). so files with version number 5 or higher
@ -198,8 +198,8 @@ touch ns1/named_ts.1480039317
touch ns1/named_ts.20150101120000120
rndc_reconfig ns1 10.53.0.1 >rndc.out.test$n
_found2() (
$DIG version.bind txt ch @10.53.0.1 -p ${PORT} >dig.out.test$n
grep "status: NOERROR" dig.out.test$n >/dev/null || ret=1
$DIG version.bind txt ch @10.53.0.1 -p ${PORT} >dig.out.test$n || return 1
grep "status: NOERROR" dig.out.test$n >/dev/null || return 1
# we are configured to keep three versions, so the oldest
# timestamped versions should be gone, and there should
@ -220,7 +220,7 @@ copy_setports ns1/named.unlimited.in ns1/named.conf
# a seconds since epoch version number
touch ns1/named_unlimited.1480039317
rndc_reconfig ns1 10.53.0.1 >rndc.out.test$n
$DIG version.bind txt ch @10.53.0.1 -p ${PORT} >dig.out.test$n
$DIG version.bind txt ch @10.53.0.1 -p ${PORT} >dig.out.test$n || ret=1
grep "status: NOERROR" dig.out.test$n >/dev/null || ret=1
test_with_retry -f ns1/named_unlimited.1480039317 || ret=1
test_with_retry -f ns1/named_unlimited.4 || ret=1