Testsuite: output changes resulting

[exim.git] / test / stderr / 0569

diff --git a/test/stderr/0569 b/test/stderr/0569
index 813af15230c8e37586de39e6b11f89b8fd10eee0..706e61db5762b77ff7ea214ed2d71979231371ac 100644 (file)
--- a/test/stderr/0569
+++ b/test/stderr/0569
@@ -8,8 +8,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: @[]
@@ -36,7 +34,7 @@
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
-LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -47,8 +45,6 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=s
 >>> 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: @[]
@@ -73,7 +69,7 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=s
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
-LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found
+LOG: 10HmbA-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -84,8 +80,6 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> 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: @[]
@@ -112,7 +106,7 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
-LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found
+LOG: 10HmbB-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -123,8 +117,6 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected
 >>> 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: @[]
@@ -149,7 +141,7 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
-LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found
+LOG: 10HmbC-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -160,8 +152,6 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> 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: @[]
@@ -188,7 +178,7 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
-LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaY-000000005vi-0000 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -199,8 +189,6 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=s
 >>> 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: @[]
@@ -227,4 +215,4 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=s
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
-LOG: 10HmaZ-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaZ-000000005vi-0000 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss