Testsuite: munge for error message sizes in retry records

[exim.git] / test / stderr / 0175

diff --git a/test/stderr/0175 b/test/stderr/0175
index 7aebc1d4a912a491027df021129ee35d811e5efa..afaf051372ee5ee5257b88f02288c679cc47c8ff 100644 (file)
--- a/test/stderr/0175
+++ b/test/stderr/0175
@@ -6,22 +6,27 @@
 >>> 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 "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing user@bad.domain
->>> list element: ! +local_domains
->>> list element: test.ex
->>> bad.domain in "test.ex"? no (end of list)
->>> bad.domain in "! +local_domains"? yes (end of list)
+>>> bad.domain in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>    bad.domain in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    bad.domain in "test.ex"? no (end of list)
+>>>   end sublist local_domains
+>>> bad.domain in domains? yes (end of list)
 >>> calling fail_sender router
->>> list element: bad.domain
->>> bad.domain in "bad.domain"? yes (matched "bad.domain")
+>>> bad.domain in "bad.domain"?
+>>>  list element: bad.domain
+>>>  bad.domain in "bad.domain"? yes (matched "bad.domain")
 >>> local host found for non-MX address
 >>> fully qualified name = localhost
 MUNGED: ::1 will be omitted in what follows
@@ -41,28 +46,38 @@ LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain> rejected RCPT <userx@test.ex>: S
 >>> 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 "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing user@bad.domain2
->>> list element: ! +local_domains
->>> list element: test.ex
->>> bad.domain2 in "test.ex"? no (end of list)
->>> bad.domain2 in "! +local_domains"? yes (end of list)
+>>> bad.domain2 in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>    bad.domain2 in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    bad.domain2 in "test.ex"? no (end of list)
+>>>   end sublist local_domains
+>>> bad.domain2 in domains? yes (end of list)
 >>> calling fail_sender router
->>> list element: bad.domain
+>>> bad.domain2 in "bad.domain"?
+>>>  list element: bad.domain
 >>> bad.domain2 in "bad.domain"? no (end of list)
 >>> fail_sender router declined for user@bad.domain2
->>> list element: ! +local_domains
->>> bad.domain2 in "! +local_domains"? yes (end of list)
+>>> bad.domain2 in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>  cached no match for +local_domains
+>>>  cached lookup data = NULL
+>>> bad.domain2 in domains? yes (end of list)
 >>> calling fail_sender2 router
->>> list element: bad.domain2
->>> bad.domain2 in "bad.domain2"? yes (matched "bad.domain2")
+>>> bad.domain2 in "bad.domain2"?
+>>>  list element: bad.domain2
+>>>  bad.domain2 in "bad.domain2"? yes (matched "bad.domain2")
 >>> local host found for non-MX address
 >>> fully qualified name = localhost
 MUNGED: ::1 will be omitted in what follows
@@ -81,43 +96,66 @@ LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>:
 >>> 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 "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing user@ten-1.test.ex
->>> list element: ! +local_domains
->>> list element: test.ex
->>> ten-1.test.ex in "test.ex"? no (end of list)
->>> ten-1.test.ex in "! +local_domains"? yes (end of list)
+>>> ten-1.test.ex in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>    ten-1.test.ex in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    ten-1.test.ex in "test.ex"? no (end of list)
+>>>   end sublist local_domains
+>>> ten-1.test.ex in domains? yes (end of list)
 >>> calling fail_sender router
->>> list element: bad.domain
+>>> ten-1.test.ex in "bad.domain"?
+>>>  list element: bad.domain
 >>> ten-1.test.ex in "bad.domain"? no (end of list)
 >>> fail_sender router declined for user@ten-1.test.ex
->>> list element: ! +local_domains
->>> ten-1.test.ex in "! +local_domains"? yes (end of list)
+>>> ten-1.test.ex in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>  cached no match for +local_domains
+>>>  cached lookup data = NULL
+>>> ten-1.test.ex in domains? yes (end of list)
 >>> calling fail_sender2 router
->>> list element: bad.domain2
+>>> ten-1.test.ex in "bad.domain2"?
+>>>  list element: bad.domain2
 >>> ten-1.test.ex in "bad.domain2"? no (end of list)
 >>> fail_sender2 router declined for user@ten-1.test.ex
->>> list element: ! +local_domains
->>> ten-1.test.ex in "! +local_domains"? yes (end of list)
+>>> ten-1.test.ex in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>  cached no match for +local_domains
+>>>  cached lookup data = NULL
+>>> ten-1.test.ex in domains? yes (end of list)
 >>> calling lookuphost router
->>> list element: *
->>> ten-1.test.ex in "*"? yes (matched "*")
+>>>  check dnssec require list
+>>>   ten-1.test.ex in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   ten-1.test.ex in dnssec_request_domains?
+>>>    list element: *
+>>>    ten-1.test.ex in dnssec_request_domains? yes (matched "*")
 >>> routed by lookuphost router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
->>> list element: +local_domains
->>> list element: test.ex
->>> test.ex in "test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex"? yes (matched "test.ex")
+>>>   end sublist local_domains
+>>>  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaX-0005vi-00 <= user@ten-1.test.ex H=(test) [V4NET.0.0.0] P=smtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= user@ten-1.test.ex H=(test) [V4NET.0.0.0] P=smtp S=sss