Testsuite: munge for non-dkim

[exim.git] / test / stderr / 0312

diff --git a/test/stderr/0312 b/test/stderr/0312
index 3ad7a53e93c8fee4363e30bda134c95a7203066c..b21ba57240a7b0c4f6f87f2858fd3d1904c43e9c 100644 (file)
--- a/test/stderr/0312
+++ b/test/stderr/0312
@@ -6,13 +6,18 @@
 >>> 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)

+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_rcpt"
 >>> using ACL "check_rcpt"

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

 >>> check dnslists = +defer_unknown : test.again.dns
 >>> check dnslists = +defer_unknown : test.again.dns

->>> DNS list check: +defer_unknown
->>> DNS list check: test.again.dns
+>>> dnslists check: +defer_unknown
+>>> dnslists check: test.again.dns

 >>> new DNS lookup for 1.0.0.V4NET.test.again.dns
 >>> 1.0.0.V4NET.test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> new DNS lookup for 1.0.0.V4NET.test.again.dns
 >>> 1.0.0.V4NET.test.again.dns in dns_again_means_nonexist? no (option unset)

+>>> dnslists: wrote cache entry, ttl=3600

 LOG: DNS list lookup defer (probably timeout) for 1.0.0.V4NET.test.again.dns: returned DEFER
 LOG: DNS list lookup defer (probably timeout) for 1.0.0.V4NET.test.again.dns: returned DEFER

->>> deny: condition test deferred
-LOG: H=[V4NET.0.0.1] F=<userx@x> temporarily rejected RCPT <userx@y>
+>>> deny: condition test deferred in ACL "check_rcpt"
+LOG: H=(test) [V4NET.0.0.1] F=<userx@x> temporarily rejected RCPT <userx@y>