spamd: Use macro for default priority. Bug 2694

[users/heiko/exim.git] / test / stderr / 0609

diff --git a/test/stderr/0609 b/test/stderr/0609
index 3fb905b59ccc5c69c482dc1302c0883763c10ea0..2ae8a95bd90ef9f61b3df93770e8ba4d463ac158 100644 (file)
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -17,19 +17,19 @@ ppppp Listening...
 ppppp Connection request from 127.0.0.1 port sssss
 ppppp LOG: smtp_connection MAIN
 ppppp   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-ppppp 1 SMTP accept process running
-ppppp Listening...
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
 ppppp using ACL "delay4_accept"
 ppppp processing "accept" (TESTSUITE/test-config 24)
 ppppp check delay = 4s
 ppppp delay modifier requests 4-second delay
+ppppp 1 SMTP accept process running
+ppppp Listening...
 ppppp accept: condition test succeeded in ACL "delay4_accept"
 ppppp end of ACL "delay4_accept": ACCEPT
 ppppp LOG: smtp_connection MAIN
 ppppp   SMTP connection from [127.0.0.1] closed by QUIT
-ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (conn-setup) terminating with rc=0 >>>>>>>>>>>>>>>>
+ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 ppppp child ppppp ended: status=0x0
 ppppp   normal exit, 0
 ppppp 0 SMTP accept processes now running
@@ -37,8 +37,6 @@ ppppp Listening...
 ppppp Connection request from 127.0.0.1 port sssss
 ppppp LOG: smtp_connection MAIN
 ppppp   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-ppppp 1 SMTP accept process running
-ppppp Listening...
 ppppp Process ppppp is handling incoming connection from [127.0.0.1]
 ppppp Process ppppp is ready for new message
 ppppp using ACL "delay4_accept"
@@ -50,9 +48,7 @@ ppppp accept: condition test succeeded in ACL "delay4_accept"
 ppppp end of ACL "delay4_accept": ACCEPT
 ppppp LOG: lost_incoming_connection MAIN
 ppppp   unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
-ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (conn-setup) terminating with rc=1 >>>>>>>>>>>>>>>>
-ppppp child ppppp ended: status=0x100
-ppppp   normal exit, 1
-ppppp 0 SMTP accept processes now running
-ppppp Listening...
+ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
+ppppp 1 SMTP accept process running
+ppppp SIGTERM seen
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>