Pass back more info from transport to delivery process

[exim.git] / test / stderr / 0358

diff --git a/test/stderr/0358 b/test/stderr/0358
index 9208e426ad8f214730b24a84849694e510bfc447..e2e3920956a3dfd6c52f47010f8df2f488efc5e3 100644 (file)
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -1,17 +1,16 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
@@ -29,13 +28,12 @@ After routing:
     usery@test.ex
   Failed addresses:
   Deferred addresses:
-local-accept-delivery forking for transport
-local-accept-delivery forked for transport: npppp
-checking status of 127.0.0.1
-locking TESTSUITE/spool/db/retry.lockfile
+checking retry status of 127.0.0.1
 no retry data available
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
 added retry item for R:usery@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   added retry item
 reading retry information for R:usery@test.ex:<CALLER@test.ex> from subprocess
@@ -45,34 +43,31 @@ LOG: MAIN
 LOG: MAIN
   == usery@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- usery@test.ex
-locking TESTSUITE/spool/db/retry.lockfile
-retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:usery@test.ex:<CALLER@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:<usery@test.ex>: 451 Temporary error
- userx@test.ex
-retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:userx@test.ex:<CALLER@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:<userx@test.ex>: 451 Temporary error
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  usery@test.ex
+ retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:usery@test.ex:<CALLER@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:<usery@test.ex>: 451 Temporary error
+  userx@test.ex
+ retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:userx@test.ex:<CALLER@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:<userx@test.ex>: 451 Temporary error
 end of retry processing
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
-  Start queue run: pid=pppp
-fresh-exec forking for qrun-delivery
-fresh-exec forked for qrun-delivery: npppp
-locking TESTSUITE/spool/db/retry.lockfile
+  Start queue run: pid=p1234
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no   domain  retry record
@@ -95,14 +90,13 @@ After routing:
     usery@test.ex
   Failed addresses:
   Deferred addresses:
-qrun-delivery forking for transport
-qrun-delivery forked for transport: npppp
-checking status of 127.0.0.1
-locking TESTSUITE/spool/db/retry.lockfile
+checking retry status of 127.0.0.1
 no host retry record
 no message retry record
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
 added retry item for R:usery@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1238 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   existing delete item dropped
   added retry item
@@ -130,28 +124,27 @@ LOG: MAIN
 LOG: MAIN
   == usery@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- usery@test.ex
-locking TESTSUITE/spool/db/retry.lockfile
-deleted retry information for R:usery@test.ex
-deleted retry information for R:test.ex
-retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:usery@test.ex:<CALLER@test.ex>
-  first failed=dddd last try=dddd next try=+4 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:<usery@test.ex>: 451 Temporary error
- userx@test.ex
-deleted retry information for R:userx@test.ex
-deleted retry information for R:test.ex
-retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:userx@test.ex:<CALLER@test.ex>
-  first failed=dddd last try=dddd next try=+4 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:<userx@test.ex>: 451 Temporary error
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  usery@test.ex
+ deleted retry information for R:usery@test.ex
+ deleted retry information for R:test.ex
+ retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:usery@test.ex:<CALLER@test.ex>
+   first failed=dddd last try=dddd next try=+4 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:<usery@test.ex>: 451 Temporary error
+  userx@test.ex
+ deleted retry information for R:userx@test.ex
+ deleted retry information for R:test.ex
+ retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:userx@test.ex:<CALLER@test.ex>
+   first failed=dddd last try=dddd next try=+4 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:<userx@test.ex>: 451 Temporary error
 end of retry processing
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
-  End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+  End queue run: pid=p1234
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>