Cutthrough: option to use transport-defined mailfrom. Bug 3071

[exim.git] / test / stderr / 0402

diff --git a/test/stderr/0402 b/test/stderr/0402
index 8c4dda874a8a992c64f4c8af052ad3324e5ad60b..8251e156bfa8a15369c4b6f52dfecf26dfb178e3 100644 (file)
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -409,6 +409,7 @@ Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
+receive_msg: tidyup
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715dfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000
 Exim version x.yz ....
@@ -546,6 +547,9 @@ expanded: 'TESTSUITE/test-mail/junk'
 file is not a filter file
 parse_forward_list: TESTSUITE/test-mail/junk
 extract item: TESTSUITE/test-mail/junk
+try option errors_to
+try option headers_add
+try option headers_remove
 try option file_transport
 try option transport
 set transport ft1
@@ -555,8 +559,8 @@ r5 router generated TESTSUITE/test-mail/junk
   uid=unset gid=unset home=/non-exist/$local_part
 try option unseen
 routed by r5 router
-  envelope to: rd+usery@test.ex
-  transport: <none>
+  envelope to: rd+usery@test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing rd+CALLER@test.ex
 --------> r1 router <--------
@@ -604,6 +608,9 @@ expanded: 'TESTSUITE/test-mail/junk'
 file is not a filter file
 parse_forward_list: TESTSUITE/test-mail/junk
 extract item: TESTSUITE/test-mail/junk
+try option errors_to
+try option headers_add
+try option headers_remove
 try option file_transport
 try option transport
 set transport ft1
@@ -613,8 +620,8 @@ r4 router generated TESTSUITE/test-mail/junk
   uid=unset gid=unset home=/non-exist/CALLER
 try option unseen
 routed by r4 router
-  envelope to: rd+CALLER@test.ex
-  transport: <none>
+  envelope to: rd+CALLER@test.ex
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userz@test.ex
 --------> r1 router <--------
@@ -650,6 +657,9 @@ try option set
 calling r3 router
 r3 router called for userz@test.ex
   domain = test.ex
+try option errors_to
+try option headers_add
+try option headers_remove
 try option transport
 set transport t2
 queued for t2 transport: local_part = userz
@@ -658,8 +668,8 @@ domain = test.ex
   domain_data=NULL local_part_data=userz
 try option unseen
 routed by r3 router
-  envelope to: userz@test.ex
-  transport: t2
+  envelope to: userz@test.ex
+  transport:   t2
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing usery@test.ex
 --------> r1 router <--------
@@ -688,6 +698,9 @@ try option set
 calling r2 router
 r2 router called for usery@test.ex
   domain = test.ex
+try option errors_to
+try option headers_add
+try option headers_remove
 try option transport
 set transport t1
 queued for t1 transport: local_part = usery
@@ -696,8 +709,8 @@ domain = test.ex
   domain_data=NULL local_part_data=usery
 try option unseen
 routed by r2 router
-  envelope to: usery@test.ex
-  transport: t1
+  envelope to: usery@test.ex
+  transport:   t1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing CALLER@test.ex
 --------> r1 router <--------
@@ -719,6 +732,9 @@ try option set
 calling r1 router
 r1 router called for CALLER@test.ex
   domain = test.ex
+try option errors_to
+try option headers_add
+try option headers_remove
 try option transport
 set transport t1
 queued for t1 transport: local_part = CALLER
@@ -727,8 +743,8 @@ domain = test.ex
   domain_data=NULL local_part_data=CALLER
 try option unseen
 routed by r1 router
-  envelope to: CALLER@test.ex
-  transport: t1
+  envelope to: CALLER@test.ex
+  transport:   t1
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail/junk