BIND 10 master, updated. 5b0c9e4cb9de6ead5b73af9c64bf4abb6e65c86f [master] reverted the change of lettuce test address from IPv6 to IPv4.

[BIND 10 source code commits]

The branch, master has been updated
       via  5b0c9e4cb9de6ead5b73af9c64bf4abb6e65c86f (commit)
      from  0d03b06138e080cc0391fb912a5a5e75f0f97cec (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 5b0c9e4cb9de6ead5b73af9c64bf4abb6e65c86f
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon May 14 15:44:05 2012 -0700

    [master] reverted the change of lettuce test address from IPv6 to IPv4.
    
    The use of IPv6 was intentional and necessary for some environment.
    Added a NOTE, hoping it will help remember that and avoid repeating the
    mistake.
    As a result of this fix it also fixes the error of address+port specification
    at the end of xfrin_bind10.feature.  It should have been address:port,
    but we actually don't even have to specify that because the default combination
    should be okay.

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

Summary of changes:
 tests/lettuce/configurations/NOTES                 |    4 ++++
 .../configurations/xfrin/retransfer_master.conf    |    2 +-
 .../lettuce/features/inmemory_over_sqlite3.feature |    2 +-
 tests/lettuce/features/xfrin_bind10.feature        |    5 +++--
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 tests/lettuce/configurations/NOTES

-----------------------------------------------------------------------
diff --git a/tests/lettuce/configurations/NOTES b/tests/lettuce/configurations/NOTES
new file mode 100644
index 0000000..a9b7976
--- /dev/null
+++ b/tests/lettuce/configurations/NOTES
@@ -0,0 +1,4 @@
+- In some configuration we intentionally use an IPv6 address (::1) with
+  port 47807.  DO NOT CHANGE THAT; at least do not change it to
+  127.0.0.1:47807.  See git e3f4b290d17a68db728166cdffcbe93517966e8b
+  for why.
diff --git a/tests/lettuce/configurations/xfrin/retransfer_master.conf b/tests/lettuce/configurations/xfrin/retransfer_master.conf
index 366fdb4..eae47a6 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/inmemory_over_sqlite3.feature b/tests/lettuce/features/inmemory_over_sqlite3.feature
index adc1315..2e48689 100644
--- a/tests/lettuce/features/inmemory_over_sqlite3.feature
+++ b/tests/lettuce/features/inmemory_over_sqlite3.feature
@@ -31,7 +31,7 @@ Feature: In-memory zone using SQLite3 backend
         www.example.org.        3600    IN      A       192.0.2.63
         """
         A query for mail.example.org should have rcode NXDOMAIN
-        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
         Then wait for new bind10 stderr message AUTH_LOAD_ZONE
 
diff --git a/tests/lettuce/features/xfrin_bind10.feature b/tests/lettuce/features/xfrin_bind10.feature
index 3d6e5d2..bccb53b 100644
--- a/tests/lettuce/features/xfrin_bind10.feature
+++ b/tests/lettuce/features/xfrin_bind10.feature
@@ -24,7 +24,7 @@ Feature: Xfrin
     The file data/test_nonexistent_db.sqlite3 should exist
 
     A query for www.example.org should have rcode REFUSED
-    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
 
@@ -33,5 +33,6 @@ Feature: Xfrin
     # should be 13, counting the duplicated SOA.
     # At this point we can confirm both in and out of AXFR for a zone
     # containing an NSEC3 RR.
-    When I do an AXFR transfer of example.org from 127.0.0.1 47807
+    # We don't have to specify the address/port here; the defaults will work.
+    When I do an AXFR transfer of example.org
     Then transfer result should have 13 rrs