[1976] Migrate the glue systest data sources

Also, the tests is slightly changed. The new data source acts
differently when searching for glue. It considers the current finder
only.

diff --git a/tests/system/glue/example.good b/tests/system/glue/example.good
index 3b7bbb816621a067624c12628425797e77478a83..b6d5708d8b659ede7d26dd592071e66cc0943083 100644 (file)
--- a/tests/system/glue/example.good
+++ b/tests/system/glue/example.good
@@ -15,5 +15,8 @@ example.                      172800  IN      NS      NS.example.
 ;; ADDITIONAL SECTION:
 NS.example.            172800  IN      A       192.0.2.1
 NS.example.            172800  IN      A       192.0.2.2
-NS1.example.COM.       172800  IN      A       192.0.2.101
-NS1.example.COM.               172800  IN      AAAA    2001:db8::1
+NS1.example.COM.       172800  IN      A       192.0.2.3
+;; These are not used now - they are in a different master file
+;; than the answer.
+; NS1.example.COM.     172800  IN      A       192.0.2.101
+; NS1.example.COM.             172800  IN      AAAA    2001:db8::1

diff --git a/tests/system/glue/nsx1/b10-config.db.in b/tests/system/glue/nsx1/b10-config.db.in
index 660183b788dbcf6e9d2d7fb88a24b3e1a0ddd7cb..5f93f3b58d869dafadd3464f60d88549474e5a15 100644 (file)
--- a/tests/system/glue/nsx1/b10-config.db.in
+++ b/tests/system/glue/nsx1/b10-config.db.in
@@ -3,6 +3,26 @@
    "listen_on": [{"address": "10.53.0.1", "port": 53210}],
    "database_file": "@abs_builddir@/zone.sqlite3"
  },
+ "data_sources": {
+    "classes": {
+        "IN": [{
+            "type": "sqlite3",
+            "params": {
+                "database_file": "@abs_builddir@/zone.sqlite3"
+            }
+        }]
+    }
+ },
+ "Logging": {
+     "loggers": [
+        {
+            "name": "*",
+            "severity": "DEBUG",
+            "output_options": [],
+            "debuglevel": 99
+        }
+     ]
+ },
  "Boss": {
    "components": {
      "b10-auth": {"kind": "needed", "special": "auth" },

diff --git a/tests/system/glue/nsx1/root.db b/tests/system/glue/nsx1/root.db
index e43f2d2567c9461d455011e4286e589d114bc05e..271a4d89660cada9a4085db5e35672d6c4d3919e 100644 (file)
--- a/tests/system/glue/nsx1/root.db
+++ b/tests/system/glue/nsx1/root.db
@@ -37,8 +37,6 @@ example.                      172800  IN      NS      NS.example.
 example.                       172800  IN      NS      NS1.example.COM.
 NS.example.                    172800  IN      A       192.0.2.1
 NS.example.                    172800  IN      A       192.0.2.2
-; this "glue" is below a zone cut for com.  BIND 9 still uses it for
-; the delegation to example.  BIND 10 (with sqlite3 data source) doesn't.
 NS1.example.COM.               172800  IN      A       192.0.2.3
 
 ;

diff --git a/tests/system/glue/tests.sh b/tests/system/glue/tests.sh
index 50b23308cc00a3cc6625dc132b7f05aa98a0000f..dafb1ad16b5571b5aa6f4a855494d6846804d89a 100755 (executable)
--- a/tests/system/glue/tests.sh
+++ b/tests/system/glue/tests.sh
@@ -38,10 +38,12 @@ $DIG +norec @10.53.0.1 -p 53210 foo.bar.example. A >dig.out.$n || status=1
 $PERL $DIGCOMP example.good dig.out.$n || status=1
 n=`expr $n + 1`
 
-echo "I:testing that we find glue A RRs we are authoritative for ($n)"
-$DIG +norec @10.53.0.1 -p 53210 foo.bar.example.org. a >dig.out.$n || status=1
-$PERL $DIGCOMP auth.good dig.out.$n || status=1
-n=`expr $n + 1`
+# Disabling this test, as it checks for looking up glue in a different zone
+# finder than the answer is from. This is not supported now.
+#echo "I:testing that we find glue A RRs we are authoritative for ($n)"
+#$DIG +norec @10.53.0.1 -p 53210 foo.bar.example.org. a >dig.out.$n || status=1
+#$PERL $DIGCOMP auth.good dig.out.$n || status=1
+#n=`expr $n + 1`
 
 # We cannot do this test for BIND 10 because b10-auth doesn't act as a
 # recursive (caching) server (by design)