From ed7097fc0019874143e979abca9d2b2dbb60894a Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 8 Sep 2016 11:40:24 +1000 Subject: [PATCH] 4463. [bug] The dnstap system test failed on some systems. [RT #43129] --- CHANGES | 3 +++ bin/tests/system/dnstap/tests.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 56120a310d..ea3a9c52f0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4463. [bug] The dnstap system test failed on some systems. + [RT #43129] + 4462. [bug] Don't describe a returned EDNS COOKIE as "good" when there isn't a valid server cookie. [RT #43167] diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh index 78e15e11af..45f622b056 100644 --- a/bin/tests/system/dnstap/tests.sh +++ b/bin/tests/system/dnstap/tests.sh @@ -40,7 +40,7 @@ mv ns2/dnstap.out ns2/dnstap.out.save if [ -n "$FSTRM_CAPTURE" ] ; then $FSTRM_CAPTURE -t protobuf:dnstap.Dnstap -u ns4/dnstap.out \ - -w dnstap.out >& fstrm_capture.out & + -w dnstap.out > fstrm_capture.out 2>&1 & fstrm_capture_pid=$! fi @@ -424,7 +424,7 @@ if [ -n "$FSTRM_CAPTURE" ] ; then } mv dnstap.out dnstap.out.save $FSTRM_CAPTURE -t protobuf:dnstap.Dnstap -u ns4/dnstap.out \ - -w dnstap.out >& fstrm_capture.out & + -w dnstap.out > fstrm_capture.out 2>&1 & fstrm_capture_pid=$! $RNDCCMD -s 10.53.0.4 dnstap -reopen | sed 's/^/I:ns4 /' $DIG +short @10.53.0.4 -p 5300 a.example > dig.out