Testsuite: output changes resulting

[exim.git] / test / stderr / 0069

diff --git a/test/stderr/0069 b/test/stderr/0069
index 741ef0f075f05b021f504808d8a003ad7eb7fcff..5e878ad6cdf4258223ccacbf9a3d6eafed5a1b3e 100644 (file)
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -19,20 +19,20 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipientx"
->>> processing "accept" (TESTSUITE/test-config 24)
+>>> processing ACL check_recipientx "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :
 >>> host in ":"?
 >>>  list element: 
 >>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipientx"
->>> processing "deny" (TESTSUITE/test-config 25)
+>>> accept: condition test failed in ACL check_recipientx
+>>> processing ACL check_recipientx "deny" (TESTSUITE/test-config 25)
 >>> check hosts = +include_unknown : ^ten-1\\.test\\.ex
 >>> host in "+include_unknown : ^ten-1\.test\.ex"?
 >>>  list element: +include_unknown
 >>>  list element: ^ten-1\.test\.ex
 >>>  host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex")
->>> deny: condition test succeeded in ACL "check_recipientx"
->>> end of ACL "check_recipientx": DENY
+>>> deny: condition test succeeded in ACL check_recipientx
+>>> end of ACL check_recipientx: DENY
 LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -54,13 +54,13 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   list element: @[]
 >>>  test in helo_lookup_domains? no (end of list)
 >>>  using ACL "check_recipientx"
->>>  processing "accept" (TESTSUITE/test-config 24)
+>>>  processing ACL check_recipientx "accept" (TESTSUITE/test-config 24)
 >>>  check hosts = :
 >>>  host in ":"?
 >>>   list element: 
 >>>  host in ":"? no (end of list)
->>>  accept: condition test failed in ACL "check_recipientx"
->>>  processing "deny" (TESTSUITE/test-config 25)
+>>>  accept: condition test failed in ACL check_recipientx
+>>>  processing ACL check_recipientx "deny" (TESTSUITE/test-config 25)
 >>>  check hosts = +include_unknown : ^ten-1\\.test\\.ex
 >>>  host in "+include_unknown : ^ten-1\.test\.ex"?
 >>>   list element: +include_unknown
@@ -68,8 +68,8 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> sender host name required, to match against ^ten-1\.test\.ex
 >>>   host in "+include_unknown : ^ten-1\.test\.ex"? yes (failed to find host name for V4NET.0.0.13)
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
->>>   deny: condition test succeeded in ACL "check_recipientx"
->>>   end of ACL "check_recipientx": DENY
+>>>   deny: condition test succeeded in ACL check_recipientx
+>>>   end of ACL check_recipientx: DENY
 LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <x@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -91,18 +91,18 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   list element: @[]
 >>>  test in helo_lookup_domains? no (end of list)
 >>>  using ACL "check_recipienty"
->>>  processing "accept" (TESTSUITE/test-config 30)
+>>>  processing ACL check_recipienty "accept" (TESTSUITE/test-config 30)
 >>>  check hosts = not-exist.test.ex : V4NET.0.0.13
 >>>  host in "not-exist.test.ex : V4NET.0.0.13"?
 >>>   list element: not-exist.test.ex
 >>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>>   host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
->>>   accept: condition test failed in ACL "check_recipienty"
->>>   processing "deny" (TESTSUITE/test-config 31)
+>>>   accept: condition test failed in ACL check_recipienty
+>>>   processing ACL check_recipienty "deny" (TESTSUITE/test-config 31)
 >>>     message: "Denied"
->>>   deny: condition test succeeded in ACL "check_recipienty"
->>>   end of ACL "check_recipienty": DENY
+>>>   deny: condition test succeeded in ACL check_recipienty
+>>>   end of ACL check_recipienty: DENY
 LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -124,7 +124,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   list element: @[]
 >>>  test in helo_lookup_domains? no (end of list)
 >>>  using ACL "check_recipientz"
->>>  processing "accept" (TESTSUITE/test-config 34)
+>>>  processing ACL check_recipientz "accept" (TESTSUITE/test-config 34)
 >>>  check hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13
 >>>  host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"?
 >>>   list element: +ignore_unknown
@@ -134,8 +134,8 @@ LOG: no IP address found for host not-exist.test.ex (during SMTP connection from
 >>>   failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown
 >>>   list element: V4NET.0.0.13
 >>>   host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
->>>  accept: condition test succeeded in ACL "check_recipientz"
->>>  end of ACL "check_recipientz": ACCEPT
+>>>  accept: condition test succeeded in ACL check_recipientz
+>>>  end of ACL check_recipientz: ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -156,7 +156,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   list element: @[]
 >>>  test in helo_lookup_domains? no (end of list)
 >>>  using ACL "check_recipienty"
->>>  processing "accept" (TESTSUITE/test-config 30)
+>>>  processing ACL check_recipienty "accept" (TESTSUITE/test-config 30)
 >>>  check hosts = not-exist.test.ex : V4NET.0.0.13
 >>>  host in "not-exist.test.ex : V4NET.0.0.13"?
 >>>   list element: not-exist.test.ex
@@ -164,11 +164,11 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>>   host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 LOG: list matching forced to fail: failed to find IP address for not-exist.test.ex
->>>   accept: condition test failed in ACL "check_recipienty"
->>>   processing "deny" (TESTSUITE/test-config 31)
+>>>   accept: condition test failed in ACL check_recipienty
+>>>   processing ACL check_recipienty "deny" (TESTSUITE/test-config 31)
 >>>     message: "Denied"
->>>   deny: condition test succeeded in ACL "check_recipienty"
->>>   end of ACL "check_recipienty": DENY
+>>>   deny: condition test succeeded in ACL check_recipienty
+>>>   end of ACL check_recipienty: DENY
 LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -190,13 +190,13 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   list element: @[]
 >>>  test in helo_lookup_domains? no (end of list)
 >>>  using ACL "check_recipienta"
->>>  processing "accept" (TESTSUITE/test-config 38)
+>>>  processing ACL check_recipienta "accept" (TESTSUITE/test-config 38)
 >>>  check hosts = :
 >>>  host in ":"?
 >>>   list element: 
 >>>  host in ":"? no (end of list)
->>>  accept: condition test failed in ACL "check_recipienta"
->>>  processing "deny" (TESTSUITE/test-config 39)
+>>>  accept: condition test failed in ACL check_recipienta
+>>>  processing ACL check_recipienta "deny" (TESTSUITE/test-config 39)
 >>>  check hosts = +include_defer : test.again.dns
 >>>  host in "+include_defer : test.again.dns"?
 >>>   list element: +include_defer
@@ -205,8 +205,8 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 LOG: DNS lookup of "test.again.dns" deferred: accepted by +include_defer
->>>   deny: condition test succeeded in ACL "check_recipienta"
->>>   end of ACL "check_recipienta": DENY
+>>>   deny: condition test succeeded in ACL check_recipienta
+>>>   end of ACL check_recipienta: DENY
 LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -228,7 +228,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   list element: @[]
 >>>  test in helo_lookup_domains? no (end of list)
 >>>  using ACL "check_recipientb"
->>>  processing "accept" (TESTSUITE/test-config 44)
+>>>  processing ACL check_recipientb "accept" (TESTSUITE/test-config 44)
 >>>  check hosts = test.again.dns : V4NET.0.0.13
 >>>  host in "test.again.dns : V4NET.0.0.13"?
 >>>   list element: test.again.dns
@@ -236,7 +236,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
 >>>   test.again.dns in dns_again_means_nonexist? no (option unset)
 >>>  host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
->>>  accept: condition test deferred in ACL "check_recipientb"
+>>>  accept: condition test deferred in ACL check_recipientb
 LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>: DNS lookup of "test.again.dns" deferred
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -258,7 +258,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   list element: @[]
 >>>  test in helo_lookup_domains? no (end of list)
 >>>  using ACL "check_recipientc"
->>>  processing "accept" (TESTSUITE/test-config 48)
+>>>  processing ACL check_recipientc "accept" (TESTSUITE/test-config 48)
 >>>  check hosts = +ignore_defer : test.again.dns : V4NET.0.0.13
 >>>  host in "+ignore_defer : test.again.dns : V4NET.0.0.13"?
 >>>   list element: +ignore_defer
@@ -269,5 +269,5 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>>   DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer
 >>>   list element: V4NET.0.0.13
 >>>   host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
->>>  accept: condition test succeeded in ACL "check_recipientc"
->>>  end of ACL "check_recipientc": ACCEPT
+>>>  accept: condition test succeeded in ACL check_recipientc
+>>>  end of ACL check_recipientc: ACCEPT