Testsuite: testcases for rejected rcpt-callout-triggered cutthrough

[exim.git] / test / stderr / 0308

diff --git a/test/stderr/0308 b/test/stderr/0308
index 8d3bbf4202f18dcf7ded9b6620cd67f4b4bd1403..244f96c0f33db3b71f23c959df141c837bb7eb23 100644 (file)
--- a/test/stderr/0308
+++ b/test/stderr/0308
@@ -13,11 +13,12 @@
 >>> looking up host name for V4NET.0.0.97
 LOG: no host name found for IP address V4NET.0.0.97
 >>> host in "*.test.ex"? no (failed to find host name for V4NET.0.0.97)
 >>> looking up host name for V4NET.0.0.97
 LOG: no host name found for IP address V4NET.0.0.97
 >>> host in "*.test.ex"? no (failed to find host name for V4NET.0.0.97)

->>> accept: condition test failed
+>>> accept: condition test failed in ACL "acl_V4NET_0_0"

 >>> processing "accept"
 >>> check hosts = V4NET.0.0.97
 >>> host in "V4NET.0.0.97"? yes (matched "V4NET.0.0.97")
 >>> processing "accept"
 >>> check hosts = V4NET.0.0.97
 >>> host in "V4NET.0.0.97"? yes (matched "V4NET.0.0.97")

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "acl_V4NET_0_0"
+>>> end of ACL "acl_V4NET_0_0": ACCEPT

 >>> 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)


@@ -31,11 +32,9 @@ LOG: no host name found for IP address V4NET.0.0.97
 >>> check hosts = *.test.ex
 >>> sender host name required, to match against *.test.ex
 >>> looking up host name for V4NET.0.0.1
 >>> check hosts = *.test.ex
 >>> sender host name required, to match against *.test.ex
 >>> looking up host name for V4NET.0.0.1

->>> IP address lookup yielded ten-1.test.ex
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>>   name=ten-1.test.ex address=V4NET.0.0.1
+>>> IP address lookup yielded "ten-1.test.ex"

 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in "*.test.ex"? yes (matched "*.test.ex")
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in "*.test.ex"? yes (matched "*.test.ex")

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "acl_V4NET_0_0"
+>>> end of ACL "acl_V4NET_0_0": ACCEPT