diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2020-03-22 11:13:49 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2020-03-22 11:13:49 +0000 |
| commit | eb763a7aaf9ed36939193283153724eb2671c999 (patch) | |
| tree | 9ea3241cb0828b45b6d9fec1e2225c53d5fb4a0b | |
| parent | 36b600bb776d082be8cdd15c18daed3c29cfda7f (diff) | |
| download | exim4-eb763a7aaf9ed36939193283153724eb2671c999.tar.gz | |
Testsuite: move dsearch-dependent testcase
| -rw-r--r-- | test/aux-fixed/2501.alias.exists | 1 | ||||
| -rw-r--r-- | test/confs/0153 | 7 | ||||
| -rw-r--r-- | test/confs/2501 | 15 | ||||
| -rw-r--r-- | test/scripts/2500-dsearch/2501 | 3 | ||||
| -rw-r--r-- | 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 000000000..2bd57ca95 --- /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 24f499b41..35a004a45 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 b485b0102..61bf7383b 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 44b5308eb..d3b31a668 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@exists.virt.test.ex no@exists.virt.test.ex xx@notexists.virt.test.ex +**** diff --git a/test/stdout/2501 b/test/stdout/2501 index 1199cdd1d..253466563 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@exists.virt.test.ex verified +no@exists.virt.test.ex failed to verify: Unrouteable address +xx@notexists.virt.test.ex failed to verify: Unrouteable address |