Testsuite: TLS client testcase consolidation

22 files changed, 5 insertions, 193 deletions

diff --git a/test/scripts/2000-GnuTLS/2008 b/test/scripts/1100-Basic-TLS/1150
index f22086a76..f22086a76 100644
--- a/test/scripts/2000-GnuTLS/2008
+++ b/test/scripts/1100-Basic-TLS/1150
diff --git a/test/scripts/1100-Basic-TLS/1103 b/test/scripts/1100-Basic-TLS/1151
index de97e32ef..de97e32ef 100644
--- a/test/scripts/1100-Basic-TLS/1103
+++ b/test/scripts/1100-Basic-TLS/1151
diff --git a/test/scripts/2000-GnuTLS/2007 b/test/scripts/1100-Basic-TLS/1152
index 280c426d2..280c426d2 100644
--- a/test/scripts/2000-GnuTLS/2007
+++ b/test/scripts/1100-Basic-TLS/1152
diff --git a/test/scripts/2000-GnuTLS/2009 b/test/scripts/1100-Basic-TLS/1153
index 69eb61d07..69eb61d07 100644
--- a/test/scripts/2000-GnuTLS/2009
+++ b/test/scripts/1100-Basic-TLS/1153
diff --git a/test/scripts/2000-GnuTLS/2013 b/test/scripts/1100-Basic-TLS/1157
index afbc9a6b7..afbc9a6b7 100644
--- a/test/scripts/2000-GnuTLS/2013
+++ b/test/scripts/1100-Basic-TLS/1157
diff --git a/test/scripts/2000-GnuTLS/2016 b/test/scripts/1100-Basic-TLS/1158
index 2da309d68..2da309d68 100644
--- a/test/scripts/2000-GnuTLS/2016
+++ b/test/scripts/1100-Basic-TLS/1158
diff --git a/test/scripts/2000-GnuTLS/2017 b/test/scripts/1100-Basic-TLS/1159
index af08df0b1..af08df0b1 100644
--- a/test/scripts/2000-GnuTLS/2017
+++ b/test/scripts/1100-Basic-TLS/1159
diff --git a/test/scripts/2000-GnuTLS/2021 b/test/scripts/1100-Basic-TLS/1161
index 5c402ce2c..5c402ce2c 100644
--- a/test/scripts/2000-GnuTLS/2021
+++ b/test/scripts/1100-Basic-TLS/1161
diff --git a/test/scripts/2000-GnuTLS/2038 b/test/scripts/1100-Basic-TLS/1163
index 650286814..650286814 100644
--- a/test/scripts/2000-GnuTLS/2038
+++ b/test/scripts/1100-Basic-TLS/1163
diff --git a/test/scripts/2100-OpenSSL/2151 b/test/scripts/1100-Basic-TLS/1164
index 19dfc6479..19dfc6479 100644
--- a/test/scripts/2100-OpenSSL/2151
+++ b/test/scripts/1100-Basic-TLS/1164
diff --git a/test/scripts/2000-GnuTLS/2091 b/test/scripts/1100-Basic-TLS/1165
index 58e5163c5..58e5163c5 100644
--- a/test/scripts/2000-GnuTLS/2091
+++ b/test/scripts/1100-Basic-TLS/1165
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/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/2100-OpenSSL/2107 b/test/scripts/2100-OpenSSL/2107
deleted file mode 100644
index 9317a5e86..000000000
--- a/test/scripts/2100-OpenSSL/2107
+++ /dev/null
@@ -1,10 +0,0 @@
-# TLS client: log_smtp_confirmation
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim userx@test.ex
-Test message
-****
-exim -qf
-****
-killdaemon
-no_msglog_check
diff --git a/test/scripts/2100-OpenSSL/2108 b/test/scripts/2100-OpenSSL/2108
deleted file mode 100644
index 43ca6cff0..000000000
--- a/test/scripts/2100-OpenSSL/2108
+++ /dev/null
@@ -1,14 +0,0 @@
-# TLS client: general
-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/2100-OpenSSL/2109 b/test/scripts/2100-OpenSSL/2109
deleted file mode 100644
index 85cb1300c..000000000
--- a/test/scripts/2100-OpenSSL/2109
+++ /dev/null
@@ -1,10 +0,0 @@
-# TLS client: hosts_avoid_tls
-exim -DSERVER=server -bd -oX PORT_D
-****
-exim userx@test.ex
-Test message
-****
-exim -qf
-****
-killdaemon
-no_msglog_check
diff --git a/test/scripts/2100-OpenSSL/2113 b/test/scripts/2100-OpenSSL/2113
deleted file mode 100644
index c1341e857..000000000
--- a/test/scripts/2100-OpenSSL/2113
+++ /dev/null
@@ -1,51 +0,0 @@
-# TLS client: multiple messages over one connection
-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/2100-OpenSSL/2116 b/test/scripts/2100-OpenSSL/2116
deleted file mode 100644
index a11125bfb..000000000
--- a/test/scripts/2100-OpenSSL/2116
+++ /dev/null
@@ -1,15 +0,0 @@
-# TLS client: timeout while setting up TLS
-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/2100-OpenSSL/2117 b/test/scripts/2100-OpenSSL/2117
deleted file mode 100644
index 2d7bffff1..000000000
--- a/test/scripts/2100-OpenSSL/2117
+++ /dev/null
@@ -1,14 +0,0 @@
-# TLS client: hosts_nopass_tls
-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/2100-OpenSSL/2121 b/test/scripts/2100-OpenSSL/2121
deleted file mode 100644
index 49ee4c14e..000000000
--- a/test/scripts/2100-OpenSSL/2121
+++ /dev/null
@@ -1,52 +0,0 @@
-# TLS client: 4xx response to STARTTLS
-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/2100-OpenSSL/2138 b/test/scripts/2100-OpenSSL/2138
deleted file mode 100644
index 79eaa2f31..000000000
--- a/test/scripts/2100-OpenSSL/2138
+++ /dev/null
@@ -1,17 +0,0 @@
-# TLS client: multiple messages over one connection (continue_more)
-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/2100-OpenSSL/2191 b/test/scripts/2100-OpenSSL/2191
deleted file mode 100644
index 86963f747..000000000
--- a/test/scripts/2100-OpenSSL/2191
+++ /dev/null
@@ -1,8 +0,0 @@
-# TLS client, CHUNKING transmission
-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