Testsuite: TLS server testcase consolidation

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

diff --git a/test/confs/0264 b/test/confs/0264
index aef8d87473e863534ede48449f0a054f11d703f0..9e16d1db61572c911ac3f5c518beb0ce039af456 100644 (file)
--- a/test/confs/0264
+++ b/test/confs/0264
@@ -1,14 +1,8 @@
 # Exim test configuration 0264
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -21,7 +15,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER
 
   quota = ${if eq{$local_part}{userx}{3}{10000}}
@@ -30,7 +24,7 @@ local_delivery:
 local_delivery2:
   driver = appendfile
   retry_use_local_part = false
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER
   quota = 3
   current_directory = /
@@ -69,6 +63,12 @@ r5:
   allow_defer
   data = :defer: not just now
 
+r_remain:
+  driver = redirect
+  allow_defer
+  data = :defer: not just now
+
+
 # ----- Retry -----
 
 begin retry