refactor

[exim.git] / test / confs / 0102

diff --git a/test/confs/0102 b/test/confs/0102
index dde11a5e9e84aa600f23778723c7fd2dee0b2315..c73eed924919be14556966baffd8ee267dce7226 100644 (file)
--- a/test/confs/0102
+++ b/test/confs/0102
@@ -25,7 +25,9 @@ localuser:
   local_part_prefix = bsmtp_ : mmdf_
   local_part_prefix_optional
   retry_use_local_part
   local_part_prefix = bsmtp_ : mmdf_
   local_part_prefix_optional
   retry_use_local_part

-  transport = ${local_part_prefix}local_delivery
+  transport = ${if !def:local_part_prefix {} \
+               {${if eq {bsmtp_}{$local_part_prefix} {bsmtp_}\
+                       {${if eq {mmdf_}{$local_part_prefix} {mmdf_} {}}}}}}local_delivery

 
 
 # ----- Transports -----
 
 
 # ----- Transports -----


@@ -37,6 +39,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   file_format = "From       : local_delivery :\
                  MAIL       : bsmtp_local_delivery :\
                  \1\1\1\1\n : mmdf_local_delivery :\
   file_format = "From       : local_delivery :\
                  MAIL       : bsmtp_local_delivery :\
                  \1\1\1\1\n : mmdf_local_delivery :\


@@ -51,6 +54,7 @@ bsmtp_local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   return_path_add
   user = CALLER
 
   return_path_add
   user = CALLER
 


@@ -59,6 +63,7 @@ mmdf_local_delivery:
   check_string = "\1\1\1\1\n"
   escape_string = "\1\1\1\1 \n"
   file = DIR/test-mail/$local_part
   check_string = "\1\1\1\1\n"
   escape_string = "\1\1\1\1 \n"
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
   user = CALLER
   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
   user = CALLER