From c2f7b2e7d26c60e9af12debbf75d5577e35ea1d7 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Sun, 17 Oct 2021 11:45:21 -0700 Subject: [PATCH] Fix digdelv test error The digdelv system test has a test case in which stderr was included in the dig output. When trace logging was in use, this confused the grep and caused a spurious test failure. (cherry picked from commit 21431206366e5c4f019f82e4e9b8e6963d3919a9) --- bin/tests/system/digdelv/tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh index d57744d1ec..22933c7f9d 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh @@ -1076,7 +1076,7 @@ if [ -x "$MDIG" ] ; then n=$((n+1)) echo_i "check mdig +yaml output ($n)" ret=0 - mdig_with_opts +yaml @10.53.0.3 -t any ns2.example > dig.out.test$n 2>&1 || ret=1 + mdig_with_opts +yaml @10.53.0.3 -t any ns2.example > dig.out.test$n || ret=1 value=$($PYTHON yamlget.py dig.out.test$n 0 message response_message_data status || ret=1) [ "$value" = "NOERROR" ] || ret=1 value=$($PYTHON yamlget.py dig.out.test$n 0 message response_message_data QUESTION_SECTION 0 || ret=1) @@ -1326,7 +1326,7 @@ if [ -x "$DELV" ] ; then n=$((n+1)) echo_i "check delv +yaml output ($n)" ret=0 - delv_with_opts +yaml @10.53.0.3 any ns2.example > delv.out.test$n 2>&1 || ret=1 + delv_with_opts +yaml @10.53.0.3 any ns2.example > delv.out.test$n || ret=1 value=$($PYTHON yamlget.py delv.out.test$n status || ret=1) [ "$value" = "success" ] || ret=1 value=$($PYTHON yamlget.py delv.out.test$n query_name || ret=1)