Debug: fix showing option name for list (vs. list content)

[exim.git] / test / stderr / 1000

diff --git a/test/stderr/1000 b/test/stderr/1000
index efd8de912cd3bce2891ada2a27c5f0ce419dd39a..65573e2452850f6e703db813b33396c4d3f2766b 100644 (file)
--- a/test/stderr/1000
+++ b/test/stderr/1000
@@ -7,21 +7,28 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_connect"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 21)
 >>> l_message: matched hostlist
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
->>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "2001:ab8:37f:20:0:0:0:1")
+>>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"?
+>>>  list element: 2001:ab8:37f:20:0:0:0:1
+>>>  host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "2001:ab8:37f:20:0:0:0:1")
 >>> warn: condition test succeeded in ACL "check_connect"
-LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist
->>> processing "accept"
+LOG: H=[2001:ab8:37f:20::1] Warning: matched hostlist
+>>> processing "accept" (TESTSUITE/test-config 24)
 >>> check condition = ${if eq{$sender_host_address}{2001:0ab8:037f:0020:0000:0000:0000:0001}}
->>>                 = true
->>> accept: condition test succeeded in ACL "check_connect"
->>> end of ACL "check_connect": ACCEPT
+>>>                 = 
+>>> accept: condition test failed in ACL "check_connect"
+>>> end of ACL "check_connect": implicit DENY
+LOG: H=[2001:ab8:37f:20::1] rejected connection in "connect" ACL
 >>> host in hosts_connection_nolog? no (option unset)
->>> host in host_lookup? yes (matched "*")
->>> looking up host name for V6NET:1234:0005:0006:0007:0008:0abc:000d
+>>> host in host_lookup?
+>>>  list element: *
+>>>  host in host_lookup? yes (matched "*")
+>>> looking up host name for V6NET:1234:5:6:7:8:abc:d
 >>> IP address lookup yielded "test3.ipv6.test.ex"
+>>> test3.ipv6.test.ex not in empty list (option unset? cannot trace name)
+>>> test3.ipv6.test.ex not in empty list (option unset? cannot trace name)
 >>> checking addresses for test3.ipv6.test.ex
 >>>   V6NET:1234:5:6:7:8:abc:d OK
 >>> host in host_reject_connection? no (option unset)
@@ -31,20 +38,23 @@ LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_connect"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 21)
 >>> l_message: matched hostlist
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
+>>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"?
+>>>  list element: 2001:ab8:37f:20:0:0:0:1
+>>>  list element: v6.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=v6.test.ex address=V6NET:ffff:836f:a00:a:800:200a:c032
 >>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? no (end of list)
 >>> warn: condition test failed in ACL "check_connect"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)
 >>> check condition = ${if eq{$sender_host_address}{2001:0ab8:037f:0020:0000:0000:0000:0001}}
 >>>                 = 
 >>> accept: condition test failed in ACL "check_connect"
 >>> end of ACL "check_connect": implicit DENY
-LOG: H=test3.ipv6.test.ex [V6NET:1234:0005:0006:0007:0008:0abc:000d] rejected connection in "connect" ACL
+LOG: H=test3.ipv6.test.ex [V6NET:1234:5:6:7:8:abc:d] rejected connection in "connect" ACL
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -54,18 +64,21 @@ LOG: H=test3.ipv6.test.ex [V6NET:1234:0005:0006:0007:0008:0abc:000d] rejected co
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_connect"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 21)
 >>> l_message: matched hostlist
 >>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
+>>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"?
+>>>  list element: 2001:ab8:37f:20:0:0:0:1
+>>>  list element: v6.test.ex
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=v6.test.ex address=V6NET:ffff:836f:a00:a:800:200a:c032
->>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "v6.test.ex")
+>>>  host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "v6.test.ex")
 >>> warn: condition test succeeded in ACL "check_connect"
-LOG: H=[V6NET:ffff:836f:0a00:000a:0800:200a:c032] Warning: matched hostlist
->>> processing "accept"
+LOG: H=[V6NET:ffff:836f:a00:a:800:200a:c032] Warning: matched hostlist
+>>> processing "accept" (TESTSUITE/test-config 24)
 >>> check condition = ${if eq{$sender_host_address}{2001:0ab8:037f:0020:0000:0000:0000:0001}}
 >>>                 = 
 >>> accept: condition test failed in ACL "check_connect"
 >>> end of ACL "check_connect": implicit DENY
-LOG: H=[V6NET:ffff:836f:0a00:000a:0800:200a:c032] rejected connection in "connect" ACL
+LOG: H=[V6NET:ffff:836f:a00:a:800:200a:c032] rejected connection in "connect" ACL