Testsuite: munge for non-dkim

[exim.git] / test / stderr / 0056

diff --git a/test/stderr/0056 b/test/stderr/0056
index a5a6ef3430f36ae49cdb93faf98717b340927c7d..ea8614cc2cf9b2894e88566f007a2bd78c0a678d 100644 (file)
--- a/test/stderr/0056
+++ b/test/stderr/0056
@@ -6,8 +6,6 @@
 >>> 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 pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -17,9 +15,12 @@
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  test.ex in "test.ex : myhost.ex"?
->>>   list element: test.ex
->>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex : myhost.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>   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
@@ -28,19 +29,24 @@
 >>> check domains = +local_domains
 >>> otherhost.example.com in "+local_domains"?
 >>>  list element: +local_domains
->>>  otherhost.example.com in "test.ex : myhost.ex"?
->>>   list element: test.ex
->>>   list element: myhost.ex
->>>  otherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    otherhost.example.com in "test.ex : myhost.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: myhost.ex
+>>>    otherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> otherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check domains = +relay_domains
 >>> otherhost.example.com in "+relay_domains"?
 >>>  list element: +relay_domains
->>>  otherhost.example.com in "*"?
->>>   list element: *
->>>   otherhost.example.com in "*"? yes (matched "*")
+>>>   start sublist relay_domains
+>>>    otherhost.example.com in "*"?
+>>>    ╎list element: *
+>>>    ╎otherhost.example.com in "*"? yes (matched "*")
+>>>   end sublist relay_domains
+>>>  data from lookup saved for cache for +relay_domains: key 'otherhost.example.com' value '*'
 >>>  otherhost.example.com in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
@@ -49,20 +55,25 @@
 >>> check domains = +local_domains
 >>> 3rdhost.example.com in "+local_domains"?
 >>>  list element: +local_domains
->>>  3rdhost.example.com in "test.ex : myhost.ex"?
->>>   list element: test.ex
->>>   list element: myhost.ex
->>>  3rdhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    3rdhost.example.com in "test.ex : myhost.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: myhost.ex
+>>>    3rdhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> 3rdhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> check domains = +relay_domains
 >>> 3rdhost.example.com in "+relay_domains"?
 >>>  list element: +relay_domains
->>>  3rdhost.example.com in "*"?
->>>   list element: *
->>>   3rdhost.example.com in "*"? yes (matched "*")
+>>>   start sublist relay_domains
+>>>    3rdhost.example.com in "*"?
+>>>    ╎list element: *
+>>>    ╎3rdhost.example.com in "*"? yes (matched "*")
+>>>   end sublist relay_domains
+>>>  data from lookup saved for cache for +relay_domains: key '3rdhost.example.com' value '*'
 >>>  3rdhost.example.com in "+relay_domains"? yes (matched "+relay_domains")
 >>> 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