3050. [bug] The autosign system test was timing dependent.

                        Wait for the initial autosigning to complete
                        before running the rest of the test. [RT #23035]

diff --git a/CHANGES b/CHANGES
index b9702e95e6f3278cd778e9d4f4debad07356ef6c..d557370b5f9f79558d4c3f19096c97edc08123f5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3050.  [bug]           The autosign system test was timing dependent.
+                       Wait for the initial autosigning to complete
+                       before running the rest of the test. [RT #23035]
+
 3049.  [bug]           Save and restore the gid when creating creating
                        named.pid at startup. [RT #23290]
 

diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index 02d5a88cd7cfc694dc5acf078c9d4afe7a2565f2..8361d3b7cb744d1c672955c789e1dbe1d238a1c5 100644 (file)
--- 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.12.18.1 2011/03/02 04:11:28 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -37,14 +37,24 @@ i=0
 while [ $i -lt 30 ]
 do
        ret=0
-       for z in bar example private.secure.example
+       #
+       # Wait for the root DNSKEY RRset to be fully signed.
+       #
+       $DIG $DIGOPTS . @10.53.0.1 dnskey > dig.out.ns1.test$n || ret=1
+       grep "ANSWER: 10," dig.out.ns1.test$n > /dev/null || ret=1
+       for z in .
        do
-               $DIG $DIGOPTS $z. @10.53.0.2 nsec > dig.out.ns2.test$n || ret=1
+               $DIG $DIGOPTS $z @10.53.0.1 nsec > dig.out.ns1.test$n || ret=1
+               grep "NS SOA" dig.out.ns1.test$n > /dev/null || ret=1
+       done
+       for z in bar. example. private.secure.example.
+       do
+               $DIG $DIGOPTS $z @10.53.0.2 nsec > dig.out.ns2.test$n || ret=1
                grep "NS SOA" dig.out.ns2.test$n > /dev/null || ret=1
        done
-       for z in bar example
+       for z in bar. example.
        do 
-               $DIG $DIGOPTS $z. @10.53.0.3 nsec > dig.out.ns3.test$n || ret=1
+               $DIG $DIGOPTS $z @10.53.0.3 nsec > dig.out.ns3.test$n || ret=1
                grep "NS SOA" dig.out.ns3.test$n > /dev/null || ret=1
        done
        i=`expr $i + 1`