Testsuite: munging

[exim.git] / test / stderr / 0445

diff --git a/test/stderr/0445 b/test/stderr/0445
index 5d49115dcce2a4affe3b3040abdb24127f2d7544..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


@@ -15,11 +15,12 @@
 >>> calling bad_addresses router
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------
 >>> calling bad_addresses router
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------

->>> deny: condition test succeeded
+>>> 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


@@ -27,6 +28,7 @@ LOG: H=[1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed
 >>> calling bad_addresses router
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------
 >>> calling bad_addresses router
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------

->>> deny: condition test succeeded
+>>> 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