From: Mark Andrews <marka@isc.org>
Date: Wed, 12 Feb 2020 02:54:17 +0000 (+1100)
Subject: spin waiting for prototype dig responses
X-Git-Tag: v9.14.11~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bea07867403f53c9a714ecd47ff3222f929576c;p=thirdparty%2Fbind9.git

spin waiting for prototype dig responses

(cherry picked from commit c38752b07ce8256488b7c31ec1175ac5c926e456)
---

diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 255779f785a..4f683c98dc9 100644
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -432,6 +432,24 @@ EOF
   sleep 2
 }
 
+#
+# generate prototype NXDOMAIN response to compare against.
+#
+make_proto_nxdomain() {
+  digcmd nonexistent @$ns2 >proto.nxdomain || return 1
+  grep "status: NXDOMAIN" proto.nxdomain >/dev/null || return 1
+  return 0
+}
+
+#
+# generate prototype NODATA response to compare against.
+#
+make_proto_nodata() {
+  digcmd txt-only.tld2 @$ns2 >proto.nodata || return 1
+  grep "status: NOERROR" proto.nodata >/dev/null || return 1
+  return 0
+}
+
 for mode in native dnsrps; do
   status=0
   case ${mode} in
@@ -470,8 +488,8 @@ for mode in native dnsrps; do
   esac
 
   # make prototype files to check against rewritten results
-  digcmd nonexistent @$ns2 >proto.nxdomain
-  digcmd txt-only.tld2 @$ns2 >proto.nodata
+  retry_quiet 10 make_proto_nxdomain
+  retry_quiet 10 make_proto_nodata
 
   start_group "QNAME rewrites" test1
   nochange .					# 1 do not crash or rewrite root