mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Improve readability of sendcmd() calls

Browse Source 
To improve readability of sendcmd() calls used for controlling
isctest.asyncserver-based custom DNS servers, pass the command's name
and arguments as separate parameters.

(cherry picked from commit 9a230c16ff)
This commit is contained in:
Michał Kępień
2025-05-30 18:23:21 +02:00
parent 00ad3b70ae
commit f93d783ec6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/tests/system/forward/tests.sh
View File

@@ -21,7 +21,10 @@ dig_with_opts() (
) )
sendcmd() ( sendcmd() (
dig_with_opts "@${1}" "${2}._control." TXT +time=5 +tries=1 +tcp >/dev/null 2>&1 SERVER="${1}"
COMMAND="${2}"
COMMAND_ARGS="${3}"
dig_with_opts "@${SERVER}" "${COMMAND_ARGS}.${COMMAND}._control." TXT +time=5 +tries=1 +tcp >/dev/null 2>&1
) )
rndccmd() { rndccmd() {
@@ -259,7 +262,7 @@ n=$((n + 1))
echo_i "checking that a forwarder timeout prevents it from being reused in the same fetch context ($n)" echo_i "checking that a forwarder timeout prevents it from being reused in the same fetch context ($n)"
ret=0 ret=0
# Make ans6 receive queries without responding to them. # Make ans6 receive queries without responding to them.
sendcmd 10.53.0.6 "disable.send-responses" sendcmd 10.53.0.6 send-responses "disable"
# Query for a record in a zone which is forwarded to a non-responding forwarder # Query for a record in a zone which is forwarded to a non-responding forwarder
# and is delegated from the root to check whether the forwarder will be retried # and is delegated from the root to check whether the forwarder will be retried
# when a delegation is encountered after falling back to full recursive # when a delegation is encountered after falling back to full recursive
@@ -270,7 +273,7 @@ dig_with_opts txt.example7. txt @$f1 >dig.out.$n.f1 || ret=1
start_pattern="sending packet to 10\.53\.0\.6" start_pattern="sending packet to 10\.53\.0\.6"
retry_quiet 5 wait_for_log ns3/named.run "$start_pattern" retry_quiet 5 wait_for_log ns3/named.run "$start_pattern"
check_sent 1 ns3/named.run "$start_pattern" ";txt\.example7\.[[:space:]]*IN[[:space:]]*TXT$" || ret=1 check_sent 1 ns3/named.run "$start_pattern" ";txt\.example7\.[[:space:]]*IN[[:space:]]*TXT$" || ret=1
sendcmd 10.53.0.6 "enable.send-responses" sendcmd 10.53.0.6 send-responses "enable"
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -324,7 +327,7 @@ status=$((status + ret))
# See [GL #3129]. # See [GL #3129].
# Enable silent mode for ans11. # Enable silent mode for ans11.
sendcmd 10.53.0.11 "disable.send-responses" sendcmd 10.53.0.11 send-responses "disable"
n=$((n + 1)) n=$((n + 1))
echo_i "checking the handling of hung DS fetch while chasing DS ($n)" echo_i "checking the handling of hung DS fetch while chasing DS ($n)"
ret=0 ret=0
@@ -338,7 +341,7 @@ nextpart ns3/named.run >/dev/null
dig_with_opts @$f1 xxx.yyy.sld.tld ds >dig.out.$n.f1 || ret=1 dig_with_opts @$f1 xxx.yyy.sld.tld ds >dig.out.$n.f1 || ret=1
grep "status: SERVFAIL" dig.out.$n.f1 >/dev/null || ret=1 grep "status: SERVFAIL" dig.out.$n.f1 >/dev/null || ret=1
# Disable silent mode for ans11. # Disable silent mode for ans11.
sendcmd 10.53.0.11 "enable.send-responses" sendcmd 10.53.0.11 send-responses "enable"
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))