Testsuite: avoid IPv6 interfaces to avoid extra debug stderr lines

diff --git a/test/confs/0023 b/test/confs/0023
index 43f140d659dc84e634ce5e777c1d17262aab0ba4..2ee1d538b62a1a768bc92a5b67c63058d207bd32 100644 (file)
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -12,6 +12,8 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
+disable_ipv6 = true
+
 addresslist ok_senders = ok@ok.ok
 
 domainlist local_domains = test.ex : *.test.ex

diff --git a/test/confs/0069 b/test/confs/0069
index c03aa20b927c38f4f3ce19b9746fe889115396b2..0c28c64846052e78c727f8e5cad9813a8389b057 100644 (file)
--- a/test/confs/0069
+++ b/test/confs/0069
@@ -12,6 +12,8 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
+disable_ipv6 = true
+
 domainlist local_domains = test.ex : myhost.ex
 
 acl_smtp_rcpt = check_recipient$local_part

diff --git a/test/confs/0605 b/test/confs/0605
index 32c7b286f9667dffd919f4a4fed50011f5271b8c..7fce427d587156de0e0c005be3a805d6f5d73279 100644 (file)
--- a/test/confs/0605
+++ b/test/confs/0605
@@ -9,6 +9,8 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
+disable_ipv6 = true
+
 acl_smtp_rcpt = accept hosts = test.again.dns
 
 queue_only

diff --git a/test/scripts/0000-Basic/0023 b/test/scripts/0000-Basic/0023
index 3c028a1f02192103d71ee546418b93d195ab3792..40a5bd90940340cea5558858fe3901450f6cb3a5 100644 (file)
--- a/test/scripts/0000-Basic/0023
+++ b/test/scripts/0000-Basic/0023
@@ -1,4 +1,6 @@
 # ACL basic tests
+need_ipv4
+#
 exim -bh 1.2.3.4
 mail from:<x@y>
 rcpt to:<postmaster@test.ex>

diff --git a/test/scripts/0000-Basic/0069 b/test/scripts/0000-Basic/0069
index b8ff04a6d3f21f81d224ae41764dea4d66528f2c..9170dfc58eebbd8259715d05b27069db796a9773 100644 (file)
--- a/test/scripts/0000-Basic/0069
+++ b/test/scripts/0000-Basic/0069
@@ -1,4 +1,6 @@
 # +include_unknown, +ignore_unknown, +include_defer, +ignore_defer
+need_ipv4
+#
 exim -bh V4NET.0.0.1
 mail from:<x@y>
 rcpt to:<x@test.ex>

diff --git a/test/scripts/0000-Basic/0605 b/test/scripts/0000-Basic/0605
index 79652be65cb4fff782aa71938e66fe088dfeae0d..625013100d80a7f1741db444bfce425bc9b63c83 100644 (file)
--- a/test/scripts/0000-Basic/0605
+++ b/test/scripts/0000-Basic/0605
@@ -1,6 +1,7 @@
 # dns retry in hostlist
 # Exim test configuration 0605
 #
+need_ipv4
 #
 exim -bh HOSTIPV4
 helo test

diff --git a/test/stderr/0023 b/test/stderr/0023
index b05f70f39492560bf747bc5ebc4afcff1c1954cc..068962377756d5a3bc5ae05b7700fbb1e43d36df 100644 (file)
--- a/test/stderr/0023
+++ b/test/stderr/0023
@@ -1133,7 +1133,6 @@ LOG: H=[V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse l
 >>> looking up host name for V4NET.99.99.96
 >>> IP address lookup yielded "x.test.again.dns"
 >>> x.test.again.dns in dns_again_means_nonexist? no (option unset)
->>> x.test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> temporary error for host name lookup
 >>> accept: condition test deferred in ACL "acl_V4NET_99_99"
 LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferred for reverse lookup check
@@ -1154,7 +1153,6 @@ LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferr
 >>> looking up host name for V4NET.99.99.96
 >>> IP address lookup yielded "x.test.again.dns"
 >>> x.test.again.dns in dns_again_means_nonexist? no (option unset)
->>> x.test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> temporary error for host name lookup
 >>> accept: condition test succeeded in ACL "acl_V4NET_99_99"
 >>> end of ACL "acl_V4NET_99_99": ACCEPT

diff --git a/test/stderr/0069 b/test/stderr/0069
index 15b8a4318adfecfd1cc8f04fcd05ca22b4fb0a6c..19174faf0f47d11c238910e8af4de8a062c66b4b 100644 (file)
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -137,7 +137,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> processing "deny"
 >>> check hosts = +include_defer : test.again.dns
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 LOG: DNS lookup of "test.again.dns" deferred: accepted by +include_defer
@@ -160,7 +159,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> processing "accept"
 >>> check hosts = test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
@@ -182,7 +180,6 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> processing "accept"
 >>> check hosts = +ignore_defer : test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer

diff --git a/test/stderr/0605 b/test/stderr/0605
index d2def942f3e042c9b1b2df1e42f6465e778085f9..920597c06dfdd9058d624063d39ab6a74ab1838c 100644 (file)
--- a/test/stderr/0605
+++ b/test/stderr/0605
@@ -10,7 +10,6 @@
 >>> processing "accept"
 >>> check hosts = test.again.dns
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> no IP address found for host test.again.dns (during SMTP connection from (test) [ip4.ip4.ip4.ip4])
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> host in "test.again.dns"? list match deferred for test.again.dns