Merge branch 'bug/2390-tmpfile-race'

[users/jgh/exim.git] / test / stdout / 4006

diff --git a/test/stdout/4006 b/test/stdout/4006
index 19e0f305b1c027c411a5b530040157ca75dba281..4d858c5b11271d25149b64ddaa8a7e50143ea0de 100644 (file)
--- a/test/stdout/4006
+++ b/test/stdout/4006
@@ -53,42 +53,49 @@
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaZ-0005vi-00\r
 221 myhost.test.ex closing connection\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaZ-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=10HmbC-0005vi-00\r
+221 myhost.test.ex closing connection\r

 
 ******** SERVER ********
 
 ******** SERVER ********

-Listening on TESTSUITE/eximdir/avast_sock ... 
+Listening on TESTSUITE/eximdir/clam_sock ... 

 Connection request
 Connection request

->LF>220 ready
-<FLAGS -fullfiles
->LF>210 FLAGS DATA
->LF>200 FLAGS OK
-<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00
->LF>210 SCAN DATA
->LF>blah\x09[+]
->LF>200 SCAN OK
-<QUIT
+<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml
+>LF>scanned_file_name: OK

 Unexpected EOF read from client
 End of script
 Unexpected EOF read from client
 End of script

-Listening on TESTSUITE/eximdir/avast_sock ... 
+Listening on TESTSUITE/eximdir/clam_sock ... 

 Connection request
 Connection request

->LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00
->LF>210 SCAN DATA
->LF>blah\x09[E]
->LF>200 SCAN OK
+<SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml
+>LF>scanned_file_name: 666 ERROR

 Unexpected EOF read from client
 Unexpected EOF read from client

-Listening on TESTSUITE/eximdir/avast_sock ... 
+End of script
+Listening on TESTSUITE/eximdir/clam_sock ... 

 Connection request
 Connection request

->LF>220 ready
-<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00
->LF>210 SCAN DATA
->LF>b\\ l\\ a\\ h\x09[L]9.9\x099 VNAME
->LF>200 SCAN OK
+<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml
+>LF>scanned_file_name: VNAME FOUND

 Unexpected EOF read from client
 Unexpected EOF read from client

-Listening on TESTSUITE/eximdir/avast_sock ... 
+End of script
+Listening on TESTSUITE/eximdir/clam_sock ... 

 Connection request
 *sleep 3
 End of script
 Connection request
 *sleep 3
 End of script

-Listening on TESTSUITE/eximdir/avast_sock ... 
+Listening on TESTSUITE/eximdir/clam_sock ... 

 Connection request
 *sleep 3
 End of script
 Connection request
 *sleep 3
 End of script

+Inital pause of 2 seconds
+Listening on TESTSUITE/eximdir/clam_sock ... 
+Connection request
+<SCAN TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00.eml
+>LF>scanned_file_name: OK
+Unexpected EOF read from client
+End of script