From: Jeremy Harris Date: Tue, 21 Apr 2020 22:17:53 +0000 (+0100) Subject: Testsuite: use name for nonexistent host that the testsuite forces to not-resolve X-Git-Tag: exim-4_94_RC0~12 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/7e26c2f6e641307f44c7a0c88def1d43f3e67eab Testsuite: use name for nonexistent host that the testsuite forces to not-resolve Avoids going to the plaform resolver, which can have varying behaviour --- diff --git a/test/aux-var-src/0401.hosts2 b/test/aux-var-src/0401.hosts2 index 8453fb6c1..9959d7de7 100644 --- a/test/aux-var-src/0401.hosts2 +++ b/test/aux-var-src/0401.hosts2 @@ -1,2 +1,2 @@ -a2.2.2 +not-exist.test.ex V4NET.9.8.7 diff --git a/test/confs/0069 b/test/confs/0069 index ca81da915..9ad368630 100644 --- a/test/confs/0069 +++ b/test/confs/0069 @@ -27,11 +27,11 @@ check_recipientx: deny message = relay not permitted check_recipienty: - accept hosts = non.existent.invalid : V4NET.0.0.13 + accept hosts = not-exist.test.ex : V4NET.0.0.13 deny message = "Denied" check_recipientz: - accept hosts = +ignore_unknown : non.existent.invalid : V4NET.0.0.13 + accept hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13 deny message = "Denied" check_recipienta: diff --git a/test/stderr/0069 b/test/stderr/0069 index dd1e82234..619c7f171 100644 --- a/test/stderr/0069 +++ b/test/stderr/0069 @@ -61,10 +61,10 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "check_recipienty" >>> processing "accept" (TESTSUITE/test-config 30) ->>> check hosts = non.existent.invalid : V4NET.0.0.13 ->>> no IP address found for host non.existent.invalid (during SMTP connection from [V4NET.0.0.13]) -LOG: no IP address found for host non.existent.invalid (during SMTP connection from [V4NET.0.0.13]) ->>> host in "non.existent.invalid : V4NET.0.0.13"? no (failed to find IP address for non.existent.invalid) +>>> check hosts = not-exist.test.ex : V4NET.0.0.13 +>>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) +LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) +>>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex) >>> accept: condition test failed in ACL "check_recipienty" >>> processing "deny" (TESTSUITE/test-config 31) >>> message: "Denied" @@ -85,11 +85,11 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "check_recipientz" >>> processing "accept" (TESTSUITE/test-config 34) ->>> check hosts = +ignore_unknown : non.existent.invalid : V4NET.0.0.13 ->>> no IP address found for host non.existent.invalid (during SMTP connection from [V4NET.0.0.13]) -LOG: no IP address found for host non.existent.invalid (during SMTP connection from [V4NET.0.0.13]) ->>> failed to find IP address for non.existent.invalid: item ignored by +ignore_unknown ->>> host in "+ignore_unknown : non.existent.invalid : V4NET.0.0.13"? yes (matched "V4NET.0.0.13") +>>> check hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13 +>>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) +LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) +>>> failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown +>>> host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"? yes (matched "V4NET.0.0.13") >>> accept: condition test succeeded in ACL "check_recipientz" >>> end of ACL "check_recipientz": ACCEPT >>> host in hosts_connection_nolog? no (option unset) @@ -106,11 +106,11 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "check_recipienty" >>> processing "accept" (TESTSUITE/test-config 30) ->>> check hosts = non.existent.invalid : V4NET.0.0.13 ->>> no IP address found for host non.existent.invalid (during SMTP connection from [V4NET.0.0.13]) -LOG: no IP address found for host non.existent.invalid (during SMTP connection from [V4NET.0.0.13]) ->>> host in "non.existent.invalid : V4NET.0.0.13"? no (failed to find IP address for non.existent.invalid) -LOG: list matching forced to fail: failed to find IP address for non.existent.invalid +>>> check hosts = not-exist.test.ex : V4NET.0.0.13 +>>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) +LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13]) +>>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex) +LOG: list matching forced to fail: failed to find IP address for not-exist.test.ex >>> accept: condition test failed in ACL "check_recipienty" >>> processing "deny" (TESTSUITE/test-config 31) >>> message: "Denied" diff --git a/test/stderr/0401 b/test/stderr/0401 index 3a0e221cb..aafec8ed9 100644 --- a/test/stderr/0401 +++ b/test/stderr/0401 @@ -16,9 +16,9 @@ >>> using ACL "mail" >>> processing "accept" (TESTSUITE/test-config 24) >>> check hosts = TESTSUITE/aux-var/0401.hosts2 ->>> no IP address found for host a2.2.2 (during SMTP connection from (xxx) [V4NET.9.8.7]) -LOG: no IP address found for host a2.2.2 (during SMTP connection from (xxx) [V4NET.9.8.7]) ->>> host in "TESTSUITE/aux-var/0401.hosts2"? no (failed to find IP address for a2.2.2) +>>> no IP address found for host not-exist.test.ex (during SMTP connection from (xxx) [V4NET.9.8.7]) +LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (xxx) [V4NET.9.8.7]) +>>> host in "TESTSUITE/aux-var/0401.hosts2"? no (failed to find IP address for not-exist.test.ex) >>> accept: condition test failed in ACL "mail" >>> end of ACL "mail": implicit DENY LOG: H=(xxx) [V4NET.9.8.7] rejected MAIL