From b3ce3e5440ea0ce5e3580aa9a0fa18c88214a286 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 25 Apr 2021 17:24:31 +0100
Subject: Testsuite: tidying

---
 test/stderr/0084 | 2 +-
 test/stderr/0297 | 8 ++++----
 test/stderr/0380 | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'test/stderr')

diff --git a/test/stderr/0084 b/test/stderr/0084
index 3f15cbc8f..7b93db7fb 100644
--- a/test/stderr/0084
+++ b/test/stderr/0084
@@ -17,7 +17,7 @@ file check: TESTSUITE/aux-fixed/0084.$local_part
 expanded file: TESTSUITE/aux-fixed/0084.yes
 stat() yielded 0
 calling forward router
-rda_interpret (file): 'TESTSUITE/aux-fixed/0084.${bless:$local_part}'
+rda_interpret (file): '${lookup {0084.$local_part} dsearch,ret=full {TESTSUITE/aux-fixed}}'
 expanded: 'TESTSUITE/aux-fixed/0084.yes'
 ssss bytes read from TESTSUITE/aux-fixed/0084.yes
 file is not a filter file
diff --git a/test/stderr/0297 b/test/stderr/0297
index 42db67a73..200f76ab4 100644
--- a/test/stderr/0297
+++ b/test/stderr/0297
@@ -8,8 +8,8 @@ routing /a/b/c@myhost.test.ex
 --------> r1 router <--------
 local_part=/a/b/c domain=myhost.test.ex
 calling r1 router
-rda_interpret (string): '${bless:$local_part}'
-expanded: '/a/b/c'
+rda_interpret (string): '$local_part'
+expanded: '/a/b/c' (tainted)
 file is not a filter file
 parse_forward_list: /a/b/c
 extract item: /a/b/c
@@ -32,8 +32,8 @@ routing /x/y/z@myhost.test.ex
 --------> r1 router <--------
 local_part=/x/y/z domain=myhost.test.ex
 calling r1 router
-rda_interpret (string): '${bless:$local_part}'
-expanded: '/x/y/z'
+rda_interpret (string): '$local_part'
+expanded: '/x/y/z' (tainted)
 file is not a filter file
 parse_forward_list: /x/y/z
 extract item: /x/y/z
diff --git a/test/stderr/0380 b/test/stderr/0380
index 4041acc95..b4a0af0ca 100644
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -33,7 +33,7 @@ r1 router skipped: local_parts mismatch
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
 calling r2 router
-rda_interpret (file): 'TESTSUITE/non-exist/${bless:$local_part}'
+rda_interpret (file): 'TESTSUITE/non-exist/bbbb'
 expanded: 'TESTSUITE/non-exist/bbbb'
 TESTSUITE/non-exist/bbbb does not exist
 ignore_enotdir set => skip checking parent directory
@@ -61,7 +61,7 @@ forced failure in expansion of "${if eq {a}{b}{x}fail}" (address_data): decline
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling r1 router
-rda_interpret (file): 'TESTSUITE/non-exist/${bless:$local_part}'
+rda_interpret (file): 'TESTSUITE/non-exist/aaaa'
 expanded: 'TESTSUITE/non-exist/aaaa'
 TESTSUITE/non-exist/aaaa does not exist
 checking parent directory
-- 
cgit v1.2.3