Report two-phase queue run in daemon startup log line

[exim.git] / test / stderr / 0058

diff --git a/test/stderr/0058 b/test/stderr/0058
index 82879698286509ca6f623565cfa5e3ff69f1eb16..68f177820ef668e12a0a91c03ebd04461a371cbc 100644 (file)
--- a/test/stderr/0058
+++ b/test/stderr/0058
@@ -6,29 +6,48 @@
 >>> 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 19)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> anotherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  anotherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = +relay_hosts
->>> host in "*"? yes (matched "*")
->>> host in "+relay_hosts"? yes (matched "+relay_hosts")
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "*"?
+>>>   list element: *
+>>>   host in "*"? yes (matched "*")
+>>>  host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> anotherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  anotherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = +relay_hosts
->>> host in "+relay_hosts"? yes (matched "+relay_hosts" - cached)
+>>> host in "+relay_hosts"?
+>>>  list element: +relay_hosts
+>>>  host in "+relay_hosts"? yes (matched "+relay_hosts" - cached)
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
-LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss