Testsuite: more munge tweaks

[exim.git] / test / stderr / 0394

diff --git a/test/stderr/0394 b/test/stderr/0394
index 05e7714a8148f1538b8f88fd2d392b25cf9e8bf0..25b6353cf32b6854629b3912ee2b821ed30dbdbc 100644 (file)
--- a/test/stderr/0394
+++ b/test/stderr/0394
@@ -1,5 +1,7 @@
 >>> host in hosts_connection_nolog? no (option unset)
->>> host in host_lookup? yes (matched "*")
+>>> host in host_lookup?
+>>>  list element: *
+>>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>> IP address lookup yielded an empty name: treated as non-existent host name
 LOG: no host name found for IP address V4NET.255.255.255
@@ -10,12 +12,15 @@ LOG: no host name found for IP address V4NET.255.255.255
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = reverse_host_lookup
->>> require: condition test failed
+>>> require: condition test failed in ACL "connect"
+>>> end of ACL "connect": not OK
 LOG: H=[V4NET.255.255.255] rejected connection in "connect" ACL: host lookup failed (failed to find host name from IP address)
 >>> host in hosts_connection_nolog? no (option unset)
->>> host in host_lookup? yes (matched "*")
+>>> host in host_lookup?
+>>>  list element: *
+>>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>> IP address lookup yielded an empty name: treated as non-existent host name
 LOG: no host name found for IP address V4NET.255.255.255
@@ -26,28 +31,14 @@ LOG: no host name found for IP address V4NET.255.255.255
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
->>> processing "require"
->>> check verify = reverse_host_lookup/defer_ok
->>> require: condition test error
-LOG: H=[V4NET.255.255.255] temporarily rejected connection in "connect" ACL: unexpected '/' found in "reverse_host_lookup/defer_ok" (this verify item has no options)
->>> host in hosts_connection_nolog? no (option unset)
->>> host in host_lookup? yes (matched "*")
->>> looking up host name for V4NET.255.255.255
->>> IP address lookup yielded an empty name: treated as non-existent host name
-LOG: no host name found for IP address V4NET.255.255.255
->>> host in host_reject_connection? no (option unset)
->>> host in sender_unqualified_hosts? no (option unset)
->>> host in recipient_unqualified_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)
->>> using ACL "connect"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = certificate/defer_ok
->>> require: condition test error
+>>> require: condition test error in ACL "connect"
 LOG: H=[V4NET.255.255.255] temporarily rejected connection in "connect" ACL: unexpected '/' found in "certificate/defer_ok" (this verify item has no options)
 >>> host in hosts_connection_nolog? no (option unset)
->>> host in host_lookup? yes (matched "*")
+>>> host in host_lookup?
+>>>  list element: *
+>>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>> IP address lookup yielded an empty name: treated as non-existent host name
 LOG: no host name found for IP address V4NET.255.255.255
@@ -58,12 +49,14 @@ LOG: no host name found for IP address V4NET.255.255.255
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = helo/defer_ok
->>> require: condition test error
+>>> require: condition test error in ACL "connect"
 LOG: H=[V4NET.255.255.255] temporarily rejected connection in "connect" ACL: unexpected '/' found in "helo/defer_ok" (this verify item has no options)
 >>> host in hosts_connection_nolog? no (option unset)
->>> host in host_lookup? yes (matched "*")
+>>> host in host_lookup?
+>>>  list element: *
+>>>  host in host_lookup? yes (matched "*")
 >>> looking up host name for V4NET.255.255.255
 >>> IP address lookup yielded an empty name: treated as non-existent host name
 LOG: no host name found for IP address V4NET.255.255.255
@@ -74,7 +67,7 @@ LOG: no host name found for IP address V4NET.255.255.255
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "connect"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = header_syntax/defer_ok
->>> require: condition test error
+>>> require: condition test error in ACL "connect"
 LOG: H=[V4NET.255.255.255] temporarily rejected connection in "connect" ACL: unexpected '/' found in "header_syntax/defer_ok" (this verify item has no options)