From c2decce2cb31c21601da988ef6ef02bec9073bdd Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 20 Jan 2021 20:44:21 +0000 Subject: Testsuite: TLS client testcase consolidation --- test/scripts/2000-GnuTLS/2007 | 11 --------- test/scripts/2000-GnuTLS/2008 | 15 ------------ test/scripts/2000-GnuTLS/2009 | 11 --------- test/scripts/2000-GnuTLS/2013 | 52 ------------------------------------------ test/scripts/2000-GnuTLS/2016 | 16 ------------- test/scripts/2000-GnuTLS/2017 | 15 ------------ test/scripts/2000-GnuTLS/2021 | 53 ------------------------------------------- test/scripts/2000-GnuTLS/2033 | 6 ++++- test/scripts/2000-GnuTLS/2038 | 18 --------------- test/scripts/2000-GnuTLS/2051 | 1 - test/scripts/2000-GnuTLS/2091 | 9 -------- 11 files changed, 5 insertions(+), 202 deletions(-) delete mode 100644 test/scripts/2000-GnuTLS/2007 delete mode 100644 test/scripts/2000-GnuTLS/2008 delete mode 100644 test/scripts/2000-GnuTLS/2009 delete mode 100644 test/scripts/2000-GnuTLS/2013 delete mode 100644 test/scripts/2000-GnuTLS/2016 delete mode 100644 test/scripts/2000-GnuTLS/2017 delete mode 100644 test/scripts/2000-GnuTLS/2021 delete mode 100644 test/scripts/2000-GnuTLS/2038 delete mode 120000 test/scripts/2000-GnuTLS/2051 delete mode 100644 test/scripts/2000-GnuTLS/2091 (limited to 'test/scripts/2000-GnuTLS') diff --git a/test/scripts/2000-GnuTLS/2007 b/test/scripts/2000-GnuTLS/2007 deleted file mode 100644 index 280c426d2..000000000 --- a/test/scripts/2000-GnuTLS/2007 +++ /dev/null @@ -1,11 +0,0 @@ -# TLS client: log_smtp_confirmation -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message -**** -exim -qf -**** -killdaemon -no_msglog_check diff --git a/test/scripts/2000-GnuTLS/2008 b/test/scripts/2000-GnuTLS/2008 deleted file mode 100644 index f22086a76..000000000 --- a/test/scripts/2000-GnuTLS/2008 +++ /dev/null @@ -1,15 +0,0 @@ -# TLS client: general -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim CALLER@test.ex -Test message. Contains FF: ÿ -**** -exim CALLER@test.ex abcd@test.ex xyz@test.ex -Test message to two different hosts -**** -exim -v -qf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** diff --git a/test/scripts/2000-GnuTLS/2009 b/test/scripts/2000-GnuTLS/2009 deleted file mode 100644 index 69eb61d07..000000000 --- a/test/scripts/2000-GnuTLS/2009 +++ /dev/null @@ -1,11 +0,0 @@ -# TLS client: hosts_avoid_tls -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message -**** -exim -qf -**** -killdaemon -no_msglog_check diff --git a/test/scripts/2000-GnuTLS/2013 b/test/scripts/2000-GnuTLS/2013 deleted file mode 100644 index afbc9a6b7..000000000 --- a/test/scripts/2000-GnuTLS/2013 +++ /dev/null @@ -1,52 +0,0 @@ -# TLS client: multiple messages over one connection -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message 1 -**** -exim usery@test.ex -Test message 2 -**** -exim userz@test.ex -Test message 3 -**** -exim -d-all+acl -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** -# -exim -DSERVER=server -bd -oX PORT_D -**** -exim usera@test.ex -Test message 1 -**** -exim userb@test.ex -Test message 2 -**** -exim userc@test.ex -Test message 3 -**** -exim -DEQUIRE -d-all+acl -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** -# -# -# no tls proxy (default for test was permitting proxy) -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message 1 -**** -exim usery@test.ex -Test message 2 -**** -exim userz@test.ex -Test message 3 -**** -exim -d-all+acl '-DPEX=*' -qqf -**** -killdaemon diff --git a/test/scripts/2000-GnuTLS/2016 b/test/scripts/2000-GnuTLS/2016 deleted file mode 100644 index 2da309d68..000000000 --- a/test/scripts/2000-GnuTLS/2016 +++ /dev/null @@ -1,16 +0,0 @@ -# TLS client: timeout while setting up TLS -gnutls -server PORT_S -220 ESMTP -EHLO -250-OK -250-STARTTLS -250 HELP -STARTTLS -220 Go ahead -*sleep 2 -**** -exim -odi userx@domain1 -Test message -**** -no_msglog_check diff --git a/test/scripts/2000-GnuTLS/2017 b/test/scripts/2000-GnuTLS/2017 deleted file mode 100644 index af08df0b1..000000000 --- a/test/scripts/2000-GnuTLS/2017 +++ /dev/null @@ -1,15 +0,0 @@ -# TLS client: hosts_nopass_tls -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx@test.ex -Test message 1 -**** -exim userx@test.ex -Test message 2 -**** -exim -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** diff --git a/test/scripts/2000-GnuTLS/2021 b/test/scripts/2000-GnuTLS/2021 deleted file mode 100644 index 5c402ce2c..000000000 --- a/test/scripts/2000-GnuTLS/2021 +++ /dev/null @@ -1,53 +0,0 @@ -# TLS client: 4xx response to STARTTLS -gnutls -server PORT_S -220 ESMTP -EHLO -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -QUIT -250 OK -**** -exim -DTRYCLEAR=tls_tempfail_tryclear=false -odi x@y -**** -server PORT_S -220 ESMTP -EHLO -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -MAIL FROM: -250 OK -RCPT TO: -250 OK -DATA -354 Go ahead -. -250 OK -QUIT -250 OK -**** -exim -qf -**** -server PORT_S -220 ESMTP -EHLO -250-OK -250-HELP -250-STARTTLS -250 PIPELINING -STARTTLS -450 temp problem -QUIT -250 OK -**** -exim -DREQUIRE=hosts_require_tls=* -odi x@y -**** -no_msglog_check diff --git a/test/scripts/2000-GnuTLS/2033 b/test/scripts/2000-GnuTLS/2033 index f43d18de4..1559a7748 100644 --- a/test/scripts/2000-GnuTLS/2033 +++ b/test/scripts/2000-GnuTLS/2033 @@ -2,12 +2,16 @@ gnutls exim -DSERVER=server -bd -oX PORT_D **** +# this will fail to verify the cert at HOSTIPV4 and fallback to unencrypted +exim userq@test.ex +Testing +**** # this will fail to verify the cert name and fallback to unencrypted exim userr@test.ex Testing **** # this will pass the cert verify including name check -exim users@test.ex +exim user_s@test.ex Testing **** # this will fail to verify the cert name but carry on (try-verify mode) diff --git a/test/scripts/2000-GnuTLS/2038 b/test/scripts/2000-GnuTLS/2038 deleted file mode 100644 index 650286814..000000000 --- a/test/scripts/2000-GnuTLS/2038 +++ /dev/null @@ -1,18 +0,0 @@ -# TLS client: multiple messages over one connection (continue_more) -gnutls -exim -DSERVER=server -bd -oX PORT_D -**** -exim userx0@test.ex userx1@test.ex -Test message 1 -**** -exim usery0@test.ex usery1@test.ex -Test message 2 -**** -exim userz0@test.ex userz1@test.ex -Test message 3 -**** -exim -qqf -**** -killdaemon -exim -DSERVER=server -DNOTDAEMON -qf -**** diff --git a/test/scripts/2000-GnuTLS/2051 b/test/scripts/2000-GnuTLS/2051 deleted file mode 120000 index ac5066b61..000000000 --- a/test/scripts/2000-GnuTLS/2051 +++ /dev/null @@ -1 +0,0 @@ -../2100-OpenSSL/2151 \ No newline at end of file diff --git a/test/scripts/2000-GnuTLS/2091 b/test/scripts/2000-GnuTLS/2091 deleted file mode 100644 index 58e5163c5..000000000 --- a/test/scripts/2000-GnuTLS/2091 +++ /dev/null @@ -1,9 +0,0 @@ -# TLS client, CHUNKING transmission -gnutls -exim -DSERVER=server -DSRV=tls -bd -oX PORT_S -**** -exim -oMt this-user -f this-user -odf other-user@test.ex -Test message. Contains FF: ÿ -**** -killdaemon -no_msglog_check -- cgit v1.2.3