From 39fb5f2a5d9ba3ca2d120c3c9a4510709d80bf19 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Sat, 4 Oct 2014 18:06:04 +1000 Subject: [PATCH] verifying inline zones work with views requires crypto to be configured --- bin/tests/system/views/setup.sh | 4 ++-- bin/tests/system/views/tests.sh | 25 ++++++++++++++----------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh index ebd059fdcc..254bd3bfc3 100644 --- a/bin/tests/system/views/setup.sh +++ b/bin/tests/system/views/setup.sh @@ -37,8 +37,8 @@ test -r $RANDFILE || $GENRANDOM 400 $RANDFILE # $KEYGEN -K ns2/internal -r $RANDFILE -3q inline > /dev/null 2>&1 $KEYGEN -K ns2/internal -r $RANDFILE -3qfk inline > /dev/null 2>&1 -k1=`$KEYGEN -K ns2/external -r $RANDFILE -3q inline` -k2=`$KEYGEN -K ns2/external -r $RANDFILE -3qfk inline` +k1=`$KEYGEN -K ns2/external -r $RANDFILE -3q inline 2> /dev/null` +k2=`$KEYGEN -K ns2/external -r $RANDFILE -3qfk inline 2> /dev/null` $KEYGEN -K ns2/external -r $RANDFILE -3q inline > /dev/null 2>&1 $KEYGEN -K ns2/external -r $RANDFILE -3qfk inline > /dev/null 2>&1 test -n "$k1" && rm -f ns2/external/$k1.* diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh index 13748052f4..b90d7f5edf 100644 --- a/bin/tests/system/views/tests.sh +++ b/bin/tests/system/views/tests.sh @@ -123,17 +123,20 @@ fi if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -echo "I:verifying inline zones work with views" -ret=0 -$DIG @10.53.0.2 -p 5300 -b 10.53.0.2 +dnssec DNSKEY inline > dig.out.internal -$DIG @10.53.0.2 -p 5300 -b 10.53.0.5 +dnssec DNSKEY inline > dig.out.external -grep "ANSWER: 4," dig.out.internal > /dev/null || ret=1 -grep "ANSWER: 4," dig.out.external > /dev/null || ret=1 -int=`awk '$4 == "DNSKEY" { print $8 }' dig.out.internal | sort` -ext=`awk '$4 == "DNSKEY" { print $8 }' dig.out.external | sort` -test "$int" != "$ext" || ret=1 -if [ $ret != 0 ]; then echo "I:failed"; fi -status=`expr $status + $ret` +if $SHELL ../testcrypto.sh +then + echo "I:verifying inline zones work with views" + ret=0 + $DIG @10.53.0.2 -p 5300 -b 10.53.0.2 +dnssec DNSKEY inline > dig.out.internal + $DIG @10.53.0.2 -p 5300 -b 10.53.0.5 +dnssec DNSKEY inline > dig.out.external + grep "ANSWER: 4," dig.out.internal > /dev/null || ret=1 + grep "ANSWER: 4," dig.out.external > /dev/null || ret=1 + int=`awk '$4 == "DNSKEY" { print $8 }' dig.out.internal | sort` + ext=`awk '$4 == "DNSKEY" { print $8 }' dig.out.external | sort` + test "$int" != "$ext" || ret=1 + if [ $ret != 0 ]; then echo "I:failed"; fi + status=`expr $status + $ret` +fi echo "I:exit status: $status" exit $status