Fix "-bP smtp_receive_timeout". Bug 2384

[users/jgh/exim.git] / test / stderr / 0465

diff --git a/test/stderr/0465 b/test/stderr/0465
index 6d5e595937d7782941e0ab9fa4216289f10aebe2..e308349298027d3cadfe39987dbab84ee90ca175 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -54,7 +54,7 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain.>
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain.>

-processing "accept"
+processing "accept" (TESTSUITE/test-config 22)

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted


@@ -79,14 +79,11 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 using ACL "check_data"
 using ACL "check_data"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 20)

 check verify = header_syntax
 accept: condition test succeeded in ACL "check_data"
 end of ACL "check_data": ACCEPT
 check verify = header_syntax
 accept: condition test succeeded in ACL "check_data"
 end of ACL "check_data": ACCEPT

-calling local_scan(); timeout=300
-local_scan() returned 0 NULL

 Writing spool header file: TESTSUITE/spool//input//hdr.pppp
 DSN: Write SPOOL :-dsn_envid NULL
 DSN: Write SPOOL :-dsn_ret 0
 Writing spool header file: TESTSUITE/spool//input//hdr.pppp
 DSN: Write SPOOL :-dsn_envid NULL
 DSN: Write SPOOL :-dsn_ret 0


@@ -128,7 +125,7 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@xyz>
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@xyz>

-processing "accept"
+processing "accept" (TESTSUITE/test-config 22)

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted


@@ -153,9 +150,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000

-PDKIM: no signatures

 using ACL "check_data"
 using ACL "check_data"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 20)

 check verify = header_syntax
 accept: condition test failed in ACL "check_data"
 end of ACL "check_data": implicit DENY
 check verify = header_syntax
 accept: condition test failed in ACL "check_data"
 end of ACL "check_data": implicit DENY