Fix handling of server which follows a RCPT 452 with a 250. Bug 26092

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

diff --git a/test/stderr/2135 b/test/stderr/2135
index a818a453179f47064a5776cde2a73a4ac9a41a57..2c9f064a494dd2264e8c94bc117b0ac4bd152660 100644 (file)
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -3,7 +3,6 @@ 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
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
@@ -31,22 +30,13 @@ not using DSN
 cmd buf flush ddd bytes
 sync_responses expect mail
   SMTP<< 250 OK
-sync_responses expect rcpt
+sync_responses expect rcpt for userb@test.ex
   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
-fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
-local-accept-delivery forking for tls-proxy-interproc
-postfork: tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-postfork: tls-proxy
-local-accept-delivery forked for tls-proxy-interproc: npppp
-tls-proxy-interproc forked for tls-proxy: npppp
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -54,8 +44,6 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userb@test.ex <--------
-local-accept-delivery forking for transport
-postfork: transport
 t1 transport entered
   userb@test.ex
 hostlist:
@@ -64,7 +52,6 @@ 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
@@ -76,15 +63,14 @@ 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
+cmd buf flush ddd bytes (more expected)
   SMTP(close)>>
-local-accept-delivery forked for transport: npppp
->>>>>>>>>>>>>>>> Exim pid=pppp (TLS proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
 Leaving t1 transport
 LOG: MAIN
   => 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 (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********