BIND 10 master, updated. 34da803fd804c6c0fa7acb90ff46780df69d5898 [master] Merge branch 'trac1772'

[BIND 10 source code commits]

The branch, master has been updated
       via  34da803fd804c6c0fa7acb90ff46780df69d5898 (commit)
       via  91abb7aed95fb3cf15d25a971af2fa0b952e9570 (commit)
       via  e3f4b290d17a68db728166cdffcbe93517966e8b (commit)
       via  7d2867d02fc20295ae0622c987a25e3119d3ca7f (commit)
      from  6db3556488ae8a75f5250a175f3507cc609ada19 (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 34da803fd804c6c0fa7acb90ff46780df69d5898
Merge: 6db3556 91abb7a
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Mar 28 14:00:03 2012 -0700

    [master] Merge branch 'trac1772'

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

Summary of changes:
 tests/lettuce/configurations/example2.org.config   |    2 +-
 .../configurations/xfrin/retransfer_master.conf    |    2 +-
 tests/lettuce/features/example.feature             |    4 ++--
 tests/lettuce/features/terrain/querying.py         |    3 ++-
 tests/lettuce/features/xfrin_bind10.feature        |    2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/lettuce/configurations/example2.org.config b/tests/lettuce/configurations/example2.org.config
index 1a40d1b..a6afb5b 100644
--- a/tests/lettuce/configurations/example2.org.config
+++ b/tests/lettuce/configurations/example2.org.config
@@ -12,7 +12,7 @@
         "database_file": "data/example.org.sqlite3",
         "listen_on": [ {
             "port": 47807,
-            "address": "127.0.0.1"
+            "address": "::1"
         } ]
     }
 }
diff --git a/tests/lettuce/configurations/xfrin/retransfer_master.conf b/tests/lettuce/configurations/xfrin/retransfer_master.conf
index 95cd88e..a9d5440 100644
--- a/tests/lettuce/configurations/xfrin/retransfer_master.conf
+++ b/tests/lettuce/configurations/xfrin/retransfer_master.conf
@@ -11,7 +11,7 @@
         "database_file": "data/example.org.sqlite3",
         "listen_on": [ {
             "port": 47807,
-            "address": "127.0.0.1"
+            "address": "::1"
         } ]
     },
     "Xfrout": {
diff --git a/tests/lettuce/features/example.feature b/tests/lettuce/features/example.feature
index d1ed6b3..ee388f1 100644
--- a/tests/lettuce/features/example.feature
+++ b/tests/lettuce/features/example.feature
@@ -133,10 +133,10 @@ Feature: Example feature
         Then wait for bind10 auth of bind10_one to start
         Then wait for bind10 auth of bind10_two to start
         A query for www.example.org to 127.0.0.1:47806 should have rcode NOERROR
-        A query for www.example.org to 127.0.0.1:47807 should have rcode NOERROR
+        A query for www.example.org to [::1]:47807 should have rcode NOERROR
 
         Then set bind10 configuration Auth/database_file to data/empty_db.sqlite3
         And wait for bind10_one stderr message DATASRC_SQLITE_OPEN
 
         A query for www.example.org to 127.0.0.1:47806 should have rcode REFUSED
-        A query for www.example.org to 127.0.0.1:47807 should have rcode NOERROR
+        A query for www.example.org to [::1]:47807 should have rcode NOERROR
diff --git a/tests/lettuce/features/terrain/querying.py b/tests/lettuce/features/terrain/querying.py
index c070dd2..408ff72 100644
--- a/tests/lettuce/features/terrain/querying.py
+++ b/tests/lettuce/features/terrain/querying.py
@@ -201,7 +201,7 @@ class QueryResult(object):
         pass
 
 @step('A (dnssec )?query for ([\S]+) (?:type ([A-Z0-9]+) )?' +
-      '(?:class ([A-Z]+) )?(?:to ([^:]+)(?::([0-9]+))? )?' +
+      '(?:class ([A-Z]+) )?(?:to ([^:]+|\[[0-9a-fA-F:]+\])(?::([0-9]+))? )?' +
       'should have rcode ([\w.]+)')
 def query(step, dnssec, query_name, qtype, qclass, addr, port, rcode):
     """
@@ -223,6 +223,7 @@ def query(step, dnssec, query_name, qtype, qclass, addr, port, rcode):
         qclass = "IN"
     if addr is None:
         addr = "127.0.0.1"
+    addr = re.sub(r"\[(.+)\]", r"\1", addr) # convert [IPv6_addr] to IPv6_addr
     if port is None:
         port = 47806
     additional_arguments = []
diff --git a/tests/lettuce/features/xfrin_bind10.feature b/tests/lettuce/features/xfrin_bind10.feature
index 8bc6e5e..9970396 100644
--- a/tests/lettuce/features/xfrin_bind10.feature
+++ b/tests/lettuce/features/xfrin_bind10.feature
@@ -6,6 +6,6 @@ Feature: Xfrin
     And I have bind10 running with configuration xfrin/retransfer_slave.conf
     A query for www.example.org should have rcode REFUSED
     Wait for bind10 stderr message CMDCTL_STARTED
-    When I send bind10 the command Xfrin retransfer example.org IN 127.0.0.1 47807
+    When I send bind10 the command Xfrin retransfer example.org IN ::1 47807
     Then wait for new bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE
     A query for www.example.org should have rcode NOERROR