Make the "inline" system test more lightweight

Each zone used in the "inline" system test contains a few dozen records.
Over a dozen of these zones are used in the test.  Most records present
in these zones are not subsequently used in the test itself, but all of
them need to be signed by the named instances launched by the test,
which puts quite a bit of strain on lower-end machines, leading to
intermittent failures of the "inline" system test.  Remove all redundant
records from the zones used in the "inline" system test in order to
stabilize it.

(cherry picked from commit 24dd865b974d1f06f7f85ef011f7621f83ab6d74)

diff --git a/bin/tests/system/inline/ns2/bits.db.in b/bin/tests/system/inline/ns2/bits.db.in
index 4b54877597398e0bb66657107274b1c4f8f2c66e..a86fe8f475ab5dedede6db35f8943df1790fd1bc 100644 (file)
--- a/bin/tests/system/inline/ns2/bits.db.in
+++ b/bin/tests/system/inline/ns2/bits.db.in
@@ -18,110 +18,3 @@ $TTL 300    ; 5 minutes
                        NS      ns3
 ns2                    A       10.53.0.2
 ns3                    A       10.53.0.3
-
-a                      A       10.0.0.1
-b                      A       10.0.0.2
-d                      A       10.0.0.4
-
-; Used for testing ANY queries
-foo                    TXT     "testing"
-foo                    A       10.0.1.0
-
-bad-cname              CNAME   a
-bad-dname              DNAME   @
-
-; Used for testing CNAME queries
-cname1                 CNAME   cname1-target
-cname1-target          TXT     "testing cname"
-
-cname2                 CNAME   cname2-target
-cname2-target          TXT     "testing cname"
-
-; Used for testing DNAME queries
-dname1                 DNAME   dname1-target
-foo.dname1-target      TXT     "testing dname"
-
-dname2                 DNAME   dname2-target
-foo.dname2-target      TXT     "testing dname"
-
-; A secure subdomain
-secure                 NS      ns.secure
-ns.secure              A       10.53.0.3
-
-; An insecure subdomain
-insecure               NS      ns.insecure
-ns.insecure            A       10.53.0.3
-
-; A secure subdomain we're going to inject bogus data into
-bogus                  NS      ns.bogus
-ns.bogus               A       10.53.0.3
-
-; A dynamic secure subdomain
-dynamic                        NS      dynamic
-dynamic                        A       10.53.0.3
-
-; A insecure subdomain
-mustbesecure           NS      ns.mustbesecure
-ns.mustbesecure                A       10.53.0.3
-
-; A rfc2535 signed zone w/ CNAME
-rfc2535                        NS      ns.rfc2535
-ns.rfc2535             A       10.53.0.3
-
-z                      A       10.0.0.26
-
-keyless                        NS      ns.keyless
-ns.keyless             A       10.53.0.3
-
-nsec3                  NS      ns.nsec3
-ns.nsec3               A       10.53.0.3
-
-optout                 NS      ns.optout
-ns.optout              A       10.53.0.3
-
-nsec3-unknown          NS      ns.nsec3-unknown
-ns.nsec3-unknown       A       10.53.0.3
-
-optout-unknown         NS      ns.optout-unknown
-ns.optout-unknown      A       10.53.0.3
-
-multiple               NS      ns.multiple
-ns.multiple            A       10.53.0.3
-
-*.wild                 A       10.0.0.27
-
-rsasha256              NS      ns.rsasha256
-ns.rsasha256           A       10.53.0.3
-
-rsasha512              NS      ns.rsasha512
-ns.rsasha512           A       10.53.0.3
-
-kskonly                NS      ns.kskonly
-ns.kskonly             A       10.53.0.3
-
-update-nsec3           NS      ns.update-nsec3
-ns.update-nsec3                A       10.53.0.3
-
-auto-nsec              NS      ns.auto-nsec
-ns.auto-nsec           A       10.53.0.3
-
-auto-nsec3             NS      ns.auto-nsec3
-ns.auto-nsec3          A       10.53.0.3
-
-
-below-cname            CNAME   some.where.else.
-
-insecure.below-cname   NS      ns.insecure.below-cname
-ns.insecure.below-cname        A       10.53.0.3
-
-secure.below-cname     NS      ns.secure.below-cname
-ns.secure.below-cname  A       10.53.0.3
-
-ttlpatch               NS      ns.ttlpatch
-ns.ttlpatch            A       10.53.0.3
-
-split-dnssec           NS      ns.split-dnssec
-ns.split-dnssec                A       10.53.0.3
-
-split-smart            NS      ns.split-smart
-ns.split-smart         A       10.53.0.3

diff --git a/bin/tests/system/inline/ns3/master.db.in b/bin/tests/system/inline/ns3/master.db.in
index 28af82a6b418389af8aa0e579d2d5e5d3d4c6869..67e1510de4351c009a306a67e8461a49259ffa00 100644 (file)
--- a/bin/tests/system/inline/ns3/master.db.in
+++ b/bin/tests/system/inline/ns3/master.db.in
@@ -16,112 +16,4 @@ $TTL 300    ; 5 minutes
                                3600       ; minimum (1 hour)
                                )
                        NS      ns3
-ns2                    A       10.53.0.2
 ns3                    A       10.53.0.3
-
-a                      A       10.0.0.1
-b                      A       10.0.0.2
-d                      A       10.0.0.4
-
-; Used for testing ANY queries
-foo                    TXT     "testing"
-foo                    A       10.0.1.0
-
-bad-cname              CNAME   a
-bad-dname              DNAME   @
-
-; Used for testing CNAME queries
-cname1                 CNAME   cname1-target
-cname1-target          TXT     "testing cname"
-
-cname2                 CNAME   cname2-target
-cname2-target          TXT     "testing cname"
-
-; Used for testing DNAME queries
-dname1                 DNAME   dname1-target
-foo.dname1-target      TXT     "testing dname"
-
-dname2                 DNAME   dname2-target
-foo.dname2-target      TXT     "testing dname"
-
-; A secure subdomain
-secure                 NS      ns.secure
-ns.secure              A       10.53.0.3
-
-; An insecure subdomain
-insecure               NS      ns.insecure
-ns.insecure            A       10.53.0.3
-
-; A secure subdomain we're going to inject bogus data into
-bogus                  NS      ns.bogus
-ns.bogus               A       10.53.0.3
-
-; A dynamic secure subdomain
-dynamic                        NS      dynamic
-dynamic                        A       10.53.0.3
-
-; A insecure subdomain
-mustbesecure           NS      ns.mustbesecure
-ns.mustbesecure                A       10.53.0.3
-
-; A rfc2535 signed zone w/ CNAME
-rfc2535                        NS      ns.rfc2535
-ns.rfc2535             A       10.53.0.3
-
-z                      A       10.0.0.26
-
-keyless                        NS      ns.keyless
-ns.keyless             A       10.53.0.3
-
-nsec3                  NS      ns.nsec3
-ns.nsec3               A       10.53.0.3
-
-optout                 NS      ns.optout
-ns.optout              A       10.53.0.3
-
-nsec3-unknown          NS      ns.nsec3-unknown
-ns.nsec3-unknown       A       10.53.0.3
-
-optout-unknown         NS      ns.optout-unknown
-ns.optout-unknown      A       10.53.0.3
-
-multiple               NS      ns.multiple
-ns.multiple            A       10.53.0.3
-
-*.wild                 A       10.0.0.27
-
-rsasha256              NS      ns.rsasha256
-ns.rsasha256           A       10.53.0.3
-
-rsasha512              NS      ns.rsasha512
-ns.rsasha512           A       10.53.0.3
-
-kskonly                NS      ns.kskonly
-ns.kskonly             A       10.53.0.3
-
-update-nsec3           NS      ns.update-nsec3
-ns.update-nsec3                A       10.53.0.3
-
-auto-nsec              NS      ns.auto-nsec
-ns.auto-nsec           A       10.53.0.3
-
-auto-nsec3             NS      ns.auto-nsec3
-ns.auto-nsec3          A       10.53.0.3
-
-
-below-cname            CNAME   some.where.else.
-
-insecure.below-cname   NS      ns.insecure.below-cname
-ns.insecure.below-cname        A       10.53.0.3
-
-secure.below-cname     NS      ns.secure.below-cname
-ns.secure.below-cname  A       10.53.0.3
-
-ttlpatch               NS      ns.ttlpatch
-ns.ttlpatch            A       10.53.0.3
-
-split-dnssec           NS      ns.split-dnssec
-ns.split-dnssec                A       10.53.0.3
-
-split-smart            NS      ns.split-smart
-ns.split-smart         A       10.53.0.3

diff --git a/bin/tests/system/inline/ns3/master2.db.in b/bin/tests/system/inline/ns3/master2.db.in
index 0352d01c77c432f83896741c6a3030b00d779b28..1bbeb9d944ff1336bb6a6ca5e9167e92f5ad0f15 100644 (file)
--- a/bin/tests/system/inline/ns3/master2.db.in
+++ b/bin/tests/system/inline/ns3/master2.db.in
@@ -16,113 +16,6 @@ $TTL 300    ; 5 minutes
                                3600       ; minimum (1 hour)
                                )
                        NS      ns3
-ns2                    A       10.53.0.2
 ns3                    A       10.53.0.3
 
-a                      A       10.0.0.1
-b                      A       10.0.0.2
-d                      A       10.0.0.4
 e                      A       10.0.0.5
-
-; Used for testing ANY queries
-foo                    TXT     "testing"
-foo                    A       10.0.1.0
-
-bad-cname              CNAME   a
-bad-dname              DNAME   @
-
-; Used for testing CNAME queries
-cname1                 CNAME   cname1-target
-cname1-target          TXT     "testing cname"
-
-cname2                 CNAME   cname2-target
-cname2-target          TXT     "testing cname"
-
-; Used for testing DNAME queries
-dname1                 DNAME   dname1-target
-foo.dname1-target      TXT     "testing dname"
-
-dname2                 DNAME   dname2-target
-foo.dname2-target      TXT     "testing dname"
-
-; A secure subdomain
-secure                 NS      ns.secure
-ns.secure              A       10.53.0.3
-
-; An insecure subdomain
-insecure               NS      ns.insecure
-ns.insecure            A       10.53.0.3
-
-; A secure subdomain we're going to inject bogus data into
-bogus                  NS      ns.bogus
-ns.bogus               A       10.53.0.3
-
-; A dynamic secure subdomain
-dynamic                        NS      dynamic
-dynamic                        A       10.53.0.3
-
-; A insecure subdomain
-mustbesecure           NS      ns.mustbesecure
-ns.mustbesecure                A       10.53.0.3
-
-; A rfc2535 signed zone w/ CNAME
-rfc2535                        NS      ns.rfc2535
-ns.rfc2535             A       10.53.0.3
-
-z                      A       10.0.0.26
-
-keyless                        NS      ns.keyless
-ns.keyless             A       10.53.0.3
-
-nsec3                  NS      ns.nsec3
-ns.nsec3               A       10.53.0.3
-
-optout                 NS      ns.optout
-ns.optout              A       10.53.0.3
-
-nsec3-unknown          NS      ns.nsec3-unknown
-ns.nsec3-unknown       A       10.53.0.3
-
-optout-unknown         NS      ns.optout-unknown
-ns.optout-unknown      A       10.53.0.3
-
-multiple               NS      ns.multiple
-ns.multiple            A       10.53.0.3
-
-*.wild                 A       10.0.0.27
-
-rsasha256              NS      ns.rsasha256
-ns.rsasha256           A       10.53.0.3
-
-rsasha512              NS      ns.rsasha512
-ns.rsasha512           A       10.53.0.3
-
-kskonly                NS      ns.kskonly
-ns.kskonly             A       10.53.0.3
-
-update-nsec3           NS      ns.update-nsec3
-ns.update-nsec3                A       10.53.0.3
-
-auto-nsec              NS      ns.auto-nsec
-ns.auto-nsec           A       10.53.0.3
-
-auto-nsec3             NS      ns.auto-nsec3
-ns.auto-nsec3          A       10.53.0.3
-
-
-below-cname            CNAME   some.where.else.
-
-insecure.below-cname   NS      ns.insecure.below-cname
-ns.insecure.below-cname        A       10.53.0.3
-
-secure.below-cname     NS      ns.secure.below-cname
-ns.secure.below-cname  A       10.53.0.3
-
-ttlpatch               NS      ns.ttlpatch
-ns.ttlpatch            A       10.53.0.3
-
-split-dnssec           NS      ns.split-dnssec
-ns.split-dnssec                A       10.53.0.3
-
-split-smart            NS      ns.split-smart
-ns.split-smart         A       10.53.0.3

diff --git a/bin/tests/system/inline/ns3/master3.db.in b/bin/tests/system/inline/ns3/master3.db.in
index b0011354449b34179317d85ba6b9fbf6d09d046c..f78a950bfd0cd31348a9e29f33cd1db3d58beec3 100644 (file)
--- a/bin/tests/system/inline/ns3/master3.db.in
+++ b/bin/tests/system/inline/ns3/master3.db.in
@@ -16,114 +16,7 @@ $TTL 300    ; 5 minutes
                                3600       ; minimum (1 hour)
                                )
                        NS      ns3
-ns2                    A       10.53.0.2
 ns3                    A       10.53.0.3
 
-a                      A       10.0.0.1
-b                      A       10.0.0.2
 c                      A       10.0.0.3
-d                      A       10.0.0.4
 e                      A       10.0.0.5
-
-; Used for testing ANY queries
-foo                    TXT     "testing"
-foo                    A       10.0.1.0
-
-bad-cname              CNAME   a
-bad-dname              DNAME   @
-
-; Used for testing CNAME queries
-cname1                 CNAME   cname1-target
-cname1-target          TXT     "testing cname"
-
-cname2                 CNAME   cname2-target
-cname2-target          TXT     "testing cname"
-
-; Used for testing DNAME queries
-dname1                 DNAME   dname1-target
-foo.dname1-target      TXT     "testing dname"
-
-dname2                 DNAME   dname2-target
-foo.dname2-target      TXT     "testing dname"
-
-; A secure subdomain
-secure                 NS      ns.secure
-ns.secure              A       10.53.0.3
-
-; An insecure subdomain
-insecure               NS      ns.insecure
-ns.insecure            A       10.53.0.3
-
-; A secure subdomain we're going to inject bogus data into
-bogus                  NS      ns.bogus
-ns.bogus               A       10.53.0.3
-
-; A dynamic secure subdomain
-dynamic                        NS      dynamic
-dynamic                        A       10.53.0.3
-
-; A insecure subdomain
-mustbesecure           NS      ns.mustbesecure
-ns.mustbesecure                A       10.53.0.3
-
-; A rfc2535 signed zone w/ CNAME
-rfc2535                        NS      ns.rfc2535
-ns.rfc2535             A       10.53.0.3
-
-z                      A       10.0.0.26
-
-keyless                        NS      ns.keyless
-ns.keyless             A       10.53.0.3
-
-nsec3                  NS      ns.nsec3
-ns.nsec3               A       10.53.0.3
-
-optout                 NS      ns.optout
-ns.optout              A       10.53.0.3
-
-nsec3-unknown          NS      ns.nsec3-unknown
-ns.nsec3-unknown       A       10.53.0.3
-
-optout-unknown         NS      ns.optout-unknown
-ns.optout-unknown      A       10.53.0.3
-
-multiple               NS      ns.multiple
-ns.multiple            A       10.53.0.3
-
-*.wild                 A       10.0.0.27
-
-rsasha256              NS      ns.rsasha256
-ns.rsasha256           A       10.53.0.3
-
-rsasha512              NS      ns.rsasha512
-ns.rsasha512           A       10.53.0.3
-
-kskonly                NS      ns.kskonly
-ns.kskonly             A       10.53.0.3
-
-update-nsec3           NS      ns.update-nsec3
-ns.update-nsec3                A       10.53.0.3
-
-auto-nsec              NS      ns.auto-nsec
-ns.auto-nsec           A       10.53.0.3
-
-auto-nsec3             NS      ns.auto-nsec3
-ns.auto-nsec3          A       10.53.0.3
-
-
-below-cname            CNAME   some.where.else.
-
-insecure.below-cname   NS      ns.insecure.below-cname
-ns.insecure.below-cname        A       10.53.0.3
-
-secure.below-cname     NS      ns.secure.below-cname
-ns.secure.below-cname  A       10.53.0.3
-
-ttlpatch               NS      ns.ttlpatch
-ns.ttlpatch            A       10.53.0.3
-
-split-dnssec           NS      ns.split-dnssec
-ns.split-dnssec                A       10.53.0.3
-
-split-smart            NS      ns.split-smart
-ns.split-smart         A       10.53.0.3

diff --git a/bin/tests/system/inline/ns3/master4.db.in b/bin/tests/system/inline/ns3/master4.db.in
index 209ee341a71e07760387dba041ac8e221406bf11..0dc04a9d81e669fc09525226f1ac5dc1cca4b1bb 100644 (file)
--- a/bin/tests/system/inline/ns3/master4.db.in
+++ b/bin/tests/system/inline/ns3/master4.db.in
@@ -16,114 +16,7 @@ $TTL 300    ; 5 minutes
                                3600       ; minimum (1 hour)
                                )
                        NS      ns3
-ns2                    A       10.53.0.2
 ns3                    A       10.53.0.3
 
-a                      A       10.0.0.1
-b                      A       10.0.0.2
 c                      A       10.0.0.3
-d                      A       10.0.0.4
 e                      A       10.0.0.5
-
-; Used for testing ANY queries
-foo                    TXT     "testing"
-foo                    A       10.0.1.0
-
-bad-cname              CNAME   a
-bad-dname              DNAME   @
-
-; Used for testing CNAME queries
-cname1                 CNAME   cname1-target
-cname1-target          TXT     "testing cname"
-
-cname2                 CNAME   cname2-target
-cname2-target          TXT     "testing cname"
-
-; Used for testing DNAME queries
-dname1                 DNAME   dname1-target
-foo.dname1-target      TXT     "testing dname"
-
-dname2                 DNAME   dname2-target
-foo.dname2-target      TXT     "testing dname"
-
-; A secure subdomain
-secure                 NS      ns.secure
-ns.secure              A       10.53.0.3
-
-; An insecure subdomain
-insecure               NS      ns.insecure
-ns.insecure            A       10.53.0.3
-
-; A secure subdomain we're going to inject bogus data into
-bogus                  NS      ns.bogus
-ns.bogus               A       10.53.0.3
-
-; A dynamic secure subdomain
-dynamic                        NS      dynamic
-dynamic                        A       10.53.0.3
-
-; A insecure subdomain
-mustbesecure           NS      ns.mustbesecure
-ns.mustbesecure                A       10.53.0.3
-
-; A rfc2535 signed zone w/ CNAME
-rfc2535                        NS      ns.rfc2535
-ns.rfc2535             A       10.53.0.3
-
-z                      A       10.0.0.26
-
-keyless                        NS      ns.keyless
-ns.keyless             A       10.53.0.3
-
-nsec3                  NS      ns.nsec3
-ns.nsec3               A       10.53.0.3
-
-optout                 NS      ns.optout
-ns.optout              A       10.53.0.3
-
-nsec3-unknown          NS      ns.nsec3-unknown
-ns.nsec3-unknown       A       10.53.0.3
-
-optout-unknown         NS      ns.optout-unknown
-ns.optout-unknown      A       10.53.0.3
-
-multiple               NS      ns.multiple
-ns.multiple            A       10.53.0.3
-
-*.wild                 A       10.0.0.27
-
-rsasha256              NS      ns.rsasha256
-ns.rsasha256           A       10.53.0.3
-
-rsasha512              NS      ns.rsasha512
-ns.rsasha512           A       10.53.0.3
-
-kskonly                NS      ns.kskonly
-ns.kskonly             A       10.53.0.3
-
-update-nsec3           NS      ns.update-nsec3
-ns.update-nsec3                A       10.53.0.3
-
-auto-nsec              NS      ns.auto-nsec
-ns.auto-nsec           A       10.53.0.3
-
-auto-nsec3             NS      ns.auto-nsec3
-ns.auto-nsec3          A       10.53.0.3
-
-
-below-cname            CNAME   some.where.else.
-
-insecure.below-cname   NS      ns.insecure.below-cname
-ns.insecure.below-cname        A       10.53.0.3
-
-secure.below-cname     NS      ns.secure.below-cname
-ns.secure.below-cname  A       10.53.0.3
-
-ttlpatch               NS      ns.ttlpatch
-ns.ttlpatch            A       10.53.0.3
-
-split-dnssec           NS      ns.split-dnssec
-ns.split-dnssec                A       10.53.0.3
-
-split-smart            NS      ns.split-smart
-ns.split-smart         A       10.53.0.3

diff --git a/bin/tests/system/inline/ns4/noixfr.db.in b/bin/tests/system/inline/ns4/noixfr.db.in
index 6dbc7d51fbb169f20a8c2a29979d3f8823e11d86..c4750ca16e6734849704381bab4505efa96b0d73 100644 (file)
--- a/bin/tests/system/inline/ns4/noixfr.db.in
+++ b/bin/tests/system/inline/ns4/noixfr.db.in
@@ -18,110 +18,3 @@ $TTL 300    ; 5 minutes
                        NS      ns3
 ns4                    A       10.53.0.4
 ns3                    A       10.53.0.3
-
-a                      A       10.0.0.1
-b                      A       10.0.0.2
-d                      A       10.0.0.4
-
-; Used for testing ANY queries
-foo                    TXT     "testing"
-foo                    A       10.0.1.0
-
-bad-cname              CNAME   a
-bad-dname              DNAME   @
-
-; Used for testing CNAME queries
-cname1                 CNAME   cname1-target
-cname1-target          TXT     "testing cname"
-
-cname2                 CNAME   cname2-target
-cname2-target          TXT     "testing cname"
-
-; Used for testing DNAME queries
-dname1                 DNAME   dname1-target
-foo.dname1-target      TXT     "testing dname"
-
-dname2                 DNAME   dname2-target
-foo.dname2-target      TXT     "testing dname"
-
-; A secure subdomain
-secure                 NS      ns.secure
-ns.secure              A       10.53.0.3
-
-; An insecure subdomain
-insecure               NS      ns.insecure
-ns.insecure            A       10.53.0.3
-
-; A secure subdomain we're going to inject bogus data into
-bogus                  NS      ns.bogus
-ns.bogus               A       10.53.0.3
-
-; A dynamic secure subdomain
-dynamic                        NS      dynamic
-dynamic                        A       10.53.0.3
-
-; A insecure subdomain
-mustbesecure           NS      ns.mustbesecure
-ns.mustbesecure                A       10.53.0.3
-
-; A rfc2535 signed zone w/ CNAME
-rfc2535                        NS      ns.rfc2535
-ns.rfc2535             A       10.53.0.3
-
-z                      A       10.0.0.26
-
-keyless                        NS      ns.keyless
-ns.keyless             A       10.53.0.3
-
-nsec3                  NS      ns.nsec3
-ns.nsec3               A       10.53.0.3
-
-optout                 NS      ns.optout
-ns.optout              A       10.53.0.3
-
-nsec3-unknown          NS      ns.nsec3-unknown
-ns.nsec3-unknown       A       10.53.0.3
-
-optout-unknown         NS      ns.optout-unknown
-ns.optout-unknown      A       10.53.0.3
-
-multiple               NS      ns.multiple
-ns.multiple            A       10.53.0.3
-
-*.wild                 A       10.0.0.27
-
-rsasha256              NS      ns.rsasha256
-ns.rsasha256           A       10.53.0.3
-
-rsasha512              NS      ns.rsasha512
-ns.rsasha512           A       10.53.0.3
-
-kskonly                NS      ns.kskonly
-ns.kskonly             A       10.53.0.3
-
-update-nsec3           NS      ns.update-nsec3
-ns.update-nsec3                A       10.53.0.3
-
-auto-nsec              NS      ns.auto-nsec
-ns.auto-nsec           A       10.53.0.3
-
-auto-nsec3             NS      ns.auto-nsec3
-ns.auto-nsec3          A       10.53.0.3
-
-
-below-cname            CNAME   some.where.else.
-
-insecure.below-cname   NS      ns.insecure.below-cname
-ns.insecure.below-cname        A       10.53.0.3
-
-secure.below-cname     NS      ns.secure.below-cname
-ns.secure.below-cname  A       10.53.0.3
-
-ttlpatch               NS      ns.ttlpatch
-ns.ttlpatch            A       10.53.0.3
-
-split-dnssec           NS      ns.split-dnssec
-ns.split-dnssec                A       10.53.0.3
-
-split-smart            NS      ns.split-smart
-ns.split-smart         A       10.53.0.3