From c2d2fffec286200389316c9e44cf41ef9a57b8a2 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 13 Jun 2024 08:57:14 +1000 Subject: [PATCH] Reset 'ret' to zero at start of tests (cherry picked from commit 2dc2abd00df901f98592e2d2cadc953b54fcb5ea) --- bin/tests/system/digdelv/tests.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh index 2e867a3adc..284646b60f 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh @@ -681,6 +681,7 @@ if [ -x "$DIG" ]; then n=$((n + 1)) echo_i "check that Extended DNS Error 0 is printed correctly ($n)" + ret=0 # First defined EDE code, additional text "foo". dig_with_opts @10.53.0.3 +ednsopt=ede:0000666f6f a.example +qr >dig.out.test$n 2>&1 || ret=1 pat='^; EDE: 0 (Other): (foo)$' @@ -690,6 +691,7 @@ if [ -x "$DIG" ]; then n=$((n + 1)) echo_i "check that Extended DNS Error 24 is printed correctly ($n)" + ret=0 # Last defined EDE code, no additional text. dig_with_opts @10.53.0.3 +ednsopt=ede:0018 a.example +qr >dig.out.test$n 2>&1 || ret=1 pat='^; EDE: 24 (Invalid Data)$' @@ -699,6 +701,7 @@ if [ -x "$DIG" ]; then n=$((n + 1)) echo_i "check that Extended DNS Error 25 is printed correctly ($n)" + ret=0 # First undefined EDE code, additional text "foo". dig_with_opts @10.53.0.3 +ednsopt=ede:0019666f6f a.example +qr >dig.out.test$n 2>&1 || ret=1 pat='^; EDE: 25: (foo)$' @@ -708,6 +711,7 @@ if [ -x "$DIG" ]; then n=$((n + 1)) echo_i "check that invalid Extended DNS Error (length 0) is printed ($n)" + ret=0 # EDE payload is too short dig_with_opts @10.53.0.3 +ednsopt=ede a.example +qr >dig.out.test$n 2>&1 || ret=1 pat='^; EDE:$' @@ -717,6 +721,7 @@ if [ -x "$DIG" ]; then n=$((n + 1)) echo_i "check that invalid Extended DNS Error (length 1) is printed ($n)" + ret=0 # EDE payload is too short dig_with_opts @10.53.0.3 +ednsopt=ede:00 a.example +qr >dig.out.test$n 2>&1 || ret=1 pat='^; EDE: 00 (".")$' @@ -727,6 +732,7 @@ if [ -x "$DIG" ]; then if [ $HAS_PYYAML -ne 0 ]; then n=$((n + 1)) echo_i "check that +yaml Extended DNS Error 0 is printed correctly ($n)" + ret=0 # First defined EDE code, additional text "foo". dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:0000666f6f a.example +qr >dig.out.test$n 2>&1 || ret=1 $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE INFO-CODE >yamlget.out.test$n 2>&1 || ret=1 @@ -740,6 +746,7 @@ if [ -x "$DIG" ]; then n=$((n + 1)) echo_i "check that +yaml Extended DNS Error 24 is printed correctly ($n)" + ret=0 # Last defined EDE code, no additional text. dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:0018 a.example +qr >dig.out.test$n 2>&1 || ret=1 $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE INFO-CODE >yamlget.out.test$n 2>&1 || ret=1 @@ -751,6 +758,7 @@ if [ -x "$DIG" ]; then n=$((n + 1)) echo_i "check that +yaml Extended DNS Error 25 is printed correctly ($n)" + ret=0 # First undefined EDE code, additional text "foo". dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:0019666f6f a.example +qr >dig.out.test$n 2>&1 || ret=1 $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE INFO-CODE >yamlget.out.test$n 2>&1 || ret=1 @@ -764,6 +772,7 @@ if [ -x "$DIG" ]; then n=$((n + 1)) echo_i "check that invalid Extended DNS Error (length 0) is printed ($n)" + ret=0 # EDE payload is too short dig_with_opts @10.53.0.3 +yaml +ednsopt=ede a.example +qr >dig.out.test$n 2>&1 || ret=1 $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE >yamlget.out.test$n 2>&1 || ret=1 @@ -774,6 +783,7 @@ if [ -x "$DIG" ]; then n=$((n + 1)) echo_i "check that invalid +yaml Extended DNS Error (length 1) is printed ($n)" + ret=0 # EDE payload is too short dig_with_opts @10.53.0.3 +yaml +ednsopt=ede:00 a.example +qr >dig.out.test$n 2>&1 || ret=1 $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS EDE >yamlget.out.test$n 2>&1 || ret=1