tidying

[exim.git] / test / stdout / 4007

diff --git a/test/stdout/4007 b/test/stdout/4007
index 19e0f305b1c027c411a5b530040157ca75dba281..07de644146bf0fd05e264d1ef6d28f56deca9952 100644 (file)
--- a/test/stdout/4007
+++ b/test/stdout/4007
@@ -7,8 +7,9 @@
 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
+250 OK id=10HmbC-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 221 myhost.test.ex closing connection\r

+### (non-internal) scanner error -> paniclog

 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
 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


@@ -51,7 +52,19 @@
 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=10HmaZ-0005vi-00\r
+250 OK id=10HmaZ-000000005vi-0000\r
+221 myhost.test.ex closing connection\r
+### internal scanner error, no panic log
+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
 
 ******** SERVER ********
 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********


@@ -61,29 +74,34 @@ Connection request
 <FLAGS -fullfiles
 >LF>210 FLAGS DATA
 >LF>200 FLAGS OK
 <FLAGS -fullfiles
 >LF>210 FLAGS DATA
 >LF>200 FLAGS OK

-<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmbC-000000005vi-0000

 >LF>210 SCAN DATA
 >LF>blah\x09[+]
 >LF>200 SCAN OK
 <QUIT
 >LF>210 SCAN DATA
 >LF>blah\x09[+]
 >LF>200 SCAN OK
 <QUIT

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

 End of script
 End of script

+### (non-internal) scanner error -> paniclog

 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready

-<SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmaX-000000005vi-0000

 >LF>210 SCAN DATA
 >LF>210 SCAN DATA

->LF>blah\x09[E]
->LF>200 SCAN OK
-Unexpected EOF read from client
+>LF>blah\x09[E]0.0\x09Error 13 Permission\\ denied
+>LF>451 SCAN Engine error 13 Permission denied
+<QUIT
+Expected EOF read from client
+End of script

 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready

-<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmbA-000000005vi-0000

 >LF>210 SCAN DATA
 >LF>210 SCAN DATA

->LF>b\\ l\\ a\\ h\x09[L]9.9\x099 VNAME
+>LF>b\\ l\\ a\\ h\x09[L]9.0\x090 VNAME

 >LF>200 SCAN OK
 >LF>200 SCAN OK

-Unexpected EOF read from client
+<QUIT
+Expected EOF read from client
+End of script

 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 *sleep 3
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 *sleep 3


@@ -92,3 +110,14 @@ Listening on TESTSUITE/eximdir/avast_sock ...
 Connection request
 *sleep 3
 End of script
 Connection request
 *sleep 3
 End of script

+### internal scanner error, no panic log
+Listening on TESTSUITE/eximdir/avast_sock ... 
+Connection request
+>LF>220 ready
+<SCAN TESTSUITE/spool/scan/10HmbB-000000005vi-0000
+>LF>210 SCAN DATA
+>LF>blah\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb
+>LF>200 SCAN OK
+<QUIT
+Expected EOF read from client
+End of script