Testsuite: output changes resulting

[exim.git] / test / stderr / 0234

diff --git a/test/stderr/0234 b/test/stderr/0234
index 2a318e118e3d45db5b1a1142aed0ac60527965be..2a618bd17a8de2b2362da50913a59c19d65c8570 100644 (file)
--- a/test/stderr/0234
+++ b/test/stderr/0234
@@ -6,28 +6,48 @@
 >>> 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 "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +relay_domains
->>> d in "@mx_any"? no (end of list)
+>>> d in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  d in "@mx_any"?
+>>>   list element: @mx_any
+>>>  d in "@mx_any"? no (end of list)
 >>> d in "+relay_domains"? no (end of list)
->>> accept: condition test failed
->>> processing "deny"
->>> deny: condition test succeeded
-LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "deny" (TESTSUITE/test-config 20)
+>>>   message: relay not permitted
+>>> deny: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": DENY
+LOG: H=(test) [V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +relay_domains
+>>> mxt1.test.ex in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  mxt1.test.ex in "@mx_any"?
+>>>   list element: @mx_any
 >>> local host has lowest MX
->>> mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
->>> mxt1.test.ex in "+relay_domains"? yes (matched "+relay_domains")
->>> accept: condition test succeeded
+>>>   mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>  mxt1.test.ex in "+relay_domains"? yes (matched "+relay_domains")
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +relay_domains
+>>> mxt6.test.ex in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  mxt6.test.ex in "@mx_any"?
+>>>   list element: @mx_any
 >>> local host in host list - removed hosts:
->>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>>   ten-2.test.ex V4NET.0.0.2 6
->>> mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
->>> mxt6.test.ex in "+relay_domains"? yes (matched "+relay_domains")
->>> accept: condition test succeeded
+>>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
+>>>   mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>  mxt6.test.ex in "+relay_domains"? yes (matched "+relay_domains")
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT