Testsuite: tidying

[exim.git] / test / confs / 0015

diff --git a/test/confs/0015 b/test/confs/0015
index dbbdfd059943ecfc444acc5e18a4243b1a6199fa..1381d7cd76a0ec7810a3838b3e82457e37544d90 100644 (file)
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -17,7 +17,7 @@ convert_to_real_name:
   allow_defer
   data = "\
     $local_part_prefix${lookup{$local_part}\
   allow_defer
   data = "\
     $local_part_prefix${lookup{$local_part}\

-    lsearch{DIR/aux-fixed/0015.realnames}{$value}fail}@$domain"
+    lsearch{DIR/aux-fixed/TESTNUM.realnames}{$value}fail}@$domain"

   local_part_prefix = *+
   local_part_prefix_optional
   retry_use_local_part
   local_part_prefix = *+
   local_part_prefix_optional
   retry_use_local_part


@@ -25,7 +25,7 @@ convert_to_real_name:
 #system_aliases:
 #  driver = redirect
 #  allow_defer
 #system_aliases:
 #  driver = redirect
 #  allow_defer

-#  data = ${lookup{$local_part}lsearch{DIR/aux-fixed/0015.aliases}}
+#  data = ${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.aliases}}

 #  retry_use_local_part
 
 userforward:
 #  retry_use_local_part
 
 userforward:


@@ -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.$local_part
+  file = DIR/aux-fixed/TESTNUM.filter.userx

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


@@ -81,9 +81,11 @@ 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
   headers_add = X-local_part: $local_part\n\
   return_path_add
   headers_add = X-local_part: $local_part\n\

-                X-local_part_prefix: $local_part_prefix
+                X-local_part_prefix: $local_part_prefix\n\
+                X-local_part_prefix_v: $local_part_prefix_v

 
 local_delivery_b:
   driver = appendfile
 
 local_delivery_b:
   driver = appendfile


@@ -91,10 +93,12 @@ local_delivery_b:
   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
   use_bsmtp
   headers_add = X-local_part: $local_part\n\
   return_path_add
   use_bsmtp
   headers_add = X-local_part: $local_part\n\

-                X-local_part_prefix: $local_part_prefix
+                X-local_part_prefix: $local_part_prefix\n\
+                X-local_part_prefix_v: $local_part_prefix_v

 
 delivery_s:
   driver = smtp
 
 delivery_s:
   driver = smtp