Testsuite: munge for error message sizes in retry records

[exim.git] / test / stderr / 0402

diff --git a/test/stderr/0402 b/test/stderr/0402
index 1f55d3e22b9ec534d89939e61c8f39a7cf38e864..bac58e5f2b52512ad2ac2266c3606dd77197b794 100644 (file)
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -544,7 +544,6 @@ r5 router generated TESTSUITE/test-mail/junk
   errors_to=NULL transport=ft1
   uid=unset gid=unset home=/non-exist/$local_part
 try option unseen
-try option unseen
 routed by r5 router
   envelope to: rd+usery@test.ex
   transport: <none>
@@ -603,7 +602,6 @@ r4 router generated TESTSUITE/test-mail/junk
   errors_to=NULL transport=ft1
   uid=unset gid=unset home=/non-exist/CALLER
 try option unseen
-try option unseen
 routed by r4 router
   envelope to: rd+CALLER@test.ex
   transport: <none>
@@ -649,7 +647,6 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=userz
 try option unseen
-try option unseen
 routed by r3 router
   envelope to: userz@test.ex
   transport: t2
@@ -688,7 +685,6 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=usery
 try option unseen
-try option unseen
 routed by r2 router
   envelope to: usery@test.ex
   transport: t1
@@ -720,7 +716,6 @@ domain = test.ex
   errors_to=NULL
   domain_data=NULL local_part_data=CALLER
 try option unseen
-try option unseen
 routed by r1 router
   envelope to: CALLER@test.ex
   transport: t1
@@ -840,6 +835,7 @@ try option message_suffix
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 journalling TESTSUITE/test-mail/junk:rd+usery@test.ex
 ft1 transport returned OK for TESTSUITE/test-mail/junk
 post-process TESTSUITE/test-mail/junk (0)
@@ -930,6 +926,7 @@ try option message_suffix
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 journalling TESTSUITE/test-mail/junk:rd+CALLER@test.ex
 ft1 transport returned OK for TESTSUITE/test-mail/junk
 post-process TESTSUITE/test-mail/junk (0)
@@ -964,6 +961,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1238 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 journalling CALLER@test.ex
 t1 transport returned OK for CALLER@test.ex
 post-process CALLER@test.ex (0)
@@ -1005,6 +1003,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 journalling usery@test.ex
 t1 transport returned OK for usery@test.ex
 post-process usery@test.ex (0)
@@ -1046,6 +1045,7 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   maildir_use_size_file=no
   locking by lockfile fcntl 
 search_tidyup called
+>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 journalling userz@test.ex
 t2 transport returned OK for userz@test.ex
 post-process userz@test.ex (0)
@@ -1057,18 +1057,18 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- userz@test.ex: no retry items
- usery@test.ex: no retry items
- CALLER@test.ex: no retry items
- TESTSUITE/test-mail/junk: no retry items
- rd+CALLER@test.ex: no retry items
- TESTSUITE/test-mail/junk: no retry items
- rd+usery@test.ex: no retry items
- rd+CALLER@test.ex: no retry items
- rd+usery@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userz@test.ex: no retry items
+  usery@test.ex: no retry items
+  CALLER@test.ex: no retry items
+  TESTSUITE/test-mail/junk: no retry items
+  rd+CALLER@test.ex: no retry items
+  TESTSUITE/test-mail/junk: no retry items
+  rd+usery@test.ex: no retry items
+  rd+CALLER@test.ex: no retry items
+  rd+usery@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r3
 DSN: processing successful delivery address: userz@test.ex