BIND 10 master, updated. fc439d51f086be9351790fd731355eeb2d27fbb5 Merge branch 'trac3023'

[BIND 10 source code commits]

The branch, master has been updated
       via  fc439d51f086be9351790fd731355eeb2d27fbb5 (commit)
       via  81e8d71150056ee6c86a5a8aadbadb3ee6682f6a (commit)
      from  5f56f59e4beab346584b53e8e80973f39ced5cff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc439d51f086be9351790fd731355eeb2d27fbb5
Merge: 5f56f59 81e8d71
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Feb 7 11:12:14 2014 +0530

    Merge branch 'trac3023'

-----------------------------------------------------------------------

Summary of changes:
 tests/lettuce/configurations/.gitignore            |    1 +
 ...example.org.inmem.config => static.config.orig} |    9 -----
 .../testdata => tests/lettuce/data}/static.zone    |    0
 tests/lettuce/features/queries.feature             |   40 ++++++++++++++++++++
 tests/lettuce/features/terrain/terrain.py          |    2 +
 5 files changed, 43 insertions(+), 9 deletions(-)
 copy tests/lettuce/configurations/{example.org.inmem.config => static.config.orig} (77%)
 copy {src/lib/datasrc/tests/testdata => tests/lettuce/data}/static.zone (100%)

-----------------------------------------------------------------------
diff --git a/tests/lettuce/configurations/.gitignore b/tests/lettuce/configurations/.gitignore
index db54954..7514b3b 100644
--- a/tests/lettuce/configurations/.gitignore
+++ b/tests/lettuce/configurations/.gitignore
@@ -1,3 +1,4 @@
 /bindctl_commands.config
 /example.org.config
 /root.config
+/static.config
diff --git a/tests/lettuce/configurations/static.config.orig b/tests/lettuce/configurations/static.config.orig
new file mode 100644
index 0000000..3f20490
--- /dev/null
+++ b/tests/lettuce/configurations/static.config.orig
@@ -0,0 +1,36 @@
+{
+    "version": 3,
+    "Logging": {
+        "loggers": [{
+            "severity": "DEBUG",
+            "name": "*",
+            "debuglevel": 99
+        }]
+    },
+    "Auth": {
+        "listen_on": [{
+            "port": 56176,
+            "address": "127.0.0.1"
+        }]
+    },
+    "data_sources": {
+        "classes": {
+            "IN": [
+                {
+                    "type": "MasterFiles",
+                    "cache-enable": true,
+                    "params": {
+                        "example.org": "data/example.org"
+                    }
+                }
+            ]
+        }
+    },
+    "Init": {
+        "components": {
+            "b10-auth": { "kind": "needed", "special": "auth" },
+            "b10-stats": { "address": "Stats", "kind": "dispensable" },
+            "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }
+        }
+    }
+}
diff --git a/tests/lettuce/data/static.zone b/tests/lettuce/data/static.zone
new file mode 100644
index 0000000..51525db
--- /dev/null
+++ b/tests/lettuce/data/static.zone
@@ -0,0 +1,3 @@
+BIND.           3600    CH  SOA BIND. BIND. 3 3600 300 36000 3600
+BIND.           3600    CH  NS  BIND.
+VERSION.BIND.   3600    CH  TXT "10"
diff --git a/tests/lettuce/features/queries.feature b/tests/lettuce/features/queries.feature
index 8fcee7c..2404256 100644
--- a/tests/lettuce/features/queries.feature
+++ b/tests/lettuce/features/queries.feature
@@ -452,3 +452,43 @@ Feature: Querying feature
         A query for . type SOA should have rcode NOERROR
         A query for nonexistent. type A should have rcode NXDOMAIN
         Then wait for bind10 stderr message AUTH_SEND_NORMAL_RESPONSE not AUTH_PROCESS_FAIL
+
+    Scenario: CH class static zone query
+        # We are testing one more RR type for a normal successful case
+        Given I have bind10 running with configuration static.config
+        And wait for bind10 stderr message BIND10_STARTED_CC
+        And wait for bind10 stderr message CMDCTL_STARTED
+        And wait for bind10 stderr message AUTH_SERVER_STARTED
+
+        bind10 module Auth should be running
+        And bind10 module Stats should be running
+        And bind10 module Resolver should not be running
+        And bind10 module Xfrout should not be running
+        And bind10 module Zonemgr should not be running
+        And bind10 module Xfrin should not be running
+        And bind10 module StatsHttpd should not be running
+
+        A query for version.bind. type TXT class CH should have rcode REFUSED
+
+        When I send bind10 the following commands
+        """
+        config add data_sources/classes/CH
+        config set data_sources/classes/CH[0]/type MasterFiles
+        config set data_sources/classes/CH[0]/cache-enable true
+        config set data_sources/classes/CH[0]/params {"BIND": "data/static.zone"}
+        config commit
+        """
+
+        And wait for new bind10 stderr message AUTH_DATASRC_CLIENTS_BUILDER_RECONFIGURE_SUCCESS
+
+        A query for version.bind. type TXT class CH should have rcode NOERROR
+        The last query response should have ancount 1
+
+        # NOTE: The double double-quote characters trailing 10 in the
+        # response below are required due to a lettuce bug in reading
+        # multi-line strings with embedded double-quotes.
+
+        The answer section of the last query response should be
+        """
+        version.bind.      3600    CH      TXT   "10""
+        """
diff --git a/tests/lettuce/features/terrain/terrain.py b/tests/lettuce/features/terrain/terrain.py
index 66727bf..81bb98b 100644
--- a/tests/lettuce/features/terrain/terrain.py
+++ b/tests/lettuce/features/terrain/terrain.py
@@ -78,6 +78,8 @@ copylist = [
      "configurations/xfrin/retransfer_slave_notify.conf"],
     ["configurations/root.config.orig",
      "configurations/root.config"],
+    ["configurations/static.config.orig",
+     "configurations/static.config"],
     ["data/inmem-xfrin.sqlite3.orig",
      "data/inmem-xfrin.sqlite3"],
     ["data/root.sqlite3.orig",