debug tidying

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

diff --git a/test/stderr/0143 b/test/stderr/0143
index cff499045200bded613e794c9400d245153a0412..d7bcb92e98fb40756188e4db4c3a7ce61bfaf476 100644 (file)
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -4,34 +4,49 @@ admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log

+fresh-exec forking for local-accept-delivery
+postfork: local-accept-delivery
+fresh-exec forked for local-accept-delivery: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 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 <--------
 router_name <my_main_router>
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@domain.com <--------

+local-accept-delivery forking for transport
+postfork: transport

 transport_name <my_smtp>
 my_smtp transport entered
   userx@domain.com
 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
 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)
 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
+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
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex

+cmd buf flush ddd bytes

   SMTP<< 250-OK
          250-HELP
          250 AUTH LOGIN
 not using PIPELINING
   SMTP<< 250-OK
          250-HELP
          250 AUTH LOGIN
 not using PIPELINING

-use_dsn=0
+not using DSN

   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>

+cmd buf flush ddd bytes

   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>
   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
   SMTP<< 250 Recipient OK
   SMTP>> DATA

+cmd buf flush ddd bytes
+sync_responses expect data

   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
   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
 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 +54,13 @@ transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
 no messages waiting for 127.0.0.1
   SMTP>> QUIT
   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)>>
+local-accept-delivery forked for transport: npppp

 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
 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 >>>>>>>>>>>>>>>>