Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0251

diff --git a/test/stderr/0251 b/test/stderr/0251
index 558b3675e82985f7a754b894d24455bfc4f0e5cb..816d4dd1a95043196c66f3dc0c821cfc636145d2 100644 (file)
--- a/test/stderr/0251
+++ b/test/stderr/0251
@@ -16,31 +16,31 @@
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing oklist@listr.test.ex
->>> listr.test.ex in "listr.test.ex"?
+>>> listr.test.ex in domains?
 >>>  list element: listr.test.ex
->>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
->>> ok@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"?
+>>>  listr.test.ex in domains? yes (matched "listr.test.ex")
+>>> ok@sender in senders?
 >>>  list element: TESTSUITE/aux-fixed/0251.restrict.oklist
 >>>  sender in "sender"?
 >>>   list element: sender
 >>>   sender in "sender"? yes (matched "sender")
->>>  ok@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"? yes (matched "ok@sender" in TESTSUITE/aux-fixed/0251.restrict.oklist)
+>>>  ok@sender in senders? yes (matched "ok@sender" in TESTSUITE/aux-fixed/0251.restrict.oklist)
 >>> calling exeter_listr router
 >>> routed by exeter_listr router
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing xxx@listr.test.ex
->>> listr.test.ex in "listr.test.ex"?
+>>> listr.test.ex in domains?
 >>>  list element: listr.test.ex
->>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
->>> ok@sender in "zzzz"?
+>>>  listr.test.ex in domains? yes (matched "listr.test.ex")
+>>> ok@sender in senders?
 >>>  list element: zzzz
 >>>  sender in "zzzz"?
 >>>   list element: zzzz
 >>>  sender in "zzzz"? no (end of list)
->>> ok@sender in "zzzz"? no (end of list)
->>> listr.test.ex in "listr.test.ex"?
+>>> ok@sender in senders? no (end of list)
+>>> listr.test.ex in domains?
 >>>  list element: listr.test.ex
->>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>>  listr.test.ex in domains? yes (matched "listr.test.ex")
 >>> calling exeter_listf router
 >>> routed by exeter_listf router
 >>> ----------- end verify ------------
@@ -49,10 +49,13 @@
 >>> check domains = +local_domains
 >>> listr.test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  listr.test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   list element: *.test.ex
->>>   listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>   start sublist local_domains
+>>>    listr.test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: *.test.ex
+>>>    ╎listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'listr.test.ex' value '*.test.ex'
 >>>  listr.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
@@ -62,15 +65,15 @@
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing oklist@listr.test.ex
->>> listr.test.ex in "listr.test.ex"?
+>>> listr.test.ex in domains?
 >>>  list element: listr.test.ex
->>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
->>> bad@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"?
+>>>  listr.test.ex in domains? yes (matched "listr.test.ex")
+>>> bad@sender in senders?
 >>>  list element: TESTSUITE/aux-fixed/0251.restrict.oklist
->>> bad@sender in "TESTSUITE/aux-fixed/0251.restrict.oklist"? no (end of list)
->>> listr.test.ex in "listr.test.ex"?
+>>> bad@sender in senders? no (end of list)
+>>> listr.test.ex in domains?
 >>>  list element: listr.test.ex
->>>  listr.test.ex in "listr.test.ex"? yes (matched "listr.test.ex")
+>>>  listr.test.ex in domains? yes (matched "listr.test.ex")
 >>> calling exeter_listf router
 >>> routed by exeter_listf router
 >>> ----------- end verify ------------
@@ -79,10 +82,13 @@
 >>> check domains = +local_domains
 >>> listr.test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  listr.test.ex in "test.ex : *.test.ex"?
->>>   list element: test.ex
->>>   list element: *.test.ex
->>>   listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>   start sublist local_domains
+>>>    listr.test.ex in "test.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: *.test.ex
+>>>    ╎listr.test.ex in "test.ex : *.test.ex"? yes (matched "*.test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'listr.test.ex' value '*.test.ex'
 >>>  listr.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT