Testsuite: avoid using STARTTLS in a non-TLS testcase

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

diff --git a/test/confs/2110 b/test/confs/2110
index dc16568328fe8b9191b27b717be299056d87a74c..cc4a7f03279a76fe71ee98dba7b1840251eb06a4 100644 (file)
--- a/test/confs/2110
+++ b/test/confs/2110
@@ -1,18 +1,16 @@
 # Exim test configuration 2110
 
 SERVER =
 # Exim test configuration 2110
 
 SERVER =

+HOSTS = 127.0.0.1 : HOSTIPV4
+
+.include DIR/aux-var/tls_conf_prefix

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+log_selector = +outgoing_port
+

 acl_smtp_rcpt = accept
 
 queue_only
 acl_smtp_rcpt = accept
 
 queue_only


@@ -44,8 +42,17 @@ begin transports
 send_to_server:
   driver = smtp
   allow_localhost
 send_to_server:
   driver = smtp
   allow_localhost

-  hosts = 127.0.0.1 : HOSTIPV4
-  hosts_require_tls = *
+  hosts = HOSTS

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_require_tls = *
+
+
+# ----- Retry -----
+
+begin retry
+
+* tls_required
+* *  F,1d,5m

 
 # End
 
 # End