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 /test/confs | |
| parent | 36b600bb776d082be8cdd15c18daed3c29cfda7f (diff) | |
Testsuite: move dsearch-dependent testcase
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/0153 | 7 | ||||
| -rw-r--r-- | test/confs/2501 | 15 |
2 files changed, 15 insertions, 7 deletions
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 ------ |