Testsuite: munge for error message sizes in retry records

[exim.git] / test / stderr / 0234

diff --git a/test/stderr/0234 b/test/stderr/0234
index b7c44c7a9c6aadff4b0be98366c75bba4d001ae9..211211964c092d45fb8863590836d9e6a7222532 100644 (file)
--- a/test/stderr/0234
+++ b/test/stderr/0234
@@ -6,32 +6,62 @@
 >>> 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)
 >>> 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"
 >>> using ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 19)

 >>> check domains = +relay_domains
 >>> check domains = +relay_domains

->>> d in "@mx_any"? no (end of list)
+>>> d in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>   start sublist relay_domains
+>>>    d in "@mx_any"?
+>>>    ╎list element: @mx_any
+>>>    ╎check dnssec require list
+>>>    ╎check dnssec request list
+>>>    d in "@mx_any"? no (end of list)
+>>>   end sublist relay_domains

 >>> d in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> d in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 20)

 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+LOG: H=(test) [V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted

 >>> using ACL "check_recipient"
 >>> using ACL "check_recipient"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 19)

 >>> check domains = +relay_domains
 >>> check domains = +relay_domains

+>>> mxt1.test.ex in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>   start sublist relay_domains
+>>>    mxt1.test.ex in "@mx_any"?
+>>>    ╎list element: @mx_any
+>>>    ╎check dnssec require list
+>>>    ╎check dnssec request list

 >>> local host has lowest MX
 >>> 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")
+>>>    ╎mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>   end sublist relay_domains
+>>>  data from lookup saved for cache for +relay_domains: key 'mxt1.test.ex' value '@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"
 >>> 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
 >>> check domains = +relay_domains

+>>> mxt6.test.ex in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>   start sublist relay_domains
+>>>    mxt6.test.ex in "@mx_any"?
+>>>    ╎list element: @mx_any
+>>>    ╎check dnssec require list
+>>>    ╎check dnssec request list

 >>> local host in host list - removed hosts:
 >>>   ten-2.test.ex V4NET.0.0.2 6
 >>>   eximtesthost.test.ex ip4.ip4.ip4.ip4 6
 >>> local host in host list - removed hosts:
 >>>   ten-2.test.ex V4NET.0.0.2 6
 >>>   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")
+>>>    ╎mxt6.test.ex in "@mx_any"? yes (matched "@mx_any")
+>>>   end sublist relay_domains
+>>>  data from lookup saved for cache for +relay_domains: key 'mxt6.test.ex' value '@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
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT