From: Mark Andrews <marka@isc.org>
Date: Fri, 9 Feb 2018 03:04:35 +0000 (+1100)
Subject: check warning text
X-Git-Tag: v9.12.1rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc089b3339d1d4a8d09119bfb0a701919629f48e;p=thirdparty%2Fbind9.git

check warning text

(cherry picked from commit c6cd108838543042407b81fc865bbfc66dc6034b)
---

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index e090b03955c..c7d4867a1a1 100644
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -367,6 +367,7 @@ echo "I: check that the 2010 ICANN ROOT KSK without the 2017 ICANN ROOT KSK gene
 ret=0
 $CHECKCONF check-root-ksk-2010.conf > checkconf.out$n 2>/dev/null || ret=1
 [ -s checkconf.out$n ] || ret=1
+grep "trusted-key for root from 2010 without updated" checkconf.out$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; ret=1; fi
 status=`expr $status + $ret`
 
@@ -388,6 +389,7 @@ echo "I: check that the dlv.isc.org KSK generates a warning ($n)"
 ret=0
 $CHECKCONF check-dlv-ksk-key.conf > checkconf.out$n 2>/dev/null || ret=1
 [ -s checkconf.out$n ] || ret=1
+grep "trusted-key for dlv.isc.org still present" checkconf.out$n > /dev/null || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; ret=1; fi
 status=`expr $status + $ret`