Log: more info in ACL "warn statement skipped" message. Bug 2897

[exim.git] / test / stderr / 4052

diff --git a/test/stderr/4052 b/test/stderr/4052
index 93efa009aadfd4ccda210210cd543c31b2da8e2f..31baec047edd314a9ad5c87c5435b7489a111c50 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


@@ -15,8 +17,8 @@ smtp transport entered
 hostlist:
   '127.0.0.1' IP 127.0.0.1 port PORT_D
 checking retry status of 127.0.0.1
 hostlist:
   '127.0.0.1' IP 127.0.0.1 port PORT_D
 checking retry status of 127.0.0.1

-no host retry record
-no message retry record
+ no host retry record
+ no message retry record

 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 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
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 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


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


@@ -65,6 +68,7 @@ ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL
   SMTP(close)>>
 cmdlog: 'EHLO|:MAIL|:RCPT|:DATA:220:250-:250:250:354:.:QUIT+:250:220'
 Leaving smtp transport
   SMTP(close)>>
 cmdlog: 'EHLO|:MAIL|:RCPT|:DATA:220:250-:250:250:354:.:QUIT+:250:220'
 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