tidying

[exim.git] / test / stderr / 0618

diff --git a/test/stderr/0618 b/test/stderr/0618
index 6b4ab92f983cc018f1b1fe4f1eab24d1ebb2a95a..ddc3d06c2daa78d8444b96213f549fdbb4a6bb2e 100644 (file)
--- a/test/stderr/0618
+++ b/test/stderr/0618
@@ -6,14 +6,12 @@
 >>> 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: 
 >>> tester in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> tester in helo_lookup_domains? no (end of list)
 >>> using ACL "chk_rcpt"
->>> processing "accept" (TESTSUITE/test-config 20)
+>>> processing ACL chk_rcpt "accept" (TESTSUITE/test-config 20)
 >>> check local_parts = lsearch;TESTSUITE/aux-fixed/0618.list
 >>> fred in "lsearch;TESTSUITE/aux-fixed/0618.list"?
 >>>  list element: lsearch;TESTSUITE/aux-fixed/0618.list
@@ -22,11 +20,11 @@
 >>> good1.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"?
 >>>  list element: lsearch;TESTSUITE/aux-fixed/0618.list
 >>>  good1.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
->>> accept: condition test succeeded in ACL "chk_rcpt"
->>> end of ACL "chk_rcpt": ACCEPT
-LOG: 10HmbA-0005vi-00 <= a@test.ex H=(tester) [99.99.99.99] P=smtp S=sss
+>>> accept: condition test succeeded in ACL chk_rcpt
+>>> end of ACL chk_rcpt: ACCEPT
+LOG: 10HmbA-000000005vi-0000 <= a@test.ex H=(tester) [99.99.99.99] P=smtp S=sss
 >>> using ACL "chk_rcpt"
->>> processing "accept" (TESTSUITE/test-config 20)
+>>> processing ACL chk_rcpt "accept" (TESTSUITE/test-config 20)
 >>> check local_parts = lsearch;TESTSUITE/aux-fixed/0618.list
 >>> jim in "lsearch;TESTSUITE/aux-fixed/0618.list"?
 >>>  list element: lsearch;TESTSUITE/aux-fixed/0618.list
@@ -35,8 +33,8 @@ LOG: 10HmbA-0005vi-00 <= a@test.ex H=(tester) [99.99.99.99] P=smtp S=sss
 >>> good2.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"?
 >>>  list element: lsearch;TESTSUITE/aux-fixed/0618.list
 >>>  good2.ex in "lsearch;TESTSUITE/aux-fixed/0618.list"? yes (matched "lsearch;TESTSUITE/aux-fixed/0618.list")
->>> accept: condition test succeeded in ACL "chk_rcpt"
->>> end of ACL "chk_rcpt": ACCEPT
-LOG: 10HmbB-0005vi-00 <= b@test.ex H=(tester) [99.99.99.99] P=smtp S=sss
+>>> accept: condition test succeeded in ACL chk_rcpt
+>>> end of ACL chk_rcpt: ACCEPT
+LOG: 10HmbB-000000005vi-0000 <= b@test.ex H=(tester) [99.99.99.99] P=smtp S=sss
 
 ******** SERVER ********