Testsuite: tidying

[exim.git] / test / confs / 0101

diff --git a/test/confs/0101 b/test/confs/0101
index cf89fa83aa5f31d28bef33f11440b0abe7b6d25f..8fd0841cb26151f4de96b8b54cd50b0a7eb8768e 100644 (file)
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -25,11 +25,13 @@ all:
 mmdf_localuser:
   driver = accept
   local_part_prefix = mmdf-
 mmdf_localuser:
   driver = accept
   local_part_prefix = mmdf-

+  local_parts = userx

   transport = mmdf_local_delivery
 
 filtered_localuser:
   driver = accept
   local_part_prefix = filter-
   transport = mmdf_local_delivery
 
 filtered_localuser:
   driver = accept
   local_part_prefix = filter-

+  local_parts = userx

   transport = filtered_local_delivery
 
 bsmtp_localuser:
   transport = filtered_local_delivery
 
 bsmtp_localuser:


@@ -55,7 +57,7 @@ smtp:
 local_delivery:
   driver = pipe
   check_string = "From "
 local_delivery:
   driver = pipe
   check_string = "From "

-  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part'
+  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data'

   escape_string = ">From "
   user = CALLER
   current_directory = /
   escape_string = ">From "
   user = CALLER
   current_directory = /


@@ -63,7 +65,7 @@ local_delivery:
 bsmtp_local_delivery:
   driver = pipe
   use_bsmtp
 bsmtp_local_delivery:
   driver = pipe
   use_bsmtp

-  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part'
+  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data'

   delivery_date_add
   envelope_to_add
   return_path_add
   delivery_date_add
   envelope_to_add
   return_path_add


@@ -72,7 +74,7 @@ bsmtp_local_delivery:
 
 filtered_local_delivery:
   driver = pipe
 
 filtered_local_delivery:
   driver = pipe

-  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part'
+  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data'

   delivery_date_add
   envelope_to_add
   return_path_add
   delivery_date_add
   envelope_to_add
   return_path_add


@@ -83,7 +85,7 @@ filtered_local_delivery:
 mmdf_local_delivery:
   driver = pipe
   check_string = "\1\1\1\1\n"
 mmdf_local_delivery:
   driver = pipe
   check_string = "\1\1\1\1\n"

-  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part'
+  command = /bin/sh -c 'cat >>DIR/test-mail/$local_part_data'

   escape_string = "\1\1\1\1 \n"
   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"
   escape_string = "\1\1\1\1 \n"
   message_prefix = "\1\1\1\1\n"
   message_suffix = "\1\1\1\1\n"