diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-12-16 13:33:26 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-12-16 13:33:26 +0000 |
| commit | 723f7bdb06013d9fabe5197151d25dda38832962 (patch) | |
| tree | 96a6d7832c610dd45c945081a403f508dd7cbd55 | |
| parent | 59620376be73c1ea2c73ccac5a0acff00a62cace (diff) | |
Testsuite: avoid using STARTTLS in a non-TLS testcase
| -rw-r--r-- | test/scripts/4050-pipe-conn/4052 | 5 | ||||
| -rw-r--r-- | test/stderr/4052 | 6 | ||||
| -rw-r--r-- | test/stdout/4052 | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/test/scripts/4050-pipe-conn/4052 b/test/scripts/4050-pipe-conn/4052 index c85fb5b08..e9916800e 100644 --- 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. +# 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 ->250-STARTTLS +>250-SIZE >250 ok <MAIL >250 mail-from accepted diff --git a/test/stderr/4052 b/test/stderr/4052 index 49e91f18a..ee166097b 100644 --- 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 - 250-STARTTLS + 250-SIZE 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 diff --git a/test/stdout/4052 b/test/stdout/4052 index 84e21e293..aa5d4a639 100644 --- 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-STARTTLS +>250-SIZE >250 ok <MAIL FROM:<CALLER@the.local.host.name> >250 mail-from accepted |