Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0525

diff --git a/test/stderr/0525 b/test/stderr/0525
index 3eecf9ac5411379e82cae4f9fffc0d68d7d2e9cf..7c664e650cb5e6858f5cb94cd223bc2018c2916e 100644 (file)
--- a/test/stderr/0525
+++ b/test/stderr/0525
@@ -2,8 +2,9 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
-delivering 10HmaX-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
+delivering 10HmaX-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+connected
   SMTP<< 220 Welcome
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 Hi
@@ -13,10 +14,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 250 OK
   SMTP>> DATA
   SMTP<< 354 SEND
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
+  SMTP(close)>>
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354'
 LOG: MAIN
-  SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after sending data block (ddd bytes written): Connection timed out
+  H=127.0.0.1 [127.0.0.1]: SMTP timeout after sending data block (ddd bytes written): Connection timed out
 LOG: MAIN
-  == def@pqr R=r1 T=t1 defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after sending data block (ddd bytes written)
+  == def@pqr R=r1 T=t1 defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after sending data block (ddd bytes written)
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT