Merge branch '4.next'

[exim.git] / test / stderr / 0609

diff --git a/test/stderr/0609 b/test/stderr/0609
index 8e99a3f7ecaace47bcc3d866b8dc84b8158bb745..6a801a29983183e525ee07c441161817aebd6847 100644 (file)
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -1,6 +1,7 @@
 
 ******** SERVER ********
 Exim version x.yz ....
 
 ******** SERVER ********
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid


@@ -15,10 +16,11 @@ LOG: MAIN
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 Connection request from 127.0.0.1 port sssss
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 Connection request from 127.0.0.1 port sssss

-LOG: smtp_connection MAIN
-  SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
+p1235 LOG: smtp_connection MAIN
+p1235   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)

 p1235 Process p1235 is handling incoming connection from [127.0.0.1]
 p1235 Process p1235 is ready for new message
 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 processing "accept" (TESTSUITE/test-config 24)
 p1235 check delay = 4s
 p1235 using ACL "delay4_accept"
 p1235 processing "accept" (TESTSUITE/test-config 24)
 p1235 check delay = 4s


@@ -35,10 +37,11 @@ child p1235 ended: status=0x0
 0 SMTP accept processes now running
 Listening...
 Connection request from 127.0.0.1 port sssss
 0 SMTP accept processes now running
 Listening...
 Connection request from 127.0.0.1 port sssss

-LOG: smtp_connection MAIN
-  SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
+p1236 LOG: smtp_connection MAIN
+p1236   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)

 p1236 Process p1236 is handling incoming connection from [127.0.0.1]
 p1236 Process p1236 is ready for new message
 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 processing "accept" (TESTSUITE/test-config 24)
 p1236 check delay = 4s
 p1236 using ACL "delay4_accept"
 p1236 processing "accept" (TESTSUITE/test-config 24)
 p1236 check delay = 4s