Testsuite: sort output of retry DB dumps

[exim.git] / test / stderr / 0143

diff --git a/test/stderr/0143 b/test/stderr/0143
index 5db549a535103ea0e1899c2da3a923d07dfeeb6a..054d65d28449f59e6556716d81c2fef053219a4b 100644 (file)
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -8,9 +8,11 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+router_name <my_main_router>

 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@domain.com <--------
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userx@domain.com <--------

-smtp transport entered
+transport_name <my_smtp>
+my_smtp transport entered

   userx@domain.com
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 status = usable
   userx@domain.com
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 status = usable


@@ -22,6 +24,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
          250-HELP
          250 AUTH LOGIN
 not using PIPELINING
          250-HELP
          250 AUTH LOGIN
 not using PIPELINING

+use_dsn=0

   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>


@@ -29,16 +32,16 @@ not using PIPELINING
   SMTP>> DATA
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
   SMTP>> DATA
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."

-writing data block fd=6 size=sss timeout=300
+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
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
 no messages waiting for 127.0.0.1
   SMTP>> QUIT
   SMTP<< 250 OK
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
 no messages waiting for 127.0.0.1
   SMTP>> QUIT

-Leaving smtp transport
+Leaving my_smtp transport

 LOG: MAIN
 LOG: MAIN

-  => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
+  => 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 >>>>>>>>>>>>>>>>
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>