Avoid clearing first_delivery flag on the initial half of a 2-phase queue run

[users/heiko/exim.git] / test / confs / 0153

diff --git a/test/confs/0153 b/test/confs/0153
index 24f499b41f1603723632326dd22d23ebfa2c9d3b..35a004a455a859f1443874ed74d80af95df9fd2e 100644 (file)
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -13,9 +13,10 @@ begin routers
 virtual:
   driver = redirect
   domains = *.virt.test.ex
 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}}
+  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:
   no_more
 
 list: