Testsuite: output changes resulting

[exim.git] / test / stderr / 0089

diff --git a/test/stderr/0089 b/test/stderr/0089
index 107944c7f939c4ebe43dbf261d8d3ba7fc309d9f..d03650f122a1b78f09878f75910b7ed6be0f484a 100644 (file)
--- a/test/stderr/0089
+++ b/test/stderr/0089
@@ -23,13 +23,13 @@ LOG: rejected HELO from [V4NET.0.0.0]: syntactically invalid argument(s): @#$%^&
 >>>    list element: @[]
 >>>   abc_xyz in helo_lookup_domains? no (end of list)
 >>>   using ACL "check_recipient"
->>>   processing "accept" (TESTSUITE/test-config 24)
+>>>   processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 >>>   check hosts = :
 >>>   host in ":"?
 >>>    list element: 
 >>>   host in ":"? no (end of list)
->>>   accept: condition test failed in ACL "check_recipient"
->>>   processing "accept" (TESTSUITE/test-config 25)
+>>>   accept: condition test failed in ACL check_recipient
+>>>   processing ACL check_recipient "accept" (TESTSUITE/test-config 25)
 >>>   check domains = +local_domains
 >>>   test.ex in "+local_domains"?
 >>>    list element: +local_domains
@@ -40,16 +40,16 @@ LOG: rejected HELO from [V4NET.0.0.0]: syntactically invalid argument(s): @#$%^&
 >>>     end sublist local_domains
 >>>    data from lookup saved for cache for +local_domains: key 'test.ex' value 'Test.ex'
 >>>    test.ex in "+local_domains"? yes (matched "+local_domains")
->>>   accept: condition test succeeded in ACL "check_recipient"
->>>   end of ACL "check_recipient": ACCEPT
+>>>   accept: condition test succeeded in ACL check_recipient
+>>>   end of ACL check_recipient: ACCEPT
 >>>   using ACL "check_recipient"
->>>   processing "accept" (TESTSUITE/test-config 24)
+>>>   processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 >>>   check hosts = :
 >>>   host in ":"?
 >>>    list element: 
 >>>   host in ":"? no (end of list)
->>>   accept: condition test failed in ACL "check_recipient"
->>>   processing "accept" (TESTSUITE/test-config 25)
+>>>   accept: condition test failed in ACL check_recipient
+>>>   processing ACL check_recipient "accept" (TESTSUITE/test-config 25)
 >>>   check domains = +local_domains
 >>>   else.where in "+local_domains"?
 >>>    list element: +local_domains
@@ -60,8 +60,8 @@ LOG: rejected HELO from [V4NET.0.0.0]: syntactically invalid argument(s): @#$%^&
 >>>    ╎ else.where in "Test.ex : myhost.test.EX"? no (end of list)
 >>>     end sublist local_domains
 >>>   else.where in "+local_domains"? no (end of list)
->>>   accept: condition test failed in ACL "check_recipient"
->>>   processing "accept" (TESTSUITE/test-config 26)
+>>>   accept: condition test failed in ACL check_recipient
+>>>   processing ACL check_recipient "accept" (TESTSUITE/test-config 26)
 >>>   check domains = +relay_domains
 >>>   else.where in "+relay_domains"?
 >>>    list element: +relay_domains
@@ -72,11 +72,11 @@ LOG: rejected HELO from [V4NET.0.0.0]: syntactically invalid argument(s): @#$%^&
 >>>    ╎ else.where in "Test.ex : Relay.one.ex"? no (end of list)
 >>>     end sublist relay_domains
 >>>   else.where in "+relay_domains"? no (end of list)
->>>   accept: condition test failed in ACL "check_recipient"
->>>   processing "deny" (TESTSUITE/test-config 27)
+>>>   accept: condition test failed in ACL check_recipient
+>>>   processing ACL check_recipient "deny" (TESTSUITE/test-config 27)
 >>>     message: relay not permitted
->>>   deny: condition test succeeded in ACL "check_recipient"
->>>   end of ACL "check_recipient": DENY
+>>>   deny: condition test succeeded in ACL check_recipient
+>>>   end of ACL check_recipient: DENY
 LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else.where>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
@@ -100,13 +100,13 @@ LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else
 >>>  list element: *N-99.test.ex
 >>>  host in helo_accept_junk_hosts? yes (matched "*N-99.test.ex")
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 24)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :
 >>> host in ":"?
 >>>  list element: 
 >>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 25)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 25)
 >>> check domains = +local_domains
 >>> relay.one.ex in "+local_domains"?
 >>>  list element: +local_domains
@@ -117,8 +117,8 @@ LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else
 >>>    relay.one.ex in "Test.ex : myhost.test.EX"? no (end of list)
 >>>   end sublist local_domains
 >>> relay.one.ex in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 26)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 26)
 >>> check domains = +relay_domains
 >>> relay.one.ex in "+relay_domains"?
 >>>  list element: +relay_domains
@@ -130,16 +130,16 @@ LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else
 >>>   end sublist relay_domains
 >>>  data from lookup saved for cache for +relay_domains: key 'relay.one.ex' value 'Relay.one.ex'
 >>>  relay.one.ex in "+relay_domains"? yes (matched "+relay_domains")
->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> accept: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: ACCEPT
 >>> using ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 24)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :
 >>> host in ":"?
 >>>  list element: 
 >>> host in ":"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 25)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 25)
 >>> check domains = +local_domains
 >>> relay.two.ex in "+local_domains"?
 >>>  list element: +local_domains
@@ -150,8 +150,8 @@ LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else
 >>>    relay.two.ex in "Test.ex : myhost.test.EX"? no (end of list)
 >>>   end sublist local_domains
 >>> relay.two.ex in "+local_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 26)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 26)
 >>> check domains = +relay_domains
 >>> relay.two.ex in "+relay_domains"?
 >>>  list element: +relay_domains
@@ -162,9 +162,9 @@ LOG: H=(abc_xyz) [V4NET.0.0.0] F=<userx@cus.cam.ac.uk> rejected RCPT <userx@else
 >>>    relay.two.ex in "Test.ex : Relay.one.ex"? no (end of list)
 >>>   end sublist relay_domains
 >>> relay.two.ex in "+relay_domains"? no (end of list)
->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 27)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "deny" (TESTSUITE/test-config 27)
 >>>   message: relay not permitted
->>> deny: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": DENY
+>>> deny: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: DENY
 LOG: H=ten-99.test.ex (@#$%^&*()) [V4NET.0.0.99] F=<root@myhost.test.ex> rejected RCPT <yy@relay.two.ex>: relay not permitted