X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/8102279385f5f70c959aa219feca37031c0a1828..44876330aea2aa8deb3d8b714d7b710d456201f6:/test/stderr/0333?ds=inline

diff --git a/test/stderr/0333 b/test/stderr/0333
index 21bac8348..44f2f123b 100644
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -1,8 +1,8 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 unique = ok@no.delay
@@ -19,7 +19,7 @@ set transport t1
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=no.delay local_part_data=NULL
 routed by r1 router
   envelope to: ok@no.delay
   transport: t1
@@ -30,33 +30,18 @@ After routing:
     ok@no.delay
   Failed addresses:
   Deferred addresses:
-fresh-exec forking for transport
-postfork: transport
-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-t1.lockfile
-transport forking for continued-transport-interproc
-postfork: continued-transport-interproc
-continued-transport-interproc forking for continued-transport
-postfork: continued-transport
-fresh-exec forked for transport: npppp
-transport forked for continued-transport-interproc: npppp
-continued-transport-interproc forked for continued-transport: npppp
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+fresh-exec becomes continued-delivery
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-configuration file is TESTSUITE/test-config
-trusted user
-admin user
-dropping to exim gid; retaining priv uid
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 LOG: retry_defer MAIN
-  == delay@test.again.dns routing defer (-51): reusing SMTP connection skips previous routing defer
+  == delay@test.again.dns routing defer (-52): reusing SMTP connection skips previous routing defer
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 unique = ok@no.delay
@@ -69,11 +54,10 @@ checking domains
 calling r1 router
 r1 router called for ok@no.delay
   domain = no.delay
-set transport t1
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=no.delay local_part_data=NULL
 routed by r1 router
   envelope to: ok@no.delay
   transport: t1
@@ -85,11 +69,8 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns
-continued-transport forking for transport
-postfork: transport
-locking TESTSUITE/spool/db/retry.lockfile
-continued-transport forked for transport: npppp
-locking TESTSUITE/spool/db/wait-t1.lockfile
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
->>>>>>>>>>>>>>>> Exim pid=pppp (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (continued-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>