Commit 3f68ed9a authored by Mark Andrews's avatar Mark Andrews

Merge branch '1596-echo_ic-should-be-used-for-continuations-v9_11' into 'v9_11'

Resolve "echo_ic should be used for continuations."

See merge request !3022
parents b700eb67 aef2c41e
Pipeline #33288 passed with stages
in 1 minute and 42 seconds
......@@ -24,7 +24,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +rec -t RT rt.rt.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -32,7 +32,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +rec -t RT rt.rt2.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -40,7 +40,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +rec -t NAPTR nap.naptr.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -48,7 +48,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +rec -t NAPTR nap.hang3b.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -78,7 +78,7 @@ dotests() {
;;
esac
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -94,7 +94,7 @@ dotests() {
grep -w "L32" dig.out.$n > /dev/null && ret=1
fi
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -112,7 +112,7 @@ dotests() {
grep -w "L32" dig.out.$n > /dev/null && ret=1
fi
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -120,7 +120,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +norec -t RT rt.rt.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -128,7 +128,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +norec -t RT rt.rt2.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -136,7 +136,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +norec -t NAPTR nap.naptr.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -144,7 +144,7 @@ dotests() {
ret=0
$DIG $DIGOPTS +norec -t NAPTR nap.hang3b.example @10.53.0.1 > dig.out.$n || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -174,7 +174,7 @@ dotests() {
;;
esac
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -190,7 +190,7 @@ dotests() {
grep -w "L32" dig.out.$n > /dev/null && ret=1
fi
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -208,7 +208,7 @@ dotests() {
grep -w "L32" dig.out.$n > /dev/null && ret=1
fi
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -218,7 +218,7 @@ dotests() {
# Always expect glue for root priming queries, regardless $minimal
grep 'ADDITIONAL: 3' dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -240,7 +240,7 @@ dotests() {
;;
esac
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
}
......@@ -263,7 +263,7 @@ ret=0
$DIG $DIGOPTS -t ANY www.rt.example @10.53.0.1 > dig.out.$n || ret=1
grep "ANSWER: 3, AUTHORITY: 1, ADDITIONAL: 2" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
echo_i "reconfiguring server: minimal-any yes"
......@@ -277,7 +277,7 @@ ret=0
$DIG $DIGOPTS -t ANY +notcp www.rt.example @10.53.0.1 > dig.out.$n || ret=1
grep "ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -286,7 +286,7 @@ ret=0
$DIG $DIGOPTS -t ANY +tcp www.rt.example @10.53.0.1 > dig.out.$n || ret=1
grep "ANSWER: 3, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -295,7 +295,7 @@ ret=0
$DIG $DIGOPTS -t ANY +notcp www.rt.example @10.53.0.1 > dig.out.$n || ret=1
grep "ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 1" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
echo_i "testing with 'minimal-responses no-auth;'"
......@@ -319,7 +319,7 @@ grep "mx\.example\..*MX.0 mail\.mx\.example" dig.out.$n > /dev/null || ret=1
grep "mail\.mx\.example\..*A.1\.2\.3\.4" dig.out.$n > /dev/null || ret=1
grep "_25\._tcp\.mail\.mx\.example\..*TLSA.3 0 1 5B30F9602297D558EB719162C225088184FAA32CA45E1ED15DE58A21 D9FCE383" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -330,7 +330,7 @@ grep "_xmpp-client\._tcp\.srv\.example\..*SRV.1 0 5222 server\.srv\.example" dig
grep "server\.srv\.example\..*A.1\.2\.3\.4" dig.out.$n > /dev/null || ret=1
grep "_5222\._tcp\.server\.srv\.example\..*TLSA.3 0 1 5B30F9602297D558EB719162C225088184FAA32CA45E1ED15DE58A21 D9FCE383" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
echo_i "reconfiguring server: minimal-responses no"
......@@ -345,7 +345,7 @@ $DIG $DIGOPTS -t ANY rt.example @10.53.0.1 > dig.out.$n || ret=1
grep "AUTHORITY: 0" dig.out.$n > /dev/null || ret=1
grep "NS[ ]*ns" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
n=`expr $n + 1`
......@@ -355,7 +355,7 @@ $DIG $DIGOPTS -t ANY rt.example @10.53.0.3 > dig.out.$n || ret=1
grep "AUTHORITY: 0" dig.out.$n > /dev/null || ret=1
grep "NS[ ]*ns" dig.out.$n > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo_i " failed"; status=1
echo_i "failed"; status=`expr status + 1`
fi
echo_i "exit status: $status"
......
......@@ -206,8 +206,8 @@ nextpartreset ns3/named.run
# Check that DNSKEY is initially signed with a KSK and not a ZSK.
#
echo_i "check that zone with active and inactive KSK and active ZSK is properly"
echo_i " resigned after the active KSK is deleted - stage 1: Verify that DNSKEY"
echo_i " is initially signed with a KSK and not a ZSK. ($n)"
echo_ic "resigned after the active KSK is deleted - stage 1: Verify that DNSKEY"
echo_ic "is initially signed with a KSK and not a ZSK. ($n)"
ret=0
$DIG $DIGOPTS @10.53.0.3 axfr inacksk3.example > dig.out.ns3.test$n
......@@ -243,8 +243,8 @@ status=`expr $status + $ret`
# Check that zone is initially signed with a ZSK and not a KSK.
#
echo_i "check that zone with active and inactive ZSK and active KSK is properly"
echo_i " resigned after the active ZSK is deleted - stage 1: Verify that zone"
echo_i " is initially signed with a ZSK and not a KSK. ($n)"
echo_ic "resigned after the active ZSK is deleted - stage 1: Verify that zone"
echo_ic "is initially signed with a ZSK and not a KSK. ($n)"
ret=0
$DIG $DIGOPTS @10.53.0.3 axfr inaczsk3.example > dig.out.ns3.test$n
kskid=`awk '$4 == "DNSKEY" && $5 == 257 { print }' dig.out.ns3.test$n |
......@@ -1464,8 +1464,8 @@ status=`expr $status + $ret`
# Check that DNSKEY is now signed with the ZSK.
#
echo_i "check that zone with active and inactive KSK and active ZSK is properly"
echo_i " resigned after the active KSK is deleted - stage 2: Verify that DNSKEY"
echo_i " is now signed with the ZSK. ($n)"
echo_ic "resigned after the active KSK is deleted - stage 2: Verify that DNSKEY"
echo_ic "is now signed with the ZSK. ($n)"
ret=0
$DIG $DIGOPTS @10.53.0.3 axfr inacksk3.example > dig.out.ns3.test$n
......@@ -1493,8 +1493,8 @@ status=`expr $status + $ret`
# Check that zone is now signed with the KSK.
#
echo_i "check that zone with active and inactive ZSK and active KSK is properly"
echo_i " resigned after the active ZSK is deleted - stage 2: Verify that zone"
echo_i " is now signed with the KSK. ($n)"
echo_ic "resigned after the active ZSK is deleted - stage 2: Verify that zone"
echo_ic "is now signed with the KSK. ($n)"
ret=0
$DIG $DIGOPTS @10.53.0.3 axfr inaczsk3.example > dig.out.ns3.test$n
kskid=`awk '$4 == "DNSKEY" && $5 == 257 { print }' dig.out.ns3.test$n |
......
......@@ -158,7 +158,7 @@ ret=0
$RNDCCMD 10.53.0.7 null --- start test$n --- 2>&1 | sed 's/^/ns7 /' | cat_i
$DIG $DIGOPTS @10.53.0.7 c.example > dig.out.$n
grep "status: NOERROR" dig.out.$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i " failed"; fi
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
......@@ -167,7 +167,7 @@ ret=0
$RNDCCMD 10.53.0.7 null --- start test$n --- 2>&1 | sed 's/^/ns7 /' | cat_i
$DIG $DIGOPTS @10.53.0.7 d.example > dig.out.$n
grep "status: NOERROR" dig.out.$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo_i " failed"; fi
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
n=`expr $n + 1`
......
......@@ -1331,7 +1331,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i "basic dnssec-signzone checks:"
echo_i " two DNSKEYs ($n)"
echo_ic "two DNSKEYs ($n)"
ret=0
(
cd signer/general
......@@ -1343,7 +1343,7 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i " one non-KSK DNSKEY ($n)"
echo_ic "one non-KSK DNSKEY ($n)"
ret=0
(
cd signer/general
......@@ -1355,7 +1355,7 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i " one KSK DNSKEY ($n)"
echo_ic "one KSK DNSKEY ($n)"
ret=0
(
cd signer/general
......@@ -1367,7 +1367,7 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i " three DNSKEY ($n)"
echo_ic "three DNSKEY ($n)"
ret=0
(
cd signer/general
......@@ -1379,7 +1379,7 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i " three DNSKEY, one private key missing ($n)"
echo_ic "three DNSKEY, one private key missing ($n)"
ret=0
(
cd signer/general
......@@ -1391,7 +1391,7 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i " four DNSKEY ($n)"
echo_ic "four DNSKEY ($n)"
ret=0
(
cd signer/general
......@@ -1403,7 +1403,7 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i " two DNSKEY, both private keys missing ($n)"
echo_ic "two DNSKEY, both private keys missing ($n)"
ret=0
(
cd signer/general
......@@ -1415,7 +1415,7 @@ n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
echo_i " two DNSKEY, one private key missing ($n)"
echo_ic "two DNSKEY, one private key missing ($n)"
ret=0
(
cd signer/general
......
......@@ -206,7 +206,7 @@ echo_i "testing request-ixfr option in view vs zone ($n)"
# we want to make sure that a change to sub.test results in AXFR, while
# changes to test. result in IXFR
echo_i " this result should be AXFR"
echo_ic "this result should be AXFR"
cp ns3/subtest1.db ns3/subtest.db # change to sub.test zone, should be AXFR
$RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
......@@ -231,7 +231,7 @@ do
sleep 1
done
echo_i " this result should be AXFR"
echo_ic "this result should be AXFR"
for i in 0 1 2 3 4 5 6 7 8 9
do
NONINCR=`grep 'sub\.test/IN/primary' ns4/named.run|grep "got nonincremental" | wc -l`
......@@ -240,13 +240,15 @@ do
done
if [ $NONINCR -ne 2 ]
then
echo_i "failed to get nonincremental response in 2nd AXFR test"
echo_ic "failed to get nonincremental response in 2nd AXFR test"
echo_i "failed"
status=1
else
echo_i " success: AXFR it was"
echo_ic "success: AXFR it was"
fi
echo_i " this result should be IXFR"
echo_ic "this result should be IXFR"
cp ns3/mytest2.db ns3/mytest.db # change to test zone, should be IXFR
$RNDCCMD 10.53.0.3 reload | sed 's/^/ns3 /' | cat_i
......@@ -279,10 +281,12 @@ do
done
if [ $INCR -ne 2 ]
then
echo_i "failed to get incremental response in 2nd IXFR test"
echo_ic "failed to get incremental response in 2nd IXFR test"
echo_i "failed"
status=1
else
echo_i " success: IXFR it was"
echo_ic "success: IXFR it was"
fi
n=`expr $n + 1`
......@@ -311,8 +315,8 @@ awk '$4 == "SOA" { if ($7 == 4) exit(0); else exit(1);}' dig.out1.test$n || ret=
$DIG $DIGOPTS ixfr=1 test @10.53.0.4 > dig.out3.test$n || ret=1
awk '$4 == "SOA" { soacnt++} END { if (soacnt == 6) exit(0); else exit(1);}' dig.out3.test$n || ret=1
if [ ${ret} != 0 ]; then
echo_i "failed";
status=1;
echo_i "failed"
status=1
fi
# wait for slave to transfer zone
......@@ -338,8 +342,8 @@ $DIG $DIGOPTS ixfr=1 +notcp test @10.53.0.5 > dig.out2.test$n || ret=1
awk '$4 == "SOA" { soacnt++} END {if (soacnt == 2) exit(0); else exit(1);}' dig.out1.test$n || ret=1
awk '$4 == "SOA" { soacnt++} END {if (soacnt == 1) exit(0); else exit(1);}' dig.out2.test$n || ret=1
if [ ${ret} != 0 ]; then
echo_i "failed";
status=1;
echo_i "failed"
status=1
fi
echo_i "exit status: $status"
......
......@@ -309,15 +309,15 @@ expected4="view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0${AIN} via 3
expected3="view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0${AIN} via 32.3.0.53.10.rpz-client-ip.log2"
expected2="view recursive: rpz CLIENT-IP Local-Data rewrite l2.l1.l0${AIN} via 32.2.0.53.10.rpz-client-ip.log3"
sed -n "$cur,"'$p' < ns2/named.run | grep "$expected4" > /dev/null && {
echo_i " failed: unexpected rewrite message for policy zone log1 was logged"
echo_ic "failed: unexpected rewrite message for policy zone log1 was logged"
status=1
}
sed -n "$cur,"'$p' < ns2/named.run | grep "$expected3" > /dev/null || {
echo_i " failed: expected rewrite message for policy zone log2 was not logged"
echo_ic "failed: expected rewrite message for policy zone log2 was not logged"
status=1
}
sed -n "$cur,"'$p' < ns2/named.run | grep "$expected2" > /dev/null || {
echo_i " failed: expected rewrite message for policy zone log3 was not logged"
echo_ic "failed: expected rewrite message for policy zone log3 was not logged"
status=1
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment