Callouts: simplfy debug output

[users/jgh/exim.git] / test / stderr / 0069

diff --git a/test/stderr/0069 b/test/stderr/0069
index df768dde297d1d8be075848c63c92f55c4da5d00..dd1e82234f23113f00d054b36f8da2c1ff69b51d 100644 (file)
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -4,9 +4,6 @@
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> looking up host name for V4NET.0.0.1
 >>> IP address lookup yielded "ten-1.test.ex"

-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>>   name=ten-1.test.ex address=V4NET.0.0.1

 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in sender_unqualified_hosts? yes (matched "^ten-1\.test\.ex")
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in sender_unqualified_hosts? yes (matched "^ten-1\.test\.ex")


@@ -15,11 +12,11 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientx"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientx"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)

 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipientx"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipientx"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 25)

 >>> check hosts = +include_unknown : ^ten-1\\.test\\.ex
 >>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex")
 >>> deny: condition test succeeded in ACL "check_recipientx"
 >>> check hosts = +include_unknown : ^ten-1\\.test\\.ex
 >>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex")
 >>> deny: condition test succeeded in ACL "check_recipientx"


@@ -38,11 +35,11 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientx"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientx"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)

 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipientx"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipientx"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 25)

 >>> check hosts = +include_unknown : ^ten-1\\.test\\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (failed to find host name for V4NET.0.0.13)
 >>> check hosts = +include_unknown : ^ten-1\\.test\\.ex
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (failed to find host name for V4NET.0.0.13)


@@ -63,13 +60,13 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipienty"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipienty"

->>> processing "accept"
+>>> 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)
 >>> accept: condition test failed in ACL "check_recipienty"
 >>> 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)
 >>> accept: condition test failed in ACL "check_recipienty"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 31)

 >>>   message: "Denied"
 >>> deny: condition test succeeded in ACL "check_recipienty"
 >>> end of ACL "check_recipienty": DENY
 >>>   message: "Denied"
 >>> deny: condition test succeeded in ACL "check_recipienty"
 >>> end of ACL "check_recipienty": DENY


@@ -87,7 +84,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientz"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientz"

->>> processing "accept"
+>>> 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])
 >>> 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])


@@ -108,14 +105,14 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipienty"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipienty"

->>> processing "accept"
+>>> 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
 >>> accept: condition test failed in ACL "check_recipienty"
 >>> 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
 >>> accept: condition test failed in ACL "check_recipienty"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 31)

 >>>   message: "Denied"
 >>> deny: condition test succeeded in ACL "check_recipienty"
 >>> end of ACL "check_recipienty": DENY
 >>>   message: "Denied"
 >>> deny: condition test succeeded in ACL "check_recipienty"
 >>> end of ACL "check_recipienty": DENY


@@ -133,14 +130,16 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipienta"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipienta"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 38)

 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipienta"
 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipienta"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 39)

 >>> check hosts = +include_defer : test.again.dns
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> check hosts = +include_defer : test.again.dns
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)

-LOG: DNS lookup of test.again.dns deferred: accepted by +include_defer
+>>> 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

 >>> deny: condition test succeeded in ACL "check_recipienta"
 >>> end of ACL "check_recipienta": DENY
 LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>
 >>> deny: condition test succeeded in ACL "check_recipienta"
 >>> end of ACL "check_recipienta": DENY
 LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>


@@ -157,12 +156,14 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientb"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientb"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 44)

 >>> check hosts = test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> check hosts = test.again.dns : V4NET.0.0.13
 >>> 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
 >>> accept: condition test deferred in ACL "check_recipientb"
 >>> host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
 >>> accept: condition test deferred in ACL "check_recipientb"

-LOG: H=[V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>
+LOG: H=[V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>: DNS lookup of "test.again.dns" deferred

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -176,10 +177,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientc"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientc"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 48)

 >>> check hosts = +ignore_defer : test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> check hosts = +ignore_defer : test.again.dns : 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
+>>> 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

 >>> host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
 >>> accept: condition test succeeded in ACL "check_recipientc"
 >>> end of ACL "check_recipientc": ACCEPT
 >>> host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
 >>> accept: condition test succeeded in ACL "check_recipientc"
 >>> end of ACL "check_recipientc": ACCEPT