Testsuite: tidy spurious fails from TFO use
[exim.git] / test / confs / 0153
index 24f499b41f1603723632326dd22d23ebfa2c9d3b..60a9cb9a5d71ac99950ad7b25e46e127e85b5c3f 100644 (file)
@@ -13,16 +13,14 @@ begin routers
 virtual:
   driver = redirect
   domains = *.virt.test.ex
-  address_data = ${lookup {TESTNUM.alias.${extract {1}{.}{$domain}}} \
-                       dsearch{DIR/aux-fixed} {$value}fail}
-  data = ${lookup{$local_part}lsearch{DIR/aux-fixed/$address_data}}
+  data = ${lookup {$local_part} lsearch \
+               {${lookup {TESTNUM.alias.$1} dsearch,ret=full {DIR/aux-fixed} {$value}fail}}}
   no_more
 
 list:
   driver = redirect
   domains = list.test.ex
-  file = ${if exists{DIR/aux-fixed/TESTNUM.list.${bless:$local_part}} \
-            {DIR/aux-fixed/TESTNUM.list.${bless:$local_part}}fail}
+  file = ${lookup {TESTNUM.list.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   no_more
 
 real: