Debug: tag client SMTP output with buffering qualifier

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

diff --git a/test/stderr/2135 b/test/stderr/2135
index ac524d2afc82614b5a18af4a59e5f1ee66a4fe85..95c3b784827fffc8901e67f437c9cefd6d2145c3 100644 (file)
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -3,8 +3,7 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-Transport port=25 replaced by host-specific port=1225
-Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:1225 ...  connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
@@ -26,49 +25,52 @@ cmd buf flush ddd bytes
          250 HELP
 using PIPELINING
 not using DSN
-  SMTP>> MAIL FROM:<usera@ok.example>
+  SMTP|> MAIL FROM:<usera@ok.example>
   SMTP>> RCPT TO:<userb@test.ex>
 cmd buf flush ddd bytes
+sync_responses expect mail
   SMTP<< 250 OK
+sync_responses expect rcpt for userb@test.ex
   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userb@test.ex <--------
 t1 transport entered
   userb@test.ex
 hostlist:
-  127.0.0.1:1225
+  '127.0.0.1' IP 127.0.0.1 port 1225
 already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
 checking status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@test.ex)
-Transport port=25 replaced by host-specific port=1225
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes
+sync_responses expect data
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP>> writing message and terminating "."
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300
   SMTP<< 250 OK id=10HmaY-0005vi-00
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
-  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 >>>>>>>>>>>>>>>>
 Leaving t1 transport
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
-  => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+  => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********