From cb180bf4ea297287fce80079f976fec454702ddd 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 5b8cfdb902..5cde0a3887 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh @@ -662,6 +662,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)$' @@ -671,6 +672,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)$' @@ -680,6 +682,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)$' @@ -689,6 +692,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:$' @@ -698,6 +702,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 (".")$' @@ -708,6 +713,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 @@ -721,6 +727,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 @@ -732,6 +739,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 @@ -745,6 +753,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 @@ -755,6 +764,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