Testsuite: avoid using STARTTLS in a non-TLS testcase

diff --git a/test/scripts/4050-pipe-conn/4052 b/test/scripts/4050-pipe-conn/4052
index c85fb5b085043af00793d1bf38d4723a953d5fcb..e9916800e0d2630f6862939de2b88ebd68b4deec 100644 (file)
--- a/test/scripts/4050-pipe-conn/4052
+++ b/test/scripts/4050-pipe-conn/4052
@@ -250,13 +250,16 @@ body
 # but it's the DB dump that matters.  Unfortunately the dump doesn't show
 # us the (binary) record content, only the key.  So you need to look at the
 # debug output after all.
 # but it's the DB dump that matters.  Unfortunately the dump doesn't show
 # us the (binary) record content, only the key.  So you need to look at the
 # debug output after all.

+# This server offers SIZE where the previous did not; we should see in
+# test-stderr a line "EHLO cleartext extensions changed" then another
+# "writing clr 0160/0000 cry 0000/0000"

 server PORT_D 1
 >220 banner
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
 >250-X_PIPE_CONNECT
 server PORT_D 1
 >220 banner
 <EHLO
 >250-esmtp-resp
 >250-PIPELINING
 >250-X_PIPE_CONNECT

->250-STARTTLS
+>250-SIZE

 >250 ok
 <MAIL
 >250 mail-from accepted
 >250 ok
 <MAIL
 >250 mail-from accepted

diff --git a/test/stderr/4052 b/test/stderr/4052
index 49e91f18a0d0ef972ca63010c31db83961d8ce8e..ee166097b67f7ac7ed2b62d010e83b3fb8b1f6f3 100644 (file)
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -37,10 +37,10 @@ smtp_reap_early_pipe expect ehlo
   SMTP<< 250-esmtp-resp
          250-PIPELINING
          250-X_PIPE_CONNECT
   SMTP<< 250-esmtp-resp
          250-PIPELINING
          250-X_PIPE_CONNECT

-         250-STARTTLS
+         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

diff --git a/test/stdout/4052 b/test/stdout/4052
index 84e21e2936a937a3b65b8de65d33835539a723bb..aa5d4a63982d4883dde4aafa6c68134125c08037 100644 (file)
--- a/test/stdout/4052
+++ b/test/stdout/4052
@@ -228,7 +228,7 @@ Connection request from [127.0.0.1]
 >250-esmtp-resp
 >250-PIPELINING
 >250-X_PIPE_CONNECT
 >250-esmtp-resp
 >250-PIPELINING
 >250-X_PIPE_CONNECT

->250-STARTTLS
+>250-SIZE

 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted