Make {bounce,warn}_message_file expanded. Bug 2522

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

diff --git a/test/confs/4560 b/test/confs/4560
index e2095af4cd2e4158e364799f0a6ae52cf9c140b5..8c5864b9a5f48a38017d4d80bead453e72ff637b 100644 (file)
--- a/test/confs/4560
+++ b/test/confs/4560
@@ -15,6 +15,7 @@ acl_smtp_data = check_data
 
 log_selector = +received_recipients +dkim_verbose
 queue_only
 
 log_selector = +received_recipients +dkim_verbose
 queue_only

+queue_run_in_order

 
 # ----- ACL -----
 begin acl
 
 # ----- ACL -----
 begin acl


@@ -77,7 +78,7 @@ begin transports
 
 tfile:
   driver =     appendfile
 
 tfile:
   driver =     appendfile

-  file =       DIR/test-mail/$local_part
+  file =       DIR/test-mail/${bless:$local_part}

   user =       CALLER
 
 tsmtp:
   user =       CALLER
 
 tsmtp:


@@ -86,8 +87,12 @@ tsmtp:
   port =       PORT_D
   allow_localhost
 .ifndef OPTION
   port =       PORT_D
   allow_localhost
 .ifndef OPTION

+.ifdef BAD
+  arc_sign =   $primary_hostname : sel : MISSING_KEY
+.else

   arc_sign =   $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private
 .endif
   arc_sign =   $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private
 .endif

+.endif

 
 tmlist:
   driver =     smtp
 
 tmlist:
   driver =     smtp