Testsuite: more munge tweaks

[exim.git] / test / stderr / 0473

diff --git a/test/stderr/0473 b/test/stderr/0473
index a29575e169224285ae79e235912cb5895c6a2e3d..e3e8f01efa6a29c6533be3aa74d100a184fbef25 100644 (file)
--- a/test/stderr/0473
+++ b/test/stderr/0473
@@ -4,47 +4,57 @@ trusted user
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
+ in chunking_advertise_hosts? no (end of list)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying r11@two.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering r11@two.test.ex
 Attempting full verification using callout
-callout cache: found domain record
-callout cache: no address record found
-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+callout cache: found domain record for two.test.ex
+callout cache: no address record found for r11@two.test.ex
+interface=NULL port=PORT_S
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+connected
   SMTP<< 220 Server ready
-  SMTP>> HELO the.local.host.name
+  SMTP>> EHLO the.local.host.name
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<r11@two.test.ex>
+  SMTP(Connection timed out)<<
 SMTP timeout
-wrote callout cache domain record:
+  SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT'
+wrote callout cache domain record for two.test.ex:
   result=1 postmaster=0 random=0
 LOG: MAIN REJECT
-  U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout
+  U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<r11@two.test.ex>
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  SMTP connection from CALLER D=qqs closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
+ in chunking_advertise_hosts? no (end of list)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying r11@two.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering r11@two.test.ex
 Attempting full verification using callout
-callout cache: found domain record
-callout cache: no address record found
-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+callout cache: found domain record for two.test.ex
+callout cache: no address record found for r11@two.test.ex
+interface=NULL port=PORT_S
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+connected
+  SMTP(Connection timed out)<<
+  SMTP(close)>>
+cmdlog: '(unset)'
 SMTP timeout
 LOG: MAIN REJECT
-  U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout
+  U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after initial connection
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  SMTP connection from CALLER D=qqs closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>