Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / stderr / 0143

diff --git a/test/stderr/0143 b/test/stderr/0143
index 054d65d28449f59e6556716d81c2fef053219a4b..7bc35aaf189ec3fd839242f5eb56629e2884fa30 100644 (file)
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -14,24 +14,33 @@ router_name <my_main_router>
 transport_name <my_smtp>
 my_smtp transport entered
   userx@domain.com
+hostlist:
+  '127.0.0.1' IP 127.0.0.1 port -1
 checking status of 127.0.0.1
-127.0.0.1 [127.0.0.1]:1111 status = usable
+127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com)
 Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
+cmd buf flush ddd bytes
   SMTP<< 250-OK
          250-HELP
          250 AUTH LOGIN
 not using PIPELINING
-use_dsn=0
+not using DSN
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
+cmd buf flush ddd bytes
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>
+cmd buf flush ddd bytes
+sync_responses expect rcpt
   SMTP<< 250 Recipient OK
   SMTP>> DATA
+cmd buf flush ddd bytes
+sync_responses expect data
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
+cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300
   SMTP<< 250 OK
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
@@ -39,10 +48,12 @@ transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
 no messages waiting for 127.0.0.1
   SMTP>> QUIT
+cmd buf flush ddd bytes
+  SMTP(close)>>
 Leaving my_smtp transport
 LOG: MAIN
   => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>