From: Francis Dupont <fdupont@isc.org>
Date: Mon, 28 Feb 2011 14:08:36 +0000 (+0000)
Subject: ove the testsock.pl sleep to autosign test suite [RT #23400]
X-Git-Tag: v9.9.0a1~673
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=17bc56e321574b43c5837d1741e9157c8f2fcd91;p=thirdparty%2Fbind9.git

ove the testsock.pl sleep to autosign test suite [RT #23400]
---

diff --git a/CHANGES b/CHANGES
index dbc18a037a8..9ba990fb84c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3045.	[test]		Move the testsock.pl sleep to autosign test suite.
+			[RT #23400]
+
 3044.	[bug]		Hold the socket manager lock while freeing the socket.
 			[RT #23333]
 
diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index 02d5a88cd7c..a4d8bc6ec3c 100644
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.12 2010/12/15 18:44:37 each Exp $
+# $Id: tests.sh,v 1.13 2011/02/28 14:08:36 fdupont Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -26,6 +26,10 @@ n=0
 
 DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p 5300"
 
+# wait a bit before testing changes
+# (was in testsock.pl (trailing sleep(1)), to be tuned from robie feedback)
+sleep 5
+
 #
 #  The NSEC record at the apex of the zone and its RRSIG records are
 #  added as part of the last step in signing a zone.  We wait for the
diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl
index a17505012a0..0c7fb008f12 100644
--- a/bin/tests/system/testsock.pl
+++ b/bin/tests/system/testsock.pl
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: testsock.pl,v 1.18 2010/08/17 23:46:46 tbox Exp $
+# $Id: testsock.pl,v 1.19 2011/02/28 14:08:36 fdupont Exp $
 
 # Test whether the interfaces on 10.53.0.* are up.
 
@@ -47,5 +47,4 @@ foreach $id (@ids) {
 	    	or die sprintf("$0: bind(%s, %d): $!\n",
 			       inet_ntoa($addr), $port);
 	close(SOCK);
-	sleep(1);
 }