Testsuite: output changes resulting

[exim.git] / test / stderr / 0584

diff --git a/test/stderr/0584 b/test/stderr/0584
index 64e67748da6829e1d0fd691ba0b44de319557020..c2b1959f885e18635a2b9ada378107ce9c7adba2 100644 (file)
--- a/test/stderr/0584
+++ b/test/stderr/0584
@@ -6,26 +6,27 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 20)
+>>> processing ACL check_recipient "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=userx@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in local_parts?
+>>>  list element: userx
+>>>  userx in local_parts? yes (matched "userx")
 >>> calling goodroute router
 >>> routed by goodroute router
 >>> ----------- end verify ------------
->>> require: condition test succeeded in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 21)
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> require: condition test succeeded in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 21)
+>>> accept: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -34,21 +35,22 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 20)
+>>> processing ACL check_recipient "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=fail@test.ex
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing fail@test.ex
->>> list element: userx
->>> fail in "userx"? no (end of list)
+>>> fail in local_parts?
+>>>  list element: userx
+>>> fail in local_parts? no (end of list)
 >>> no more routers
 >>> ----------- end verify ------------
->>> require: condition test failed in ACL "check_recipient"
->>> end of ACL "check_recipient": not OK
+>>> require: condition test failed in ACL check_recipient
+>>> end of ACL check_recipient: not OK
 LOG: H=(test) [127.0.0.1] sender verify fail for <fail@test.ex>: Unrouteable address
 LOG: H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed
 >>> host in hosts_connection_nolog? no (option unset)
@@ -59,24 +61,25 @@ LOG: H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sende
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "require" (TESTSUITE/test-config 20)
+>>> processing ACL check_recipient "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=$sender_address/defer_ok
 >>>              = sender=userx@test.ex/defer_ok
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
->>> list element: userx
->>> userx in "userx"? yes (matched "userx")
+>>> userx in local_parts?
+>>>  list element: userx
+>>>  userx in local_parts? yes (matched "userx")
 >>> calling goodroute router
 >>> routed by goodroute router
 >>> ----------- end verify ------------
->>> require: condition test succeeded in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 21)
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> require: condition test succeeded in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 21)
+>>> accept: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
-LOG: 10HmaY-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss
+LOG: 10HmaY-000000005vi-0000 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss