Testsuite: munge for non-dkim

[exim.git] / test / stderr / 0306

diff --git a/test/stderr/0306 b/test/stderr/0306
index ff95f973865f528ae81eda2d6c078d8997de8013..b2d3b50b3d1de70081b594ea372959379124ddd8 100644 (file)
--- a/test/stderr/0306
+++ b/test/stderr/0306
@@ -6,21 +6,33 @@
 >>> 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)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1-request@lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>> lists.test.ex in domains?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
 >>> calling r1 router
 >>> routed by r1 router
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing manager-list1@test.ex
->>> test.ex in "lists.test.ex"? no (end of list)
->>> test.ex in "lists.test.ex"? no (end of list)
->>> anywhere in ""? no (end of list)
->>> anyone@anywhere in ":"? no (end of list)
+>>> test.ex in domains?
+>>>  list element: lists.test.ex
+>>> test.ex in domains? no (end of list)
+>>> test.ex in domains?
+>>>  list element: lists.test.ex
+>>> test.ex in domains? no (end of list)
+>>> anyone@anywhere in senders?
+>>>  list element: 
+>>>  anywhere in ""?
+>>>  anywhere in ""? no (end of list)
+>>> anyone@anywhere in senders? no (end of list)
 >>> calling r5 router
 >>> routed by r5 router
 >>> ----------- end verify ------------
@@ -31,22 +43,34 @@
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1@lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
->>> sub1@test.ex in "lsearch;TESTSUITE/aux-fixed/0306/list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0306/list1")
+>>> lists.test.ex in domains?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
+>>> sub1@test.ex in senders?
+>>>  list element: lsearch;TESTSUITE/aux-fixed/0306/list1
+>>>  sub1@test.ex in senders? yes (matched "lsearch;TESTSUITE/aux-fixed/0306/list1")
 >>> calling r2 router
 >>> routed by r2 router
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": ACCEPT
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1@lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
->>> anyone@anywhere in "lsearch;TESTSUITE/aux-fixed/0306/list1"? no (end of list)
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>> lists.test.ex in domains?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
+>>> anyone@anywhere in senders?
+>>>  list element: lsearch;TESTSUITE/aux-fixed/0306/list1
+>>> anyone@anywhere in senders? no (end of list)
+>>> lists.test.ex in domains?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
 >>> calling r3 router
 >>> r3 router forced address failure
 >>> ----------- end verify ------------
@@ -58,12 +82,20 @@ LOG: H=(test) [1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>:
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing nonlist@lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
->>> anywhere in "*"? yes (matched "*")
->>> anyone@anywhere in "*"? yes (matched "*")
+>>> lists.test.ex in domains?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
+>>> anyone@anywhere in senders?
+>>>  list element: *
+>>>  anywhere in "*"?
+>>>   list element: *
+>>>   anywhere in "*"? yes (matched "*")
+>>>  anyone@anywhere in senders? yes (matched "*")
 >>> calling r2 router
 >>> r2 router declined for nonlist@lists.test.ex
->>> lists.test.ex in "lists.test.ex"? yes (matched "lists.test.ex")
+>>> lists.test.ex in domains?
+>>>  list element: lists.test.ex
+>>>  lists.test.ex in domains? yes (matched "lists.test.ex")
 >>> calling r3 router
 >>> r3 router forced address failure
 >>> ----------- end verify ------------