refactor

[exim.git] / test / confs / 0270

diff --git a/test/confs/0270 b/test/confs/0270
index e09ff0e761ae0a190b2acb2d48f85dab72432df1..7dae6d523dede6396338745c7f18ebd8aae8b5cf 100644 (file)
--- a/test/confs/0270
+++ b/test/confs/0270
@@ -15,7 +15,8 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

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

   user = CALLER
   envelope_to_add
   return_path_add
   user = CALLER
   envelope_to_add
   return_path_add


@@ -29,14 +30,14 @@ r1:
   skip_syntax_errors
   local_parts = ^list
   syntax_errors_to = postmaster@test.ex
   skip_syntax_errors
   local_parts = ^list
   syntax_errors_to = postmaster@test.ex

-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}

 
 r1a:
   driver = redirect
   skip_syntax_errors
   local_parts = ^nmlist
   syntax_errors_to = postmaster@test.ex
 
 r1a:
   driver = redirect
   skip_syntax_errors
   local_parts = ^nmlist
   syntax_errors_to = postmaster@test.ex

-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}

   no_more
 
 r2:
   no_more
 
 r2:


@@ -46,7 +47,7 @@ r2:
   syntax_errors_to = postmaster@test.ex
   syntax_errors_text = "There's an error in your filter file.\n\
                         The file has been ignored."
   syntax_errors_to = postmaster@test.ex
   syntax_errors_text = "There's an error in your filter file.\n\
                         The file has been ignored."

-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}

   allow_filter
   router_home_directory = DIR/
   user = CALLER
   allow_filter
   router_home_directory = DIR/
   user = CALLER