Merge branch '4.next'

[exim.git] / test / stderr / 0554

diff --git a/test/stderr/0554 b/test/stderr/0554
index 7b8afc098304ec47b1f2c5ab0993ee7b90134708..66e995e2e5a422f2b5187adf0c7ba3587c795e2e 100644 (file)
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -15,13 +15,11 @@ After routing:
     x@y
   Failed addresses:
   Deferred addresses:
-fresh-exec forking for transport
-postfork: transport
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=-44 more_errno=dd,A flags=0
-fresh-exec forked for transport: npppp
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
 reading retry information for R:x@y:<CALLER@myhost.test.ex> from subprocess
   added retry item
 LOG: MAIN
@@ -38,7 +36,7 @@ Writing retry data for R:x@y:<CALLER@myhost.test.ex>
   first failed=dddd last try=dddd next try=+2 expired=0
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
 end of retry processing
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
@@ -58,8 +56,6 @@ After routing:
     x@y
   Failed addresses:
   Deferred addresses:
-fresh-exec forking for transport
-postfork: transport
 checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
@@ -67,7 +63,7 @@ no message retry record
 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=dd more_errno=dd,A flags=1
 added retry item for R:x@y: errno=dd more_errno=dd,A flags=1
 locking TESTSUITE/spool/db/wait-smtp.lockfile
-fresh-exec forked for transport: npppp
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 reading retry information for R:x@y from subprocess
   existing delete item dropped
   added delete item
@@ -97,4 +93,4 @@ Deferred addresses:
 end of retry processing
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>