From: Jelte Jansen <jelte@isc.org>
Date: Thu, 19 Jan 2012 14:21:37 +0000 (+0100)
Subject: [1553] Added resolver_basic feature test
X-Git-Tag: trac2351_base~275^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf8e3900e4fa31a7bb2b2e917f3b5e032e9a28f3;p=thirdparty%2Fkea.git

[1553] Added resolver_basic feature test
---

diff --git a/tests/lettuce/configurations/resolver/resolver_basic.config b/tests/lettuce/configurations/resolver/resolver_basic.config
new file mode 100644
index 0000000000..a1f8afcbc1
--- /dev/null
+++ b/tests/lettuce/configurations/resolver/resolver_basic.config
@@ -0,0 +1 @@
+{"version": 2, "Resolver": {"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 0000000000..df688dd4bf
--- /dev/null
+++ b/tests/lettuce/features/resolver_basic.feature
@@ -0,0 +1,16 @@
+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
+        # This answer is currently hardcoded (as part of the fake priming)
+        A query for l.root-servers.net. should have rcode NOERROR
diff --git a/tests/lettuce/features/terrain/querying.py b/tests/lettuce/features/terrain/querying.py
index b1325121ec..51c158e66c 100644
--- a/tests/lettuce/features/terrain/querying.py
+++ b/tests/lettuce/features/terrain/querying.py
@@ -179,7 +179,7 @@ class QueryResult(object):
         """
         pass
 
-@step('A query for ([\w.]+) (?:type ([A-Z0-9]+) )?(?:class ([A-Z]+) )?' +
+@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):
     """