Testsuite: avoid cipher vs. cert validity problem

[users/heiko/exim.git] / test / confs / 2033

diff --git a/test/confs/2033 b/test/confs/2033
index 944c5e7ca0f13f8bd2134f9b52fa8070db867253..15e632a57d301bdf2d40b0d52b3ec230bb70eeba 100644 (file)
--- a/test/confs/2033
+++ b/test/confs/2033
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com
@@ -105,8 +100,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -117,8 +113,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -130,8 +127,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -145,6 +143,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen = :
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -158,6 +157,7 @@ send_to_server_req_failname:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen = :
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -172,6 +172,7 @@ send_to_server_req_passname:
   allow_localhost
   hosts = server1.example.com
   port = PORT_D
+  hosts_try_fastopen = :
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -186,6 +187,7 @@ send_to_server_req_failcarryon:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen = :
   tls_certificate = CERT2
   tls_privatekey = CERT2