Tweak debug output

[exim.git] / test / stderr / 3404

diff --git a/test/stderr/3404 b/test/stderr/3404
index c1171586fbcaada282b7cb9d2ac2b967459c679a..1ba6a254013e30b67f2075136702c8e431fe1163 100644 (file)
--- a/test/stderr/3404
+++ b/test/stderr/3404
@@ -1,7 +1,7 @@
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local 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]:PORT_S ...  connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -15,10 +15,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 Recipient OK
   SMTP>> DATA
   SMTP<< 354 Send data
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
+  SMTP>> .
   SMTP<< 250 OK
   SMTP+> QUIT
+  SMTP(shutdown)>>
+  SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK"
 LOG: MAIN
@@ -26,7 +30,7 @@ LOG: MAIN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaY-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...  connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -40,10 +44,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 Recipient OK
   SMTP>> DATA
   SMTP<< 354 Send data
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
+  SMTP>> .
   SMTP<< 250 OK
   SMTP+> QUIT
+  SMTP(shutdown)>>
+  SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK"
 LOG: MAIN
@@ -51,7 +59,7 @@ LOG: MAIN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaZ-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...  connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -69,10 +77,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 Recipient OK
   SMTP>> DATA
   SMTP<< 354 Send data
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
+  SMTP>> .
   SMTP<< 250 OK
   SMTP+> QUIT
+  SMTP(shutdown)>>
+  SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:AUTH:300:********:300:********:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
 LOG: MAIN
   => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=login C="250 OK"
 LOG: MAIN