Fix the nslookup system test

The nslookup system test checks the count of resolved addresses in
the CNAME tests using a 'grep' match on the hostname, and ignoring
lines containing the 'canonical name' string. In order to protect
the check from intermittent failures like the 'address in use' warning
message, which then automatically resolves after a retry, edit the
'grep' matching string to also ignore the comments (as the mentioned
warning message is a comment which contains the hostname).

diff --git a/bin/tests/system/nslookup/tests.sh b/bin/tests/system/nslookup/tests.sh
index 6c8e29cda3ccf40c318d0e335a8029526a2af209..85dc1d72f09e585a97a577d581a45dabf91d0ff7 100644 (file)
--- a/bin/tests/system/nslookup/tests.sh
+++ b/bin/tests/system/nslookup/tests.sh
@@ -85,7 +85,7 @@ lines=$(grep -c "Server:" nslookup.out${n})
 test $lines -eq 1 || ret=1
 lines=$(grep -c "canonical name" nslookup.out${n})
 test $lines -eq 1 || ret=1
-lines=$(grep a-only.example.net nslookup.out${n} | grep -cv "canonical name")
+lines=$(grep a-only.example.net nslookup.out${n} | grep -cEv "(canonical name|^;;)")
 test $lines -eq 1 || ret=1
 grep "1.2.3.4" nslookup.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -101,7 +101,7 @@ lines=$(grep -c "Server:" nslookup.out${n})
 test $lines -eq 1 || ret=1
 lines=$(grep -c "canonical name" nslookup.out${n})
 test $lines -eq 1 || ret=1
-lines=$(grep aaaa-only.example.net nslookup.out${n} | grep -cv "canonical name")
+lines=$(grep aaaa-only.example.net nslookup.out${n} | grep -cEv "(canonical name|^;;)")
 test $lines -eq 1 || ret=1
 grep "2001::ffff" nslookup.out${n} >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -117,7 +117,7 @@ lines=$(grep -c "Server:" nslookup.out${n})
 test $lines -eq 1 || ret=1
 lines=$(grep -c "canonical name" nslookup.out${n})
 test $lines -eq 1 || ret=1
-lines=$(grep dual.example.net nslookup.out${n} | grep -cv "canonical name")
+lines=$(grep dual.example.net nslookup.out${n} | grep -cEv "(canonical name|^;;)")
 test $lines -eq 2 || ret=1
 grep "1.2.3.4" nslookup.out${n} >/dev/null || ret=1
 grep "2001::ffff" nslookup.out${n} >/dev/null || ret=1