Testsuite: better restriction of parallel 2-stage-queue-runners

[users/jgh/exim.git] / test / confs / 0306

diff --git a/test/confs/0306 b/test/confs/0306
index 85117e017b5d826fce9bfb7c52030cdad298245e..779e155fc86e7601d8f5c63ca0dbc68e175626e7 100644 (file)
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -1,13 +1,8 @@
 # Exim test configuration 0306
 
-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 -----
 
@@ -32,14 +27,14 @@ r1:
   driver = redirect
   domains = lists.test.ex
   local_part_suffix = -request
-  file = DIR/aux-fixed/TESTNUM/$local_part$local_part_suffix
+  file = DIR/aux-fixed/TESTNUM/${bless:$local_part$local_part_suffix}
 
 r2:
   driver = redirect
   domains = lists.test.ex
   senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\
              {lsearch;DIR/aux-fixed/TESTNUM/$local_part}{*}}
-  file = DIR/aux-fixed/TESTNUM/$local_part
+  file = DIR/aux-fixed/TESTNUM/${bless:$local_part}
   forbid_pipe
   forbid_file
   one_time
@@ -69,7 +64,7 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   user = CALLER
 
 t2: