Avoid sending DSN when message was accepted under fakereject or fakedefer. Bug 3016

[exim.git] / test / confs / 0015

diff --git a/test/confs/0015 b/test/confs/0015
index b1472da06cc78136a9c9d0cad077d5390264c21c..afd8144c59ae1bf14ac2ba2bee9d873c8638b386 100644 (file)
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -33,7 +33,7 @@ userforward:
   allow_filter
   local_parts = userx
   user = CALLER
   allow_filter
   local_parts = userx
   user = CALLER

-  file = DIR/aux-fixed/0015.filter.${bless:$local_part}
+  file = DIR/aux-fixed/0015.filter.userx

   local_part_prefix = *+
   local_part_prefix_optional
   pipe_transport = address_pipe
   local_part_prefix = *+
   local_part_prefix_optional
   pipe_transport = address_pipe


@@ -80,7 +80,8 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
   user = CALLER
   delivery_date_add
   envelope_to_add

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

   return_path_add
   headers_add = X-local_part: $local_part\n\
                 X-local_part_prefix: $local_part_prefix\n\
   return_path_add
   headers_add = X-local_part: $local_part\n\
                 X-local_part_prefix: $local_part_prefix\n\


@@ -91,7 +92,8 @@ local_delivery_b:
   user = CALLER
   delivery_date_add
   envelope_to_add
   user = CALLER
   delivery_date_add
   envelope_to_add

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

   return_path_add
   use_bsmtp
   headers_add = X-local_part: $local_part\n\
   return_path_add
   use_bsmtp
   headers_add = X-local_part: $local_part\n\