Debug: clarify SMTP DATA ops in transport

[user/henk/code/exim.git] / test / stderr / 0218

diff --git a/test/stderr/0218 b/test/stderr/0218
index 2ff9c985fcedaffab1541d42645318263cfbeae2..a048735a20beab0a2943dba648ac4bbd3cf02588 100644 (file)
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -31,9 +31,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP<< 351 Send more
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
+  SMTP>> .
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:351:.:250'
 LOG: MAIN
   => a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK"
 LOG: MAIN
@@ -53,10 +55,14 @@ T: send_to_server  (ACL)
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP<< 351 Send more
-  SMTP>> writing message and terminating "."
-  SMTP<< 250 OK
+  SMTP>> (writing message)
+  SMTP>> .
   SMTP+> QUIT
+  SMTP(shutdown)>>
+  SMTP<< 250 OK
+  SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT:250:250'
 LOG: MAIN
   => b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
 LOG: MAIN
@@ -99,7 +105,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 503 Unexpected RCPT
   SMTP<< 503 Unexpected DATA
   SMTP+> QUIT
+  SMTP(shutdown)>>
+  SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:550:503:503:QUIT:250'
 LOG: MAIN
   ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@test.ex>: 550 NO
 Exim version x.yz ....
@@ -164,6 +173,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP>> RSET
   SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:550:503:RSET:250'
 LOG: MAIN
   ** b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Unknown
 Exim version x.yz ....
@@ -190,10 +200,14 @@ T: send_to_server  (ACL)
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP<< 351 OK
-  SMTP>> writing message and terminating "."
-  SMTP<< 250 OK
+  SMTP>> (writing message)
+  SMTP>> .
   SMTP+> QUIT
+  SMTP(shutdown)>>
+  SMTP<< 250 OK
+  SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT:250:250'
 LOG: MAIN
   => c@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"
 LOG: MAIN