upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'artem-doth-test-fix-failure-after-reconfig' into 'main'

Browse source 
doth test: fix failure after reconfig

See merge request isc-projects/bind9!5720
This commit is contained in:
Artem Boldariev 2022-01-18 12:43:42 +00:00
commit 3c5dbe5742
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bin/tests/system/conf.sh.common
View file

@ -578,23 +578,28 @@ _repeat() (
return 0
)
_times() {
awk "BEGIN{ for(i = 1; i <= $1; i++) print i}";
}
rndc_reload() {
$RNDC -c ../common/rndc.conf -s $2 -p ${CONTROLPORT} reload $3 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
# reloading single zone is synchronous, if we're reloading whole server
# we need to wait for reload to finish
if [ -z "$3" ]; then
for __try in 0 1 2 3 4 5 6 7 8 9; do
$RNDC -c ../common/rndc.conf -s $2 -p ${CONTROLPORT} status | grep "reload/reconfig in progress" > /dev/null || break
sleep 1
done
for _ in $(_times 10); do
$RNDC -c ../common/rndc.conf -s $2 -p ${CONTROLPORT} status | grep "reload/reconfig in progress" > /dev/null || break
sleep 1
done
fi
}
rndc_reconfig() {
$RNDC -c ../common/rndc.conf -s $2 -p ${CONTROLPORT} reconfig 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
for __try in 0 1 2 3 4 5 6 7 8 9; do
$RNDC -c ../common/rndc.conf -s $2 -p ${CONTROLPORT} status | grep "reload/reconfig in progress" > /dev/null || break
sleep 1
seconds=${3:-10}
$RNDC -c ../common/rndc.conf -s "$2" -p "${CONTROLPORT}" reconfig 2>&1 | sed 's/^/'"I:$SYSTESTDIR:$1"' /'
for _ in $(_times "$seconds"); do
"$RNDC" -c ../common/rndc.conf -s "$2" -p "${CONTROLPORT}" status | grep "reload/reconfig in progress" > /dev/null || break
sleep 1
done
}

6
bin/tests/system/doth/tests.sh
View file

@ -37,10 +37,6 @@ dig_with_opts() {
"$DIG" $common_dig_options -p "${PORT}" "$@"
}
rndccmd() (
"$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@"
)
wait_for_tls_xfer() (
srv_number="$1"
shift
@ -458,7 +454,7 @@ status=$((status + ret))
n=$((n + 1))
echo_i "doing rndc reconfig to see that queries keep being served after that ($n)"
ret=0
rndccmd 10.53.0.4 reconfig
rndc_reconfig ns4 10.53.0.4 60
if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret))