Pass back more info from transport to delivery process

[exim.git] / test / stderr / 0529

diff --git a/test/stderr/0529 b/test/stderr/0529
index 587cef7a8c78bb7534935a63c2307c40cf72c5d3..aeecbe615325d90f8ba175bb2d0fec15ff3da079 100644 (file)
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -27,21 +27,22 @@ After routing:
   Failed addresses:
   Deferred addresses:
 no retry data available
   Failed addresses:
   Deferred addresses:
 no retry data available

+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>

 added retry item for T:TESTSUITE/test-mail/rmbox:x@test.ex: errno=-22 more_errno=dd flags=0
 LOG: MAIN
   == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
 Processing retry items
 added retry item for T:TESTSUITE/test-mail/rmbox:x@test.ex: errno=-22 more_errno=dd flags=0
 LOG: MAIN
   == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
 Processing retry items

-Succeeded addresses:
- x@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
- TESTSUITE/test-mail/rmbox
-retry for T:TESTSUITE/test-mail/rmbox:x@test.ex = *@test.ex -22 0
-failing_interval=ttt message_age=ttt
-Writing retry data for T:TESTSUITE/test-mail/rmbox:x@test.ex
-  first failed=dddd last try=dddd next try=+900 expired=0
-  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
- x@test.ex: no retry items
+ Succeeded addresses:
+  x@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:
+  TESTSUITE/test-mail/rmbox
+ retry for T:TESTSUITE/test-mail/rmbox:x@test.ex = *@test.ex -22 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for T:TESTSUITE/test-mail/rmbox:x@test.ex
+   first failed=dddd last try=dddd next try=+900 expired=0
+   errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
+  x@test.ex: no retry items

 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -73,14 +74,14 @@ retry time not reached: checking ultimate address timeout
 LOG: retry_defer MAIN
   == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-53): Retry time not yet reached
 Processing retry items
 LOG: retry_defer MAIN
   == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-53): Retry time not yet reached
 Processing retry items

-Succeeded addresses:
- x@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
- TESTSUITE/test-mail/rmbox: no retry items
- x@test.ex: no retry items
+ Succeeded addresses:
+  x@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:
+  TESTSUITE/test-mail/rmbox: no retry items
+  x@test.ex: no retry items

 end of retry processing
 end of retry processing

->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: queue_run MAIN
   End queue run: pid=p1234
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>