Testsuite: TLS server testcase consolidation

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

diff --git a/test/stderr/4052 b/test/stderr/4052
index 49e91f18a0d0ef972ca63010c31db83961d8ce8e..d4866ed885d7ee3ca183e498d8cead6e0a1edc1c 100644 (file)
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -36,11 +36,11 @@ smtp_reap_early_pipe expect banner
 smtp_reap_early_pipe expect ehlo
   SMTP<< 250-esmtp-resp
          250-PIPELINING
 smtp_reap_early_pipe expect ehlo
   SMTP<< 250-esmtp-resp
          250-PIPELINING

-         250-X_PIPE_CONNECT
-         250-STARTTLS
+         250-PIPE_CONNECT
+         250-SIZE

          250 ok
          250 ok

-EHLO cleartext extensions changed, 0x0120/0x0000 -> 0x0121/0x0000
-writing clr 0121/0000 cry 0000/0000
+EHLO cleartext extensions changed, 0x0120/0x0000 -> 0x0160/0x0000
+writing clr 0160/0000 cry 0000/0000

 sync_responses expect mail
   SMTP<< 250 mail-from accepted
 sync_responses expect rcpt
 sync_responses expect mail
   SMTP<< 250 mail-from accepted
 sync_responses expect rcpt


@@ -54,7 +54,8 @@ writing data block fd=dddd size=sss timeout=300
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1

-no messages waiting for 127.0.0.1
+ no messages waiting for 127.0.0.1
+transport_check_waiting: FALSE

   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP(close)>>


@@ -63,7 +64,7 @@ LOG: MAIN
   => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
 LOG: MAIN
   Completed
   => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted"
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 
 ******** SERVER ********
 
 ******** SERVER ********