From a38a3244424c593c7b65bb729683c9d953c2cf87 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 13 Mar 2020 11:23:40 +1100 Subject: [PATCH] wait for the reply message before checking to avoid false negative. Waiting for the reply message will ensure that all messages being looked for exist in the logs at the time of checking. When the test was only waiting for the send message there was a race between grep and the ns1 instance of named logging that it had seen the request. --- bin/tests/system/forward/tests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh index d76cd59217..7ecd38b210 100644 --- a/bin/tests/system/forward/tests.sh +++ b/bin/tests/system/forward/tests.sh @@ -199,8 +199,9 @@ echo_i "checking that priming queries are not forwarded ($n)" ret=0 nextpart ns7/named.run >/dev/null dig_with_opts +noadd +noauth txt.example1. txt @10.53.0.7 > dig.out.$n.f7 || ret=1 +received_pattern="received packet from 10\.53\.0\.1" start_pattern="sending packet to 10\.53\.0\.1" -retry_quiet 5 wait_for_log ns7/named.run "$start_pattern" || ret=1 +retry_quiet 5 wait_for_log ns7/named.run "$received_pattern" || ret=1 check_sent 1 ns7/named.run "$start_pattern" ";\.[[:space:]]*IN[[:space:]]*NS$" || ret=1 sent=$(grep -c "10.53.0.7#.* (.): query '\./NS/IN' approved" ns4/named.run) [ "$sent" -eq 0 ] || ret=1