Testsuite: munge for error message sizes in retry records

[exim.git] / test / stderr / 0017

diff --git a/test/stderr/0017 b/test/stderr/0017
index 4831e3e9af6b0a65e0bdbdcae561134e3df4e038..0562e173916dfc1b3a0123dc397552d3feeb4426 100644 (file)
--- a/test/stderr/0017
+++ b/test/stderr/0017
@@ -6,19 +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)
 >>> 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 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 "*")

 LOG: ETRN some.random.domain received from [1.1.1.1]
 >>> using ACL "check_etrn"
 LOG: ETRN some.random.domain received from [1.1.1.1]
 >>> using ACL "check_etrn"

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

 >>> check hosts = 10.9.8.7
 >>> check hosts = 10.9.8.7

+>>> host in "10.9.8.7"?
+>>>  list element: 10.9.8.7

 >>> host in "10.9.8.7"? no (end of list)
 >>> deny: condition test failed in ACL "check_etrn"
 >>> host in "10.9.8.7"? no (end of list)
 >>> deny: condition test failed in ACL "check_etrn"

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

 >>> check hosts = 10.9.8.8
 >>> check hosts = 10.9.8.8

+>>> host in "10.9.8.8"?
+>>>  list element: 10.9.8.8

 >>> host in "10.9.8.8"? no (end of list)
 >>> deny: condition test failed in ACL "check_etrn"
 >>> host in "10.9.8.8"? no (end of list)
 >>> deny: condition test failed in ACL "check_etrn"

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

 >>> check hosts = localhost
 >>> check hosts = localhost

+>>> host in "localhost"?
+>>>  list element: localhost

 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1


@@ -34,12 +42,16 @@ LOG: H=[1.1.1.1] rejected ETRN some.random.domain
 >>> 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)

->>> 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 "*")

 LOG: ETRN some.domain received from [10.9.8.7]
 >>> using ACL "check_etrn"
 LOG: ETRN some.domain received from [10.9.8.7]
 >>> using ACL "check_etrn"

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

 >>> check hosts = 10.9.8.7
 >>> check hosts = 10.9.8.7

->>> host in "10.9.8.7"? yes (matched "10.9.8.7")
+>>> host in "10.9.8.7"?
+>>>  list element: 10.9.8.7
+>>>  host in "10.9.8.7"? yes (matched "10.9.8.7")

 >>> check sender_domains = some.domain
 >>> deny: condition test error in ACL "check_etrn"
 LOG: H=[10.9.8.7] temporarily rejected ETRN some.domain: cannot test sender_domains condition in ETRN ACL
 >>> check sender_domains = some.domain
 >>> deny: condition test error in ACL "check_etrn"
 LOG: H=[10.9.8.7] temporarily rejected ETRN some.domain: cannot test sender_domains condition in ETRN ACL


@@ -51,16 +63,22 @@ LOG: H=[10.9.8.7] temporarily rejected ETRN some.domain: cannot test sender_doma
 >>> 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)

->>> 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 "*")

 LOG: ETRN some.domain received from [10.9.8.8]
 >>> using ACL "check_etrn"
 LOG: ETRN some.domain received from [10.9.8.8]
 >>> using ACL "check_etrn"

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

 >>> check hosts = 10.9.8.7
 >>> check hosts = 10.9.8.7

+>>> host in "10.9.8.7"?
+>>>  list element: 10.9.8.7

 >>> host in "10.9.8.7"? no (end of list)
 >>> deny: condition test failed in ACL "check_etrn"
 >>> host in "10.9.8.7"? no (end of list)
 >>> deny: condition test failed in ACL "check_etrn"

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

 >>> check hosts = 10.9.8.8
 >>> check hosts = 10.9.8.8

->>> host in "10.9.8.8"? yes (matched "10.9.8.8")
+>>> host in "10.9.8.8"?
+>>>  list element: 10.9.8.8
+>>>  host in "10.9.8.8"? yes (matched "10.9.8.8")

 >>> check senders = x@y
 >>> deny: condition test error in ACL "check_etrn"
 LOG: H=[10.9.8.8] temporarily rejected ETRN some.domain: cannot test senders condition in ETRN ACL
 >>> check senders = x@y
 >>> deny: condition test error in ACL "check_etrn"
 LOG: H=[10.9.8.8] temporarily rejected ETRN some.domain: cannot test senders condition in ETRN ACL