tidying

[exim.git] / test / stderr / 4052

diff --git a/test/stderr/4052 b/test/stderr/4052
index 2e4a90bdd13c4e73d7d0f8689fd06dd5d8cb8b51..f902651497f4d426d5cfb81abf61d5f9748722b2 100644 (file)
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -1,9 +1,11 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user


@@ -14,12 +16,12 @@ smtp transport entered
   extchange@test.ex
 hostlist:
   '127.0.0.1' IP 127.0.0.1 port PORT_D
   extchange@test.ex
 hostlist:
   '127.0.0.1' IP 127.0.0.1 port PORT_D

-checking status of 127.0.0.1
+checking retry status of 127.0.0.1

 no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable

-delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex)
-Transport port=25 replaced by host-specific port=1225
+delivering 10HmbP-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (extchange@test.ex)
+Transport port=25 replaced by host-specific port=PORT_D

 EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000
 Using cached cleartext PIPECONNECT
   SMTP|> EHLO the.local.host.name
 EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000
 Using cached cleartext PIPECONNECT
   SMTP|> EHLO the.local.host.name


@@ -29,8 +31,9 @@ not using DSN
   SMTP|> RCPT TO:<extchange@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP|> RCPT TO:<extchange@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes

-Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... sending dd nonTFO early-data
- connected
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
+sending dd nonTFO early-data
+connected

 smtp_reap_early_pipe expect banner
   SMTP<< 220 banner
 smtp_reap_early_pipe expect ehlo
 smtp_reap_early_pipe expect banner
   SMTP<< 220 banner
 smtp_reap_early_pipe expect ehlo


@@ -63,8 +66,9 @@ cmd buf flush ddd bytes (more expected)
 ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL
   SMTP<< 220 bye
   SMTP(close)>>
 ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL
   SMTP<< 220 bye
   SMTP(close)>>

-cmdlog: 'EHLO|:MAIL|:RCPT|:DATA:220:250-:250:250:354:.:QUIT:250:220'
+cmdlog: 'EHLO|:MAIL|:RCPT|:DATA:220:250-:250:250:354:.:QUIT+:250:220'

 Leaving smtp transport
 Leaving smtp transport

+>>>>>>>>>>>>>>>> Exim pid=p1243 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
 LOG: MAIN
 LOG: MAIN
   => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
 LOG: MAIN