Testsuite: avoid using STARTTLS in a non-TLS testcase

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

diff --git a/test/confs/2013 b/test/confs/2013
index 45d683cb4265e0e4106e60e73a58b9fad631901d..1a23887b361ee6ce3dc56b6f08996474191cdbe8 100644 (file)
--- a/test/confs/2013
+++ b/test/confs/2013
@@ -1,6 +1,7 @@
 # Exim test configuration 2013
 
 SERVER =
 # Exim test configuration 2013
 
 SERVER =

+PEX = :

 
 .include DIR/aux-var/tls_conf_prefix
 
 
 .include DIR/aux-var/tls_conf_prefix
 


@@ -29,6 +30,15 @@ tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 
 begin routers
 
 
 begin routers
 

+.ifdef REQUIRE
+cl_override:
+  driver = manualroute
+  route_data = HOSTIPV4
+  retry_use_local_part
+  transport = send_to_server
+  self = send
+.endif
+

 client:
   driver = accept
   condition = ${if eq {SERVER}{server}{no}{yes}}
 client:
   driver = accept
   condition = ${if eq {SERVER}{server}{no}{yes}}


@@ -54,8 +64,11 @@ local_delivery:
 send_to_server:
   driver = smtp
   allow_localhost
 send_to_server:
   driver = smtp
   allow_localhost

+  hosts_override

   hosts = 127.0.0.1
   hosts = 127.0.0.1

-  hosts_noproxy_tls = :

   port = PORT_D
   port = PORT_D

+  hosts_try_fastopen = :
+  hosts_noproxy_tls = PEX
+  tls_try_verify_hosts = :

 
 # End
 
 # End