Testsuite: TLS client testcase consolidation

[exim.git] / test / stderr / 0524

diff --git a/test/stderr/0524 b/test/stderr/0524
index 22b7888dee48b2fcb3b5bc2c6160449d764963c0..5cf6da8e2cde4f0ae46dc50aa8a01768bd83b023 100644 (file)
--- a/test/stderr/0524
+++ b/test/stderr/0524
@@ -7,18 +7,22 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)

+>>> host in dsn_advertise_hosts? no (option unset)

 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

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

 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)

+>>> host in dsn_advertise_hosts? no (option unset)

 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

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

 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"


@@ -33,9 +37,11 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> csa1.test.ex in helo_lookup_domains? no (end of list)

+>>> host in dsn_advertise_hosts? no (option unset)

 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

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

 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"


@@ -43,9 +49,11 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization
 LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (client address mismatch)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)
 LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization failed (client address mismatch)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> csa2.test.ex in helo_lookup_domains? no (end of list)

+>>> host in dsn_advertise_hosts? no (option unset)

 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

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

 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"
 >>>   message: CSA status is $csa_status
 >>> check verify = csa
 >>> accept: condition test failed in ACL "check_mail"