Testsuite: output changes resulting

[exim.git] / test / stderr / 0609

diff --git a/test/stderr/0609 b/test/stderr/0609
index 6a801a29983183e525ee07c441161817aebd6847..f80f2889510b3a7a72c97bea0e8d531e37efd4a0 100644 (file)
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -22,13 +22,13 @@ p1235 Process p1235 is handling incoming connection from [127.0.0.1]
 p1235 Process p1235 is ready for new message
 p1235 test in helo_lookup_domains? no (end of list)
 p1235 using ACL "delay4_accept"
 p1235 Process p1235 is ready for new message
 p1235 test in helo_lookup_domains? no (end of list)
 p1235 using ACL "delay4_accept"

-p1235 processing "accept" (TESTSUITE/test-config 24)
+p1235 processing ACL delay4_accept "accept" (TESTSUITE/test-config 24)

 p1235 check delay = 4s
 p1235 delay modifier requests 4-second delay
 1 SMTP accept process running
 Listening...
 p1235 check delay = 4s
 p1235 delay modifier requests 4-second delay
 1 SMTP accept process running
 Listening...

-p1235 accept: condition test succeeded in ACL "delay4_accept"
-p1235 end of ACL "delay4_accept": ACCEPT
+p1235 accept: condition test succeeded in ACL delay4_accept
+p1235 end of ACL delay4_accept: ACCEPT

 p1235 LOG: smtp_connection MAIN
 p1235   SMTP connection from (test) [127.0.0.1] D=qqs closed by QUIT
 p1235 >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 p1235 LOG: smtp_connection MAIN
 p1235   SMTP connection from (test) [127.0.0.1] D=qqs closed by QUIT
 p1235 >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -43,12 +43,12 @@ p1236 Process p1236 is handling incoming connection from [127.0.0.1]
 p1236 Process p1236 is ready for new message
 p1236 test in helo_lookup_domains? no (end of list)
 p1236 using ACL "delay4_accept"
 p1236 Process p1236 is ready for new message
 p1236 test in helo_lookup_domains? no (end of list)
 p1236 using ACL "delay4_accept"

-p1236 processing "accept" (TESTSUITE/test-config 24)
+p1236 processing ACL delay4_accept "accept" (TESTSUITE/test-config 24)

 p1236 check delay = 4s
 p1236 delay modifier requests 4-second delay
 p1236 delay cancelled by peer close
 p1236 check delay = 4s
 p1236 delay modifier requests 4-second delay
 p1236 delay cancelled by peer close

-p1236 accept: condition test succeeded in ACL "delay4_accept"
-p1236 end of ACL "delay4_accept": ACCEPT
+p1236 accept: condition test succeeded in ACL delay4_accept
+p1236 end of ACL delay4_accept: ACCEPT

 p1236 LOG: lost_incoming_connection MAIN
 p1236   unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
 p1236 >>>>>>>>>>>>>>>> Exim pid=p1236 (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
 p1236 LOG: lost_incoming_connection MAIN
 p1236   unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
 p1236 >>>>>>>>>>>>>>>> Exim pid=p1236 (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>