One final test added to the test suite.

4 files changed, 94 insertions, 1 deletions

diff --git a/test/confs/1009 b/test/confs/1009
new file mode 100644
index 000000000..a29187eae
--- /dev/null
+++ b/test/confs/1009
@@ -0,0 +1,42 @@
+# Exim test configuration 1009
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+queue_run_in_order
+
+
+# ----- Routers -----
+
+begin routers
+
+r1:
+  driver = dnslookup
+  transport = t1
+  self = send
+
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = smtp
+  port = PORT_S
+
+
+# ----- Retry -----
+
+begin retry
+
+* *  F,1d,2h
+
+
+# End
diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex
index bf0c2092c..534f3a71f 100644
--- a/test/dnszones-src/db.test.ex
+++ b/test/dnszones-src/db.test.ex
@@ -1,4 +1,4 @@
-; $Cambridge: exim/test/dnszones-src/db.test.ex,v 1.2 2006/02/14 16:18:14 ph10 Exp $
+; $Cambridge: exim/test/dnszones-src/db.test.ex,v 1.3 2006/02/20 16:25:00 ph10 Exp $
 
 ; This is a testing zone file for use when testing DNS handling in Exim. This
 ; is a fake zone of no real use - hence no SOA record. The zone name is
@@ -190,6 +190,12 @@ mx46466      MX  46 46.test.ex.
              MX  46 46b.test.ex.
              MX  46 v6.test.ex.
 
+; This time, change precedence
+
+mx46466b     MX  46 46.test.ex.
+             MX  47 46b.test.ex.
+             MX  48 v6.test.ex.
+
 ; Points to a host with a working IPv4 and a non-working IPv6 record
 
 mx46cd       MX  10 46c.test.ex.
diff --git a/test/scripts/1000-Basic-ipv6/1009 b/test/scripts/1000-Basic-ipv6/1009
new file mode 100644
index 000000000..6e5ae7d95
--- /dev/null
+++ b/test/scripts/1000-Basic-ipv6/1009
@@ -0,0 +1,13 @@
+# Prefer IPv6 over IPv4 addresses
+exim -bt x@46.test.ex
+****
+exim -bt x@mx46.test.ex
+****
+exim -bt x@mx246.test.ex
+****
+exim -bt x@mx4646.test.ex
+****
+exim -bt x@mx46466.test.ex
+****
+exim -bt x@mx46466b.test.ex
+****
diff --git a/test/stdout/1009 b/test/stdout/1009
new file mode 100644
index 000000000..8c03b836c
--- /dev/null
+++ b/test/stdout/1009
@@ -0,0 +1,32 @@
+x@46.test.ex
+  router = r1, transport = t1
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] 
+  host 46.test.ex [V4NET.0.0.4]                          
+x@mx46.test.ex
+  router = r1, transport = t1
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
+  host 46.test.ex [V4NET.0.0.4] MX=46
+x@mx246.test.ex
+  router = r1, transport = t1
+  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=10
+  host ten-1.test.ex [V4NET.0.0.1] MX=10
+x@mx4646.test.ex
+  router = r1, transport = t1
+  host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=46
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
+  host 46b.test.ex [V4NET.0.0.5] MX=46
+  host 46.test.ex [V4NET.0.0.4] MX=46
+x@mx46466.test.ex
+  router = r1, transport = t1
+  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=46
+  host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=46
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
+  host 46b.test.ex [V4NET.0.0.5] MX=46
+  host 46.test.ex [V4NET.0.0.4] MX=46
+x@mx46466b.test.ex
+  router = r1, transport = t1
+  host 46.test.ex [V6NET:ffff:836f:a00:a:800:200a:c031] MX=46
+  host 46.test.ex [V4NET.0.0.4] MX=46
+  host 46b.test.ex [V6NET:ffff:836f:a00:a:800:200a:c033] MX=47
+  host 46b.test.ex [V4NET.0.0.5] MX=47
+  host v6.test.ex [V6NET:ffff:836f:a00:a:800:200a:c032] MX=48