From 2f13e0ef9804502d2c44e14eb5efdfd0ee38a286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Mon, 27 Nov 2017 10:04:11 +0100 Subject: [PATCH] [master] Minor mkeys system test tweaks [RT #46649] --- bin/tests/system/mkeys/tests.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bin/tests/system/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh index fe8d8e4510..30860fbeee 100644 --- a/bin/tests/system/mkeys/tests.sh +++ b/bin/tests/system/mkeys/tests.sh @@ -22,9 +22,7 @@ wait_for_log() { mkeys_reconfig_on() { nsidx=$1 - nextpart ns${nsidx}/named.run > /dev/null $RNDC -c ../common/rndc.conf -s 10.53.0.${nsidx} -p 9953 reconfig . | sed "s/^/I: ns${nsidx} /" - wait_for_log "running" ns${nsidx}/named.run } mkeys_reload_on() { @@ -71,9 +69,7 @@ mkeys_status_on() { mkeys_flush_on() { nsidx=$1 - nextpart ns${nsidx}/named.run > /dev/null $RNDC -c ../common/rndc.conf -s 10.53.0.${nsidx} -p 9953 flush | sed "s/^/I: ns${nsidx} /" - wait_for_log "flushing caches in all views succeeded" ns${nsidx}/named.run } mkeys_secroots_on() { @@ -693,7 +689,7 @@ ret=0 # compare against the known key. tathex=`grep "query '_ta-[0-9a-f][0-9a-f]*/NULL/IN' approved" ns1/named.run | awk '{print $6; exit 0}' | sed -e 's/(_ta-\([0-9a-f][0-9a-f]*\)):/\1/'` tatkey=`$PERL -e 'printf("%d\n", hex(@ARGV[0]));' $tathex` -realkey=`$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 secroots - | grep '; managed' | sed 's#.*SHA256/\([0-9][0-9]*\) ; managed.*#\1#'` +realkey=`$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 secroots - | sed -n 's#.*SHA256/\([0-9][0-9]*\) ; .*managed.*#\1#p'` [ "$tatkey" -eq "$realkey" ] || ret=1 if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret`