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

[exim.git] / test / stderr / 3211

diff --git a/test/stderr/3211 b/test/stderr/3211
index 2ae0bde590e9343e3b15eb3acf378636d9da8933..0b8f8c0cf13a36cd0e8dd2567af69748bc2efd71 100644 (file)
--- a/test/stderr/3211
+++ b/test/stderr/3211
@@ -6,6 +6,10 @@
 >>> 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_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check verify = recipient
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check verify = recipient


@@ -15,13 +19,17 @@
 >>> calling skipped router
 >>> skipped router declined for userx@test.again.dns
 >>> calling temp router
 >>> calling skipped router
 >>> skipped router declined for userx@test.again.dns
 >>> calling temp router

->>> test.again.dns in "*"? yes (matched "*")
+>>> test.again.dns in dnssec_require_domains? no (option unset)
+>>> test.again.dns in dnssec_request_domains?
+>>>  list element: *
+>>>  test.again.dns in dnssec_request_domains? yes (matched "*")

 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)

+>>> test.again.dns not in empty list (option unset? cannot trace name)

 >>> temp router: defer for userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "check_recipient"
 >>> temp router: defer for userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "check_recipient"

-LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.dns>: host lookup did not complete
+LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.dns>: host lookup did not complete

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -30,17 +38,27 @@ LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.d
 >>> 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_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing r1-userx@test.again.dns
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing r1-userx@test.again.dns

->>> test.again.dns in "!testdb;fail"? yes (end of list)
+>>> test.again.dns in domains?
+>>>  list element: !testdb;fail
+>>> test.again.dns in domains? yes (end of list)

 >>> calling r1 router
 >>> calling r1 router

->>> test.again.dns in "*"? yes (matched "*")
+>>> test.again.dns in dnssec_require_domains? no (option unset)
+>>> test.again.dns in dnssec_request_domains?
+>>>  list element: *
+>>>  test.again.dns in dnssec_request_domains? yes (matched "*")

 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)

+>>> test.again.dns not in empty list (option unset? cannot trace name)

 >>> r1 router: defer for r1-userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "check_recipient"
 >>> r1 router: defer for r1-userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "check_recipient"

-LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <r1-userx@test.again.dns>: host lookup did not complete
+LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <r1-userx@test.again.dns>: host lookup did not complete