Testsuite: better non-TFO-system debug handling

[users/heiko/exim.git] / test / stderr / 0143

diff --git a/test/stderr/0143 b/test/stderr/0143
index 3092135fdd44a7d1353f29ce18d23bf7bd947f0c..68180bdd43bd31bad528603b25f52d0d35cf2d0e 100644 (file)
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -8,6 +8,7 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+dropping to exim gid; retaining priv uid
 router_name <my_main_router>
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@domain.com <--------
@@ -15,9 +16,9 @@ transport_name <my_smtp>
 my_smtp transport entered
   userx@domain.com
 hostlist:
-  127.0.0.1:-1
+  '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/ip4.ip4.ip4.ip4 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
@@ -33,11 +34,14 @@ 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
@@ -52,5 +56,5 @@ 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 >>>>>>>>>>>>>>>>