BIND 10 master, updated. 0457ee07936085e0b0843fa645b9873a01e60b8b [1553] Merge branch 'trac1553' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1553

[BIND 10 source code commits]

The branch, master has been updated
       via  0457ee07936085e0b0843fa645b9873a01e60b8b (commit)
       via  6579042087fdc53e1c6b7fa929449bed3e22637c (commit)
       via  42b606583daa7b0c5702cebf9e45ee8138793cf0 (commit)
       via  cf8e3900e4fa31a7bb2b2e917f3b5e032e9a28f3 (commit)
      from  079133e3457fc2b6864f977d2970b5dfccad19e5 (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 0457ee07936085e0b0843fa645b9873a01e60b8b
Merge: 6579042087fdc53e1c6b7fa929449bed3e22637c 42b606583daa7b0c5702cebf9e45ee8138793cf0
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Jan 20 10:56:48 2012 +0100

    [1553] Merge branch 'trac1553' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1553

commit 6579042087fdc53e1c6b7fa929449bed3e22637c
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Jan 20 10:56:18 2012 +0100

    [1553] test basic ACL for resolver as well

commit 42b606583daa7b0c5702cebf9e45ee8138793cf0
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Jan 19 10:34:39 2012 -0800

    [1553] editorial cleanup: removed white spaces in a blank line.

commit cf8e3900e4fa31a7bb2b2e917f3b5e032e9a28f3
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Jan 19 15:21:37 2012 +0100

    [1553] Added resolver_basic feature test

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

Summary of changes:
 .../resolver/resolver_basic.config.orig            |    1 +
 tests/lettuce/features/resolver_basic.feature      |   26 ++++++++++++++++++++
 tests/lettuce/features/terrain/querying.py         |    2 +-
 tests/lettuce/features/terrain/terrain.py          |    5 +++-
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 tests/lettuce/configurations/resolver/resolver_basic.config.orig
 create mode 100644 tests/lettuce/features/resolver_basic.feature

-----------------------------------------------------------------------
diff --git a/tests/lettuce/configurations/resolver/resolver_basic.config.orig b/tests/lettuce/configurations/resolver/resolver_basic.config.orig
new file mode 100644
index 0000000..5664c20
--- /dev/null
+++ b/tests/lettuce/configurations/resolver/resolver_basic.config.orig
@@ -0,0 +1 @@
+{"version": 2, "Resolver": {"query_acl": [{"action": "REJECT", "from": "127.0.0.1"}], "listen_on": [{"port": 47806, "address": "127.0.0.1"}]}, "Boss": {"components": {"b10-resolver": {"kind": "needed"}, "b10-cmdctl": {"kind": "needed", "special": "cmdctl"}}}}
diff --git a/tests/lettuce/features/resolver_basic.feature b/tests/lettuce/features/resolver_basic.feature
new file mode 100644
index 0000000..c759971
--- /dev/null
+++ b/tests/lettuce/features/resolver_basic.feature
@@ -0,0 +1,26 @@
+Feature: Basic Resolver
+    This feature set is just testing the execution of the b10-resolver
+    module. It sees whether it starts up, takes configuration, and
+    answers queries.
+
+    Scenario: Listen for and answer query
+        # This scenario starts a server that runs a real resolver.
+        # In order not to send out queries into the wild, we only
+        # query for something known to be hardcoded at this moment.
+        # NOTE: once real priming has been implemented, this test needs
+        # to be revised (as it would then leak, which is probably true
+        # for any resolver system test)
+        When I start bind10 with configuration resolver/resolver_basic.config
+        And wait for new bind10 stderr message RESOLVER_STARTED
+
+        # The ACL is set to reject any queries
+        A query for l.root-servers.net. should have rcode REFUSED
+
+        # Test whether acl ACCEPT works
+        When I set bind10 configuration Resolver/query_acl[0]/action to ACCEPT
+        # This address is currently hardcoded, so shouldn't cause outside traffic
+        A query for l.root-servers.net. should have rcode NOERROR
+
+        # Check whether setting the ACL to reject again works
+        When I set bind10 configuration Resolver/query_acl[0]/action to REJECT
+        A query for l.root-servers.net. should have rcode REFUSED
diff --git a/tests/lettuce/features/terrain/querying.py b/tests/lettuce/features/terrain/querying.py
index b132512..51c158e 100644
--- a/tests/lettuce/features/terrain/querying.py
+++ b/tests/lettuce/features/terrain/querying.py
@@ -179,7 +179,7 @@ class QueryResult(object):
         """
         pass
 
- at step('A query for ([\w.]+) (?:type ([A-Z0-9]+) )?(?:class ([A-Z]+) )?' +
+ at step('A query for ([\w.-]+) (?:type ([A-Z0-9]+) )?(?:class ([A-Z]+) )?' +
       '(?:to ([^:]+)(?::([0-9]+))? )?should have rcode ([\w.]+)')
 def query(step, query_name, qtype, qclass, addr, port, rcode):
     """
diff --git a/tests/lettuce/features/terrain/terrain.py b/tests/lettuce/features/terrain/terrain.py
index d2ac03f..90531a1 100644
--- a/tests/lettuce/features/terrain/terrain.py
+++ b/tests/lettuce/features/terrain/terrain.py
@@ -42,7 +42,10 @@ import time
 # The first element is the original, the second is the target that will be
 # used by the tests that need them
 copylist = [
-["configurations/example.org.config.orig", "configurations/example.org.config"]
+    ["configurations/example.org.config.orig",
+     "configurations/example.org.config"],
+    ["configurations/resolver/resolver_basic.config.orig",
+     "configurations/resolver/resolver_basic.config"]
 ]
 
 # This is a list of files that, if present, will be removed before a scenario