diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0023 | 2 | ||||
| -rw-r--r-- | test/confs/0069 | 2 | ||||
| -rw-r--r-- | test/confs/0605 | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0023 | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0069 | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0605 | 1 | ||||
| -rw-r--r-- | test/stderr/0023 | 2 | ||||
| -rw-r--r-- | test/stderr/0069 | 3 | ||||
| -rw-r--r-- | test/stderr/0605 | 1 |
9 files changed, 11 insertions, 6 deletions
diff --git a/test/confs/0023 b/test/confs/0023 index 43f140d65..2ee1d538b 100644 --- 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 c03aa20b9..0c28c6484 100644 --- 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 32c7b286f..7fce427d5 100644 --- 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 3c028a1f0..40a5bd909 100644 --- 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 b8ff04a6d..9170dfc58 100644 --- 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 79652be65..625013100 100644 --- 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 b05f70f39..068962377 100644 --- 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 15b8a4318..19174faf0 100644 --- 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 d2def942f..920597c06 100644 --- 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 |