From: Witold Krecicki <wpk@isc.org>
Date: Thu, 18 Aug 2016 16:17:17 +0000 (+0200)
Subject: 4449.  [test]          Fix catalog zones test on slower systems. [RT #42997]
X-Git-Tag: v9.12.0a0~81
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=85342bec808ad06a4316f69f499fdd45d77cf60a;p=thirdparty%2Fbind9.git

4449.  [test]          Fix catalog zones test on slower systems. [RT #42997]
---

diff --git a/CHANGES b/CHANGES
index 65d92714b87..3bd5ee1e183 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4449.	[test]		Fix catalog zones test on slower systems. [RT #42997]
+
 4448.	[bug]		win32: ::1 was not being found when iterating
 			interfaces. [RT #42993]
 
diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh
index 311e8ca7244..77447c515fc 100644
--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@@ -79,9 +79,13 @@ status=`expr $status + $ret`
 
 n=`expr $n + 1`
 echo "I: checking that dom1.example is served by slave ($n)"
-ret=0
-$DIG soa dom1.example @10.53.0.2 -p 5300 > dig.out.test$n
-grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+for try in 0 1 2 3 4 5 6 7 8 9; do
+    $DIG soa dom1.example @10.53.0.2 -p 5300 > dig.out.test$n
+    ret=0
+    grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+    [ $ret -eq 0 ] && break
+    sleep 1
+done
 if [ $ret != 0 ]; then echo "I: failed"; fi
 status=`expr $status + $ret`
 
@@ -216,9 +220,13 @@ status=`expr $status + $ret`
 
 n=`expr $n + 1`
 echo "I: checking that dom4.example is served by slave ($n)"
-ret=0
-$DIG soa dom4.example @10.53.0.2 -p 5300 > dig.out.test$n
-grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+for try in 0 1 2 3 4 5 6 7 8 9; do
+    $DIG soa dom4.example @10.53.0.2 -p 5300 > dig.out.test$n
+    ret=0
+    grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+    [ $ret -eq 0 ] && break
+    sleep 1
+done
 if [ $ret != 0 ]; then echo "I: failed"; fi
 status=`expr $status + $ret`
 
@@ -276,9 +284,13 @@ status=`expr $status + $ret`
 
 n=`expr $n + 1`
 echo "I: checking that dom3.example is served by slave ($n)"
-ret=0
-$DIG soa dom3.example @10.53.0.2 -p 5300 > dig.out.test$n
-grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+for try in 0 1 2 3 4 5 6 7 8 9; do
+    $DIG soa dom3.example @10.53.0.2 -p 5300 > dig.out.test$n
+    ret=0
+    grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+    [ $ret -eq 0 ] && break
+    sleep 1
+done
 if [ $ret != 0 ]; then echo "I: failed"; fi
 status=`expr $status + $ret`
 
@@ -358,9 +370,13 @@ status=`expr $status + $ret`
 
 n=`expr $n + 1`
 echo "I: checking that dom5.example is served by slave ($n)"
-ret=0
-$DIG soa dom5.example @10.53.0.2 -p 5300 > dig.out.test$n
-grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+for try in 0 1 2 3 4 5 6 7 8 9; do
+    $DIG soa dom5.example @10.53.0.2 -p 5300 > dig.out.test$n
+    ret=0
+    grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+    [ $ret -eq 0 ] && break
+    sleep 1
+done
 if [ $ret != 0 ]; then echo "I: failed"; fi
 status=`expr $status + $ret`
 
@@ -445,9 +461,13 @@ status=`expr $status + $ret`
 
 n=`expr $n + 1`
 echo "I: checking that dom6.example is served by slave ($n)"
-ret=0
-$DIG soa dom6.example @10.53.0.2 -p 5300 > dig.out.test$n
-grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+for try in 0 1 2 3 4 5 6 7 8 9; do
+    $DIG soa dom6.example @10.53.0.2 -p 5300 > dig.out.test$n
+    ret=0
+    grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+    [ $ret -eq 0 ] && break
+    sleep 1
+done
 if [ $ret != 0 ]; then echo "I: failed"; fi
 status=`expr $status + $ret`
 
@@ -1002,9 +1022,13 @@ status=`expr $status + $ret`
 
 n=`expr $n + 1`
 echo "I: checking that dom11.example is served by slave ($n)"
-ret=0
-$DIG soa dom11.example @10.53.0.2 -p 5300 > dig.out.test$n
-grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+for try in 0 1 2 3 4 5 6 7 8 9; do
+    $DIG soa dom11.example @10.53.0.2 -p 5300 > dig.out.test$n
+    ret=0
+    grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+    [ $ret -eq 0 ] && break
+    sleep 1
+done
 if [ $ret != 0 ]; then echo "I: failed"; fi
 status=`expr $status + $ret`
 
@@ -1074,9 +1098,13 @@ status=`expr $status + $ret`
 
 n=`expr $n + 1`
 echo "I: checking that subdomain.of.dom11.example is served by slave ($n)"
-ret=0
-$DIG soa subdomain.of.dom11.example @10.53.0.2 -p 5300 > dig.out.test$n
-grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+for try in 0 1 2 3 4 5 6 7 8 9; do
+    $DIG soa subdomain.of.dom11.example @10.53.0.2 -p 5300 > dig.out.test$n
+    ret=0
+    grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+    [ $ret -eq 0 ] && break
+    sleep 1
+done
 if [ $ret != 0 ]; then echo "I: failed"; fi
 status=`expr $status + $ret`
 
@@ -1246,9 +1274,13 @@ status=`expr $status + $ret`
 
 n=`expr $n + 1`
 echo "I: checking that dom12.example is served by slave ($n)"
-ret=0
-$DIG soa dom12.example @10.53.0.2 -p 5300 > dig.out.test$n
-grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+for try in 0 1 2 3 4 5 6 7 8 9; do
+    $DIG soa dom12.example @10.53.0.2 -p 5300 > dig.out.test$n
+    ret=0
+    grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+    [ $ret -eq 0 ] && break
+    sleep 1
+done
 if [ $ret != 0 ]; then echo "I: failed"; fi
 status=`expr $status + $ret`
 
@@ -1706,9 +1738,13 @@ sleep 3
 
 n=`expr $n + 1`
 echo "I: checking that dom15.example is served by slave($n)"
-ret=0
-$DIG soa dom15.example @10.53.0.2 -p 5300 > dig.out.test$n
-grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+for try in 0 1 2 3 4 5 6 7 8 9; do
+    $DIG soa dom15.example @10.53.0.2 -p 5300 > dig.out.test$n
+    ret=0
+    grep "status: NOERROR" dig.out.test$n > /dev/null || ret=1
+    [ $ret -eq 0 ] && break
+    sleep 1
+done
 if [ $ret != 0 ]; then echo "I: failed"; fi
 status=`expr $status + $ret`