[exim-cvs] Testsuite: unbreak testcase

Commit:     32ef25152ecda2555eabe22a0c37ec398068dbba
Parent:     0006e6d8e151bb4b34452da30da60184736bb5ae
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu May 7 19:02:09 2020 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu May 7 19:02:09 2020 +0100

    Testsuite: unbreak testcase

    Broken-by: 0006e6d8e1
---
 test/confs/0153 | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/test/confs/0153 b/test/confs/0153
index 7b5f023..35a004a 100644
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -13,22 +13,17 @@ begin routers
 virtual:
   driver = redirect
   domains = *.virt.test.ex
-#  address_data = ${if match{$domain}{^(.*)\\.virt\\.test\\.ex\$}{${bless:$1}}}
-  address_data = $1
-#  data = ${if exists{DIR/aux-fixed/TESTNUM.alias.$address_data} \
-#           {${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.alias.$address_data}}} \
-#          fail}
-  data = ${lookup {TESTNUM.alias.$address_data} dsearch,ret=full {DIR/aux-fixed} \
-           {${lookup{$local_part}lsearch{$value}}} \
-       fail}
+  address_data = ${if match{$domain}{^(.*)\\.virt\\.test\\.ex\$}{${bless:$1}}}
+  data = ${if exists{DIR/aux-fixed/TESTNUM.alias.$address_data} \
+           {${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.alias.$address_data}}} \
+          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}
+  file = ${if exists{DIR/aux-fixed/TESTNUM.list.${bless:$local_part}} \
+            {DIR/aux-fixed/TESTNUM.list.${bless:$local_part}}fail}
   no_more