Testsuite: munge GnuTLS and OpenSSL ciphersuite strings to be more similar

[exim.git] / test / stderr / 0445

diff --git a/test/stderr/0445 b/test/stderr/0445
index f8b5c1d87a24c49ea823855e97efa1a315671d26..f493eda3367d607310252994d9bea508a960fd30 100644 (file)
--- a/test/stderr/0445
+++ b/test/stderr/0445
@@ -7,7 +7,7 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "rcpt"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "rcpt"

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

 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing lp1@x.y
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing lp1@x.y


@@ -16,10 +16,11 @@
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "rcpt"

+>>> end of ACL "rcpt": DENY

 LOG: H=[1.2.3.4] sender verify fail for <lp1@x.y>: 
 LOG: H=[1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed
 >>> using ACL "rcpt"
 LOG: H=[1.2.3.4] sender verify fail for <lp1@x.y>: 
 LOG: H=[1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed
 >>> using ACL "rcpt"

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

 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing lp2@x.y
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing lp2@x.y


@@ -28,5 +29,6 @@ LOG: H=[1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "rcpt"

+>>> end of ACL "rcpt": DENY

 LOG: H=[1.2.3.4] sender verify fail for <lp2@x.y>: This is a message
 LOG: H=[1.2.3.4] F=<lp2@x.y> rejected RCPT <zz@x.y>: Sender verify failed
 LOG: H=[1.2.3.4] sender verify fail for <lp2@x.y>: This is a message
 LOG: H=[1.2.3.4] F=<lp2@x.y> rejected RCPT <zz@x.y>: Sender verify failed