ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

adjust rt23702 test to take less time

Browse Source
This commit is contained in:
Mark Andrews
2011-03-21 20:32:39 +00:00
parent ad385e3aaa
commit 160d5cb860
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/tests/system/dnssec/ns2/sign.sh
+11 -8
View File
@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: sign.sh,v 1.35.32.12 2011/03/21 01:08:12 marka Exp $
# $Id: sign.sh,v 1.35.32.13 2011/03/21 20:32:39 marka Exp $
SYSTEMTESTTOP=../..
. $SYSTEMTESTTOP/conf.sh
@@ -163,19 +163,22 @@ cat $infile $keynew1.key $keynew2.key >$zonefile
$SIGNER -P -r $RANDFILE -o $zone -k $keyold1 -k $keynew1 $zonefile $keyold1 $keyold2 $keynew1 $keynew2 > /dev/null
#
#
# Make a zone big enough that it takes several seconds to generate a new
# nsec3 chain.
#
zone=nsec3chain-test
zonefile=nsec3chain-test.db.signed
cat > $zonefile << EOF
zonefile=nsec3chain-test.db
cat > $zonefile << 'EOF'
$TTL 10
@ 10 SOA ns2 hostmaster 0 3600 1200 864000 1200
@ 10 NS ns2
@ 10 NS ns3
ns2 10 A 10.53.0.2
ns3 10 A 10.53.0.3
EOF
awk 'END { for (i = 0; i < 1000; i++)
awk 'END { for (i = 0; i < 300; i++)
print "host" i, 10, "NS", "ns.elsewhere"; }' < /dev/null >> $zonefile
k=`$KEYGEN -q -r $RANDFILE -a RSASHA256 -b 1024 -n zone -fk $zone`
k=`$KEYGEN -q -r $RANDFILE -a RSASHA256 -b 1024 -n zone $zone`
key1=`$KEYGEN -q -r $RANDFILE -a RSASHA256 -b 1024 -n zone -fk $zone`
key2=`$KEYGEN -q -r $RANDFILE -a RSASHA256 -b 1024 -n zone $zone`
cat $key1.key $key2.key >> $zonefile
$SIGNER -P -3 - -A -H 1 -g -r $RANDFILE -o $zone -k $key1 $zonefile $key2 > /dev/null
bin/tests/system/dnssec/tests.sh
+4 -6
View File
@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.55.32.25 2011/03/21 03:31:28 marka Exp $
# $Id: tests.sh,v 1.55.32.26 2011/03/21 20:32:39 marka Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@@ -1178,22 +1178,20 @@ ret=0
(
echo zone nsec3chain-test
echo server 10.53.0.2 5300
grep DNSKEY ns2/Knsec3chain-test.*.key |
sed -e 's/.*://' -e 's/^/update add /' -e 's/IN/300 IN/'
echo update add nsec3chain-test. 0 nsec3param 1 0 1 -
echo update add nsec3chain-test. 0 nsec3param 1 0 1 123456
echo send
) | $NSUPDATE
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
do
$DIG $DIGOPTS nsec3param nsec3chain-test @10.53.0.2 > dig.out.ns2.test$n || ret=1
if grep "ANSWER: 2," dig.out.ns2.test$n >/dev/null
if grep "ANSWER: 3," dig.out.ns2.test$n >/dev/null
then
break;
fi
echo "I:sleeping ...."
sleep 3
done;
grep "ANSWER: 2," dig.out.ns2.test$n > /dev/null || ret=1
grep "ANSWER: 3," dig.out.ns2.test$n > /dev/null || ret=1
if [ $ret != 0 ]; then echo "I:nsec3 chain generation not complete"; fi
sleep 3
$DIG $DIGOPTS +noauth +nodnssec soa nsec3chain-test @10.53.0.2 > dig.out.ns2.test$n || ret=1