Testsuite: TLS server testcase consolidation

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

diff --git a/test/stderr/2035 b/test/stderr/2035
index b836e5e5aaf5c33d9f82802bfe8048bb0776b8b8..5a69f577f9ed49a1a8cd5e4c5cbdd31fc2ce072b 100644 (file)
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -3,7 +3,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 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
 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


@@ -35,15 +34,9 @@ sync_responses expect rcpt
   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss
   SMTP<< 250 Accepted
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss

-fresh-exec forking for 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 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

-local-accept-delivery forking for tls-proxy-interproc
-tls-proxy-interproc forking for tls-proxy
-local-accept-delivery forked for tls-proxy-interproc: npppp
-tls-proxy-interproc forked for tls-proxy: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -51,7 +44,6 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userb@test.ex <--------
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> userb@test.ex <--------

-local-accept-delivery forking for transport

 t1 transport entered
   userb@test.ex
 hostlist:
 t1 transport entered
   userb@test.ex
 hostlist:


@@ -60,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)
 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
 continued connection, proxied TLS
   SMTP>> DATA
 cmd buf flush ddd bytes


@@ -74,7 +65,6 @@ 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(close)>>
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>

-local-accept-delivery forked for transport: npppp

 >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
 Leaving t1 transport
 LOG: MAIN
 >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>>
 Leaving t1 transport
 LOG: MAIN