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 2143120636)
This commit is contained in:
Evan Hunt 2021-10-17 11:45:21 -07:00
parent 563c0be633
commit c2f7b2e7d2

View file

@ -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)