Debug: tag client SMTP output with buffering qualifier

[exim.git] / test / stderr / 1157

diff --git a/test/stderr/1157 b/test/stderr/1157
index 368ccc07d3fd5b37f718b8f86997093a270cdc07..321544e57dfe5f7359c433b73a699c9d447d8586 100644 (file)
--- a/test/stderr/1157
+++ b/test/stderr/1157
@@ -27,8 +27,8 @@ cmd buf flush ddd bytes
          250-8BITMIME
          250-PIPELINING
          250 HELP
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<userx@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<userx@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP<< 250 OK
@@ -45,8 +45,8 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<userz@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<userz@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP<< 250 OK
@@ -64,16 +64,16 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<usery@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<usery@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbC-0005vi-00
-  SMTP>> QUIT
-cmd buf flush ddd bytes
+  SMTP+> QUIT
+cmd buf flush ddd bytes (more expected)
   SMTP(close)>>
 >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
@@ -113,8 +113,8 @@ cmd buf flush ddd bytes
          250-8BITMIME
          250-PIPELINING
          250 HELP
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<usera@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<usera@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP<< 250 OK
@@ -131,8 +131,8 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<userc@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<userc@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP<< 250 OK
@@ -150,16 +150,16 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<userb@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<userb@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbI-0005vi-00
-  SMTP>> QUIT
-cmd buf flush ddd bytes
+  SMTP+> QUIT
+cmd buf flush ddd bytes (more expected)
   SMTP(close)>>
 >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
@@ -199,8 +199,8 @@ cmd buf flush ddd bytes
          250-8BITMIME
          250-PIPELINING
          250 HELP
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<userx@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<userx@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP<< 250 OK
@@ -236,8 +236,8 @@ cmd buf flush ddd bytes
          250-8BITMIME
          250-PIPELINING
          250 HELP
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<userz@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<userz@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP<< 250 OK
@@ -273,16 +273,16 @@ cmd buf flush ddd bytes
          250-8BITMIME
          250-PIPELINING
          250 HELP
-  SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
-  SMTP>> RCPT TO:<usery@test.ex>
+  SMTP|> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
+  SMTP|> RCPT TO:<usery@test.ex>
   SMTP>> DATA
 cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbO-0005vi-00
-  SMTP>> QUIT
-cmd buf flush ddd bytes
+  SMTP+> QUIT
+cmd buf flush ddd bytes (more expected)
   SMTP(close)>>
 LOG: MAIN
   => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbO-0005vi-00"