Testsuite: fix 0173 and related

[users/heiko/exim.git] / test / stdout / 4003

diff --git a/test/stdout/4003 b/test/stdout/4003
index e0241c121bcde649f3a496ac38a2bc2001adbe1e..e705096f6b02bdceef4e8d42ab74c1423b640c6e 100644 (file)
--- a/test/stdout/4003
+++ b/test/stdout/4003
@@ -7,6 +7,39 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

+250 OK id=10HmbB-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
+550 Administrative prohibition\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
+451 Temporary local problem - please try later\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=10HmaY-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 OK id=10HmaY-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


@@ -32,14 +65,37 @@ Connection request
 >ignored_response
 <CONFIGURE     MIME    1
 >ignored_response
 >ignored_response
 <CONFIGURE     MIME    1
 >ignored_response

-<SCAN  TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml
+<SCAN  TESTSUITE/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml

 >LF>random ignored line
 >LF>random ignored line 2
 >LF>random ignored line
 >LF>random ignored line 2

->LF>OK Scan ok.
+>LF>OK\x09Scan ok.
+Expected EOF read from client
+End of script
+Listening on TESTSUITE/eximdir/fsec_sock ... 
+Connection request
+<CONFIGURE     ARCHIVE 1
+>ignored_response
+<CONFIGURE     TIMEOUT 0
+>ignored_response
+<CONFIGURE     MAXARCH 5
+>ignored_response
+<CONFIGURE     MIME    1
+>ignored_response
+<SCAN  TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml
+>LF>xxxINFECTED\x09blah\x09VNAME\x09blah
+>LF>OK\x09Scan ok.

 Expected EOF read from client
 End of script
 Listening on TESTSUITE/eximdir/fsec_sock ... 
 Connection request
 Expected EOF read from client
 End of script
 Listening on TESTSUITE/eximdir/fsec_sock ... 
 Connection request

+*sleep 3
+End of script
+Listening on TESTSUITE/eximdir/fsec_sock ... 
+Connection request
+*sleep 3
+End of script
+Listening on TESTSUITE/eximdir/fsec_sock ... 
+Connection request

 <CONFIGURE     ARCHIVE 1
 >ignored_response
 <CONFIGURE     TIMEOUT 0
 <CONFIGURE     ARCHIVE 1
 >ignored_response
 <CONFIGURE     TIMEOUT 0


@@ -48,8 +104,8 @@ Connection request
 >ignored_response
 <CONFIGURE     MIME    1
 >ignored_response
 >ignored_response
 <CONFIGURE     MIME    1
 >ignored_response

-<SCAN  TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml
->LF>xxxINFECTED        blah    VNAME   blah
->LF>OK Scan ok.
+<SCAN  TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml
+>LF>xxxINFECTED\x09blah\x09VNAME\x09blah
+>LF>OK\x09Scan ok.

 Expected EOF read from client
 End of script
 Expected EOF read from client
 End of script