[exim-cvs] Testsuite: move dsearch-dependent testcase

Gitweb: https://git.exim.org/exim.git/commitdiff/eb763a7aaf9ed36939193283153724eb2671c999

Commit:     eb763a7aaf9ed36939193283153724eb2671c999
Parent:     36b600bb776d082be8cdd15c18daed3c29cfda7f
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Mar 22 11:13:49 2020 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Mar 22 11:13:49 2020 +0000

    Testsuite: move dsearch-dependent testcase
---
 test/aux-fixed/2501.alias.exists |  1 +
 test/confs/0153                  |  7 ++++---
 test/confs/2501                  | 15 +++++++++++----
 test/scripts/2500-dsearch/2501   |  3 +++
 test/stdout/2501                 |  3 +++
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/test/aux-fixed/2501.alias.exists b/test/aux-fixed/2501.alias.exists
new file mode 100644
index 0000000..2bd57ca
--- /dev/null
+++ b/test/aux-fixed/2501.alias.exists
@@ -0,0 +1 @@
+yes: aliased@okdomain
diff --git a/test/confs/0153 b/test/confs/0153
index 24f499b..35a004a 100644
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -13,9 +13,10 @@ 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}}
+  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:
diff --git a/test/confs/2501 b/test/confs/2501
index b485b01..61bf738 100644
--- a/test/confs/2501
+++ b/test/confs/2501
@@ -14,10 +14,17 @@ domainlist local_domains = dsearch;DIR/aux-fixed/TESTNUM.domains
begin routers

 r1:
-  driver = accept
-  domains = +local_domains
-  transport = t1
-
+  driver =    accept
+  domains =    +local_domains
+  transport =    t1
+
+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}}
+  no_more

# ------ Transports ------

diff --git a/test/scripts/2500-dsearch/2501 b/test/scripts/2500-dsearch/2501
index 44b5308..d3b31a6 100644
--- a/test/scripts/2500-dsearch/2501
+++ b/test/scripts/2500-dsearch/2501
@@ -2,3 +2,6 @@
2
exim -bt xxx@okdomain yyy@notokdomain zzz@dom/mod
****
+2
+exim -bv yes@??? no@??? xx@???
+****
diff --git a/test/stdout/2501 b/test/stdout/2501
index 1199cdd..2534665 100644
--- a/test/stdout/2501
+++ b/test/stdout/2501
@@ -2,3 +2,6 @@ xxx@okdomain
router = r1, transport = t1
yyy@notokdomain is undeliverable: Unrouteable address
syntax error: malformed address: /mod may not follow zzz@dom
+yes@??? verified
+no@??? failed to verify: Unrouteable address
+xx@??? failed to verify: Unrouteable address