expand

[exim.git] / test / stderr / 0479

diff --git a/test/stderr/0479 b/test/stderr/0479
index 070ed9074f24ce1a8ead668a907c6503ba910313..0985a5e6841dbfda106f689d3aa5af06db270a95 100644 (file)
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -34,7 +34,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "rcpt"
-processing "require"
+processing "require" (TESTSUITE/test-config 16)
 check logwrite = sender address is <$sender_address>
                = sender address is <a@b>
 LOG: MAIN
@@ -60,21 +60,20 @@ set transport t1
 queued for t1 transport: local_part = rewritten-a
 domain = rewritten-b
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r1 router
   envelope to: rewritten-a@rewritten-b
   transport: t1
 ----------- end verify ------------
 sender a@b verified ok as rewritten-a@rewritten-b
 require: condition test succeeded in ACL "rcpt"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 18)
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< rcpt to:<e@f>
 using ACL "rcpt"
-processing "require"
+processing "require" (TESTSUITE/test-config 16)
 check logwrite = sender address is <$sender_address>
                = sender address is <rewritten-a@rewritten-b>
 LOG: MAIN
@@ -82,14 +81,13 @@ LOG: MAIN
 check verify = sender
 using cached sender verify result
 require: condition test succeeded in ACL "rcpt"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 18)
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
   SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>