debug: prettify expansion condition trace output

[exim.git] / test / stderr / 0362

diff --git a/test/stderr/0362 b/test/stderr/0362
index ff1b2acd4d53d69fa11d0529dca5490a555941d2..c2b6e25f4c83cd31fe953af12b86be09bd0437db 100644 (file)
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -5,6 +5,10 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.0.0.0]
@@ -30,7 +34,7 @@ processing "accept"
 check domains = +local_domains
 a.b.c in "*.test.ex"? no (end of list)
 a.b.c in "+local_domains"? no (end of list)
-accept: condition test failed
+accept: condition test failed in ACL "check_rcpt"
 processing "accept"
 check domains = +relay_domains
 a.b.c in "a.b.c"? yes (matched "a.b.c")
@@ -38,7 +42,7 @@ a.b.c in "+relay_domains"? yes (matched "+relay_domains")
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@a.b.c
-address match: subject=x@a.b.c pattern=x@a.b.c
+address match test: subject=x@a.b.c pattern=x@a.b.c
 a.b.c in "a.b.c"? yes (matched "a.b.c")
 x@a.b.c in "x@a.b.c"? yes (matched "x@a.b.c")
 LOG: address_rewrite MAIN
@@ -70,8 +74,10 @@ routed by r2 router
   envelope to: x@x.test.ex
   transport: t2
 ----------- end verify ------------
-accept: condition test succeeded
+accept: condition test succeeded in ACL "check_rcpt"
+end of ACL "check_rcpt": ACCEPT
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN