Handle SIGINT as we do with SIGTERM

[exim.git] / test / stderr / 0609

diff --git a/test/stderr/0609 b/test/stderr/0609
index ea998d6d7ab6409c47ef65daa6e0e4ec0d339365..5d6f97fd8ce1a5ef5c63870df45f1bfd40e9bfac 100644 (file)
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -3,8 +3,11 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+dropping to exim gid; retaining priv uid

 ppppp daemon_smtp_port overridden by -oX:
 ppppp   <: 1225
 ppppp daemon_smtp_port overridden by -oX:
 ppppp   <: 1225

+ppppp creating notifier socket
+ppppp  TESTSUITE/spool/exim_daemon_notify

 ppppp listening on all interfaces (IPv4) port 1225
 ppppp pid written to TESTSUITE/spool/exim-daemon.pid
 ppppp LOG: MAIN
 ppppp listening on all interfaces (IPv4) port 1225
 ppppp pid written to TESTSUITE/spool/exim-daemon.pid
 ppppp LOG: MAIN


@@ -14,18 +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 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 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"
+ppppp processing "accept" (TESTSUITE/test-config 24)

 ppppp check delay = 4s
 ppppp delay modifier requests 4-second delay
 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 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 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>

 ppppp child ppppp ended: status=0x0
 ppppp   normal exit, 0
 ppppp 0 SMTP accept processes now running
 ppppp child ppppp ended: status=0x0
 ppppp   normal exit, 0
 ppppp 0 SMTP accept processes now running


@@ -33,12 +37,10 @@ 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 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 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"
+ppppp processing "accept" (TESTSUITE/test-config 24)

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


@@ -46,7 +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 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 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/SIGINT seen
+ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>