From: Evan Hunt Date: Wed, 3 Sep 2014 19:59:18 +0000 (-0700) Subject: [v9_8] check correctly for duplicate zone error message X-Git-Tag: v9.8.8rc2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdf79c4ddf478e2f33b1b37b2fb77b185e750f12;p=thirdparty%2Fbind9.git [v9_8] check correctly for duplicate zone error message --- diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh index 35a40f0cac8..e0470c82842 100644 --- a/bin/tests/system/zonechecks/tests.sh +++ b/bin/tests/system/zonechecks/tests.sh @@ -161,12 +161,8 @@ fi echo "I: checking 'rdnc zonestatus' with duplicated zone name" ret=0 -$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 zonestatus duplicate.example > rndc.out.duplicate 2>&1 -checkfor "zone 'duplicate.example' was found in multiple views" rndc.out.duplicate -$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 zonestatus duplicate.example in primary > rndc.out.duplicate 2>&1 -checkfor "name: duplicate.example" rndc.out.duplicate -$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 zonestatus nosuchzone.example > rndc.out.duplicate 2>&1 -checkfor "no matching zone 'nosuchzone.example' in any view" rndc.out.duplicate +$RNDC -c ../common/rndc.conf -s 10.53.0.1 -p 9953 reload duplicate.example > rndc.out.duplicate 2>&1 +grep "zone 'duplicate.example' was found in multiple views" rndc.out.duplicate > /dev/null || ret=1 if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret`