Testsuite: TLS server testcase consolidation

[users/heiko/exim.git] / test / stderr / 0525

diff --git a/test/stderr/0525 b/test/stderr/0525
index 3eecf9ac5411379e82cae4f9fffc0d68d7d2e9cf..21bc7e06421222ee371520a07788f0e96e823bc4 100644 (file)
--- a/test/stderr/0525
+++ b/test/stderr/0525
@@ -3,7 +3,7 @@ LOG: smtp_connection MAIN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
 delivering 10HmaX-0005vi-00
 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
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected

   SMTP<< 220 Welcome
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 Hi
   SMTP<< 220 Welcome
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 Hi


@@ -14,9 +14,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP>> DATA
   SMTP<< 354 SEND
   SMTP>> writing message and terminating "."
   SMTP>> DATA
   SMTP<< 354 SEND
   SMTP>> writing message and terminating "."

+  SMTP(close)>>

 LOG: MAIN
 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
 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
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT