3051. [bug] NS records obsure DS records at the bottom of the

                        zone if both are present. [RT #23035]

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index e5dfa8e6b690b7f4e1f105609eb2369b871f35ce..90f1c131a59972fa4936f4e747eb417be1e91b63 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: conf.sh.in,v 1.59.8.2 2011/03/01 23:15:17 marka Exp $
+# $Id: conf.sh.in,v 1.59.8.3 2011/03/02 04:47:11 marka Exp $
 
 #
 # Common configuration data for system tests, to be sourced into
@@ -53,9 +53,9 @@ JOURNALPRINT=$TOP/bin/tools/named-journalprint
 # load on the machine to make it unusable to other users.
 # v6synth
 SUBDIRS="acl allow_query addzone autosign cacheclean checkconf checknames
-        database dlv dlvauto @DLZ_SYSTEM_TEST@ dlzexternal dns64 dnssec
-        forward glue gost ixfr limits lwresd masterfile masterformat metadata
-        notify nsupdate pending pkcs11 resolver rpz rrsetorder
+        checkzone database dlv dlvauto @DLZ_SYSTEM_TEST@ dlzexternal dns64
+        dnssec forward glue gost ixfr limits lwresd masterfile masterformat
+        metadata notify nsupdate pending pkcs11 resolver rpz rrsetorder
         sortlist smartsign staticstub stub tkey tsig tsiggss
         unknown upforwd views xfer xferquota zonechecks"
 

diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl
index a17505012a007873d29d807baa09c5da090a2363..ea7e907a8f71a4040f50c3a70f1408796dd1adb1 100644 (file)
--- 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.18.70.1 2011/03/02 04:47:11 marka 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);
 }