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

[exim.git] / test / stderr / 0333

diff --git a/test/stderr/0333 b/test/stderr/0333
index 8a7d6dd4200c07d35b48dbb493e7dbccaa495e93..c4f3ecff1fc63a27facece3451c56c68c331187d 100644 (file)
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -21,8 +21,8 @@ domain = no.delay
   errors_to=NULL
   domain_data=no.delay local_part_data=NULL
 routed by r1 router
   errors_to=NULL
   domain_data=no.delay local_part_data=NULL
 routed by r1 router

-  envelope to: ok@no.delay
-  transport: t1
+  envelope to: ok@no.delay
+  transport:   t1

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:


@@ -32,17 +32,11 @@ After routing:
   Deferred addresses:
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 >>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
   Deferred addresses:
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 >>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>

+fresh-exec becomes continued-delivery

 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
-Exim version x.yz ....
-Hints DB:
-configuration file is TESTSUITE/test-config
-trusted user
-admin user
-dropping to exim gid; retaining priv uid

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns


@@ -60,14 +54,13 @@ checking domains
 calling r1 router
 r1 router called for ok@no.delay
   domain = no.delay
 calling r1 router
 r1 router called for ok@no.delay
   domain = no.delay

-set transport t1

 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
   domain_data=no.delay local_part_data=NULL
 routed by r1 router
 queued for t1 transport: local_part = ok
 domain = no.delay
   errors_to=NULL
   domain_data=no.delay local_part_data=NULL
 routed by r1 router

-  envelope to: ok@no.delay
-  transport: t1
+  envelope to: ok@no.delay
+  transport:   t1

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:


@@ -77,7 +70,7 @@ After routing:
   Deferred addresses:
     delay@test.again.dns
 cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'
   Deferred addresses:
     delay@test.again.dns
 cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'

->>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"

->>>>>>>>>>>>>>>> Exim pid=p1236 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (continued-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>