upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 00:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[master] Properly handle errors in rrchecker system test

Browse source 
4657.	[bug]		rrchecker system test result could be improperly
			determined. [RT #45602]
This commit is contained in:
Michał Kępień 2017-07-24 10:39:51 +02:00
parent bd5b0b39e6
commit 984a28c771
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
4657. [bug] rrchecker system test result could be improperly
determined. [RT #45602]
4656. [bug] Apply "port" and "dscp" values specified in catalog
zone's "default-masters" option to the generated
configuration of its member zones. [RT #45545]

2
bin/tests/system/rrchecker/clean.sh
View file

@ -4,5 +4,5 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
rm -f classlist.out privatelist.out typelist.out tempzone checker.out
rm -f classlist.out privatelist.out typelist.out tempzone checkzone.out* checker.out
rm -f ns*/named.lock

29
bin/tests/system/rrchecker/tests.sh
View file

@ -10,17 +10,20 @@ SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
status=0
t=0
n=0
echo "I:class list"
n=`expr $n + 1`
echo "I:class list ($n)"
$RRCHECKER -C > classlist.out
$DIFF classlist.out classlist.good || { echo "I:failed"; status=`expr $status + 1`; }
echo "I:type list"
n=`expr $n + 1`
echo "I:type list ($n)"
$RRCHECKER -T > typelist.out
$DIFF typelist.out typelist.good || { echo "I:failed"; status=`expr $status + 1`; }
echo "I:private type list"
n=`expr $n + 1`
echo "I:private type list ($n)"
$RRCHECKER -P > privatelist.out
$DIFF privatelist.out privatelist.good || { echo "I:failed"; status=`expr $status + 1`; }
@ -30,11 +33,12 @@ $*
EOF
}
echo "I:check conversions to canonical format"
n=`expr $n + 1`
echo "I:check conversions to canonical format ($n)"
ret=0
$SHELL ../genzone.sh 0 > tempzone
$CHECKZONE -Dq . tempzone | sed '/^;/d' |
while read -r n tt cl ty rest
$CHECKZONE -Dq . tempzone | sed '/^;/d' > checkzone.out$n
while read -r name tt cl ty rest
do
myecho "$cl $ty $rest" | $RRCHECKER -p > checker.out || {
ret=1
@ -45,13 +49,14 @@ do
ret=1
echo "I: '$cl $ty $rest' != '$cl0 $ty0 $rest0'"
}
done
done < checkzone.out$n
test $ret -eq 0 || { echo "I:failed"; status=`expr $status + 1`; }
echo "I:check conversions to and from unknown record format"
n=`expr $n + 1`
echo "I:check conversions to and from unknown record format ($n)"
ret=0
$CHECKZONE -Dq . tempzone | sed '/^;/d' |
while read -r n tt cl ty rest
$CHECKZONE -Dq . tempzone | sed '/^;/d' > checkzone.out$n
while read -r name tt cl ty rest
do
myecho "$cl $ty $rest" | $RRCHECKER -u > checker.out || {
ret=1
@ -67,7 +72,7 @@ do
ret=1
echo "I: '$cl $ty $rest' != '$cl0 $ty0 $rest0'"
}
done
done < checkzone.out$n
test $ret -eq 0 || { echo "I:failed"; status=`expr $status + 1`; }
echo "I:exit status: $status"