From e8fab79146fe8010728513f4458cfd2f4d8bd48b Mon Sep 17 00:00:00 2001 From: Witold Krecicki Date: Wed, 31 Aug 2016 15:04:02 +0200 Subject: [PATCH] 4477. [test] Fix mkeys test timing issues. [RT #41028] --- CHANGES | 2 ++ bin/tests/system/mkeys/ns2/named.args | 2 +- bin/tests/system/mkeys/ns3/named.args | 2 +- bin/tests/system/mkeys/tests.sh | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 5565b181f0..fcd35b602f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +4477. [test] Fix mkeys test timing issues. [RT #41028] + 4476. [test] Fix reclimit test on slower machines. [RT #43283] 4475. [doc] Update named-checkconf documentation. [RT #43153] diff --git a/bin/tests/system/mkeys/ns2/named.args b/bin/tests/system/mkeys/ns2/named.args index a29041f6e3..d222b7faea 100644 --- a/bin/tests/system/mkeys/ns2/named.args +++ b/bin/tests/system/mkeys/ns2/named.args @@ -1 +1 @@ --m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -T mkeytimers=2/10/15 +-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -T mkeytimers=2/20/40 diff --git a/bin/tests/system/mkeys/ns3/named.args b/bin/tests/system/mkeys/ns3/named.args index 038b980eca..71e466df40 100644 --- a/bin/tests/system/mkeys/ns3/named.args +++ b/bin/tests/system/mkeys/ns3/named.args @@ -1 +1 @@ --m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -T mkeytimers=2/10/20 -T tat=1 +-m record,size,mctx -T clienttest -c named.conf -d 99 -X named.lock -g -T mkeytimers=2/20/40 -T tat=1 diff --git a/bin/tests/system/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh index f0c85670b8..199ada144f 100644 --- a/bin/tests/system/mkeys/tests.sh +++ b/bin/tests/system/mkeys/tests.sh @@ -312,9 +312,9 @@ if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` n=`expr $n + 1` -echo "I: wait 15 seconds for key add/remove holddowns to expire ($n)" +echo "I: wait 30 seconds for key add/remove holddowns to expire ($n)" ret=0 -sleep 15 +sleep 30 $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 managed-keys refresh | sed 's/^/I: ns2 /' sleep 1 $RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 managed-keys sync | sed 's/^/I: ns2 /'