Fix handling of server which follows a RCPT 452 with a 250. Bug 26092

[exim.git] / test / stdout / 4006

diff --git a/test/stdout/4006 b/test/stdout/4006
index 4d858c5b11271d25149b64ddaa8a7e50143ea0de..b4a72b82625f89a8f46f5020d5594b85b39d960f 100644 (file)
--- a/test/stdout/4006
+++ b/test/stdout/4006
@@ -64,25 +64,36 @@
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbC-0005vi-00\r
 221 myhost.test.ex closing connection\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbC-0005vi-00\r
 221 myhost.test.ex closing connection\r

+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250-myhost.test.ex Hello CALLER at test.ex\r
+250-SIZE 52428800\r
+250-8BITMIME\r
+250-PIPELINING\r
+250 HELP\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbD-0005vi-00\r
+221 myhost.test.ex closing connection\r

 
 ******** SERVER ********
 Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
 <SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml
 >LF>scanned_file_name: OK
 
 ******** SERVER ********
 Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
 <SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml
 >LF>scanned_file_name: OK

-Unexpected EOF read from client
+Expected EOF read from client

 End of script
 Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
 <SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml
 >LF>scanned_file_name: 666 ERROR
 End of script
 Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
 <SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml
 >LF>scanned_file_name: 666 ERROR

-Unexpected EOF read from client
+Expected EOF read from client

 End of script
 Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
 <SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml
 >LF>scanned_file_name: VNAME FOUND
 End of script
 Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
 <SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml
 >LF>scanned_file_name: VNAME FOUND

-Unexpected EOF read from client
+Expected EOF read from client

 End of script
 Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
 End of script
 Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request


@@ -97,5 +108,24 @@ Listening on TESTSUITE/eximdir/clam_sock ...
 Connection request
 <SCAN TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00.eml
 >LF>scanned_file_name: OK
 Connection request
 <SCAN TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00.eml
 >LF>scanned_file_name: OK

-Unexpected EOF read from client
+Expected EOF read from client
+End of script
+Listening on port 1225 ... 
+Connection request from [127.0.0.1]
+<zINSTREAM
+<X-Envelope-From: <CALLER@myhost.test.ex>
+<X-Envelope-To: userx@test.ex
+<Received: from CALLER (helo=test.ex)
+<      by myhost.test.ex with local-esmtp (Exim x.yz)
+<      (envelope-from <CALLER@myhost.test.ex>)
+<      id 10HmbD-0005vi-00
+<      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<Date: Tue, 2 Mar 1999 09:44:33 +0000
+<Subject: message should be accepted
+<Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+<From: CALLER_NAME <CALLER@myhost.test.ex>
+<
+<
+>LF>scanned_file_name: OK
+Expected EOF read from client

 End of script
 End of script