Testsuite: Increase test delays and retry rule times

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

diff --git a/test/stdout/4006 b/test/stdout/4006
index 602afa64c7f7994a10212340fe7d3630cc9a0ee1..19e0f305b1c027c411a5b530040157ca75dba281 100644 (file)
--- a/test/stdout/4006
+++ b/test/stdout/4006
@@ -7,7 +7,7 @@
 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=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
 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


@@ -31,6 +31,28 @@
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\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=10HmaZ-0005vi-00\r
+221 myhost.test.ex closing connection\r

 
 ******** SERVER ********
 Listening on TESTSUITE/eximdir/avast_sock ... 
 
 ******** SERVER ********
 Listening on TESTSUITE/eximdir/avast_sock ... 


@@ -39,9 +61,9 @@ 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/10HmaZ-0005vi-00
+<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00

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

->LF>blah       [+]
+>LF>blah\x09[+]

 >LF>200 SCAN OK
 <QUIT
 Unexpected EOF read from client
 >LF>200 SCAN OK
 <QUIT
 Unexpected EOF read from client


@@ -51,14 +73,22 @@ Connection request
 >LF>220 ready
 <SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00
 >LF>210 SCAN DATA
 >LF>220 ready
 <SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00
 >LF>210 SCAN DATA

->LF>blah       [E]
+>LF>blah\x09[E]

 >LF>200 SCAN OK
 Unexpected EOF read from client
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready
 >LF>200 SCAN OK
 Unexpected EOF read from client
 Listening on TESTSUITE/eximdir/avast_sock ... 
 Connection request
 >LF>220 ready

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

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

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

 >LF>200 SCAN OK
 Unexpected EOF read from client
 >LF>200 SCAN OK
 Unexpected EOF read from client

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