Testsuite: munge for error message sizes in retry records

[exim.git] / test / stderr / 0473

diff --git a/test/stderr/0473 b/test/stderr/0473
index 257af6c381c59da16a873c9701dc80cbf83cba10..177edbd526d2eb8a8882316dcaf1ded9b363969b 100644 (file)
--- a/test/stderr/0473
+++ b/test/stderr/0473
@@ -1,9 +1,11 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying r11@two.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -11,28 +13,34 @@ Considering r11@two.test.ex
 Attempting full verification using callout
 callout cache: found domain record for two.test.ex
 callout cache: no address record found for r11@two.test.ex
 Attempting full verification using callout
 callout cache: found domain record for two.test.ex
 callout cache: no address record found for r11@two.test.ex

-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+interface=NULL port=PORT_S
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+connected

   SMTP<< 220 Server ready
   SMTP>> EHLO the.local.host.name
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<r11@two.test.ex>
   SMTP<< 220 Server ready
   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
 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
   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
 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 ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying r11@two.test.ex
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -40,11 +48,15 @@ Considering r11@two.test.ex
 Attempting full verification using callout
 callout cache: found domain record for two.test.ex
 callout cache: no address record found for r11@two.test.ex
 Attempting full verification using callout
 callout cache: found domain record for two.test.ex
 callout cache: no address record found for r11@two.test.ex

-interface=NULL port=1224
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+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
 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
 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 >>>>>>>>>>>>>>>>