Testsuite: TLS server testcase consolidation

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

diff --git a/test/confs/0504 b/test/confs/0504
index f604f5e5dc19c89f03406ff2c253dd5421c33e9c..d24fca96c2a945dd12bd0566b702a3fa9d245011 100644 (file)
--- a/test/confs/0504
+++ b/test/confs/0504
@@ -1,13 +1,8 @@
 # Exim test configuration 0504
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -18,7 +13,7 @@ begin routers
 
 r1:
   driver = accept
-  transport = $h_transport:
+  transport = OPT
 
 
 # ----- Transports -----
@@ -27,7 +22,7 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER
   transport_filter = /non/existent/file
 
@@ -40,6 +35,7 @@ t3:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
+  hosts_try_fastopen = :
   allow_localhost
   transport_filter = /non/existent/file