Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0325

diff --git a/test/stderr/0325 b/test/stderr/0325
index bce40924caec0b74fba1abb521df8168edd31b71..633a5b0abfca80a8a737fe4b304d399b8665b0cd 100644 (file)
--- a/test/stderr/0325
+++ b/test/stderr/0325
@@ -14,32 +14,50 @@ r4: $local_part_data = LOCAL PART DATA
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "a1"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +test_domains
->>> list element: +test_domains
->>> list element: lsearch; TESTSUITE/aux-fixed/0325.data
->>> a.b.c in "lsearch; TESTSUITE/aux-fixed/0325.data"? yes (matched "lsearch; TESTSUITE/aux-fixed/0325.data")
->>> a.b.c in "+test_domains"? yes (matched "+test_domains")
+>>> a.b.c in "+test_domains"?
+>>>  list element: +test_domains
+>>>   start sublist test_domains
+>>>    a.b.c in "lsearch; TESTSUITE/aux-fixed/0325.data"?
+>>>    ╎list element: lsearch;░TESTSUITE/aux-fixed/0325.data
+>>>    ╎a.b.c in "lsearch; TESTSUITE/aux-fixed/0325.data"? yes (matched "lsearch; TESTSUITE/aux-fixed/0325.data")
+>>>   end sublist test_domains
+>>>  data from lookup saved for cache for +test_domains: key 'a.b.c' value 'DOMAIN DATA'
+>>>  a.b.c in "+test_domains"? yes (matched "+test_domains")
 >>> check local_parts = +test_local_parts
->>> list element: +test_local_parts
->>> list element: lsearch;TESTSUITE/aux-fixed/0325.data
->>> xxx in "lsearch;TESTSUITE/aux-fixed/0325.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0325.data")
->>> xxx in "+test_local_parts"? yes (matched "+test_local_parts")
+>>> xxx in "+test_local_parts"?
+>>>  list element: +test_local_parts
+>>>   start sublist test_local_parts
+>>>    xxx in "lsearch;TESTSUITE/aux-fixed/0325.data"?
+>>>    ╎list element: lsearch;TESTSUITE/aux-fixed/0325.data
+>>>    ╎xxx in "lsearch;TESTSUITE/aux-fixed/0325.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0325.data")
+>>>   end sublist test_local_parts
+>>>  data from lookup saved for cache for +test_local_parts: key 'xxx' value 'LOCAL PART DATA'
+>>>  xxx in "+test_local_parts"? yes (matched "+test_local_parts")
 >>> check condition = ${if eq{$domain_data/$local_part_data}{DOMAIN DATA/LOCAL PART DATA}{no}{yes}}
 >>>                 = no
 >>> accept: condition test failed in ACL "a1"
 >>> processing "deny" (TESTSUITE/test-config 24)
 >>> check domains = +test_domains
->>> list element: +test_domains
->>> a.b.c in "+test_domains"? yes (matched "+test_domains" - cached)
+>>> a.b.c in "+test_domains"?
+>>>  list element: +test_domains
+>>>   start sublist test_domains
+>>>  cached yes match for +test_domains
+>>>  cached lookup data = DOMAIN DATA
+>>>  a.b.c in "+test_domains"? yes (matched "+test_domains" - cached)
 >>> check local_parts = +test_local_parts
->>> list element: +test_local_parts
->>> xxx in "+test_local_parts"? yes (matched "+test_local_parts" - cached)
+>>> xxx in "+test_local_parts"?
+>>>  list element: +test_local_parts
+>>>   start sublist test_local_parts
+>>>  cached yes match for +test_local_parts
+>>>  cached lookup data = LOCAL PART DATA
+>>>  xxx in "+test_local_parts"? yes (matched "+test_local_parts" - cached)
 >>>   message: \$domain_data=$domain_data \$local_part_data=$local_part_data
 >>> deny: condition test succeeded in ACL "a1"
 >>> end of ACL "a1": DENY