Avoid manually-counted long strings

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

diff --git a/test/stdout/4012 b/test/stdout/4012
index fa6770563bb8e80b11d8105d140daba25716dfc5..6d66c7d648edcc81923827bb8d43f81e0b2af3ee 100644 (file)
--- a/test/stdout/4012
+++ b/test/stdout/4012
@@ -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=10HmaY-0005vi-00\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
 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


@@ -20,16 +20,56 @@
 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=10HmbA-0005vi-00\r
+221 myhost.test.ex closing connection\r

 
 ******** SERVER ********
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]
 
 ******** SERVER ********
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]

-TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml
->LF>RESULT: OK
+<GET TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml HTTP/1.0
+<
+><summary code="11">
+>*eof
+End of script
+Listening on port 1224 ... 
+Connection request from [IP_LOOPBACK_ADDR]
+<GET TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml HTTP/1.0
+<
+>
+>
+>
+><detected type="foo">
+><name>wibble</name>
+><summary code="11">
+>*eof
+End of script
+Listening on port 1224 ... 
+Connection request from [IP_LOOPBACK_ADDR]
+<GET TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml HTTP/1.0
+*sleep 3

 End of script
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]
 End of script
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]

-TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml
->LF>RESULT: BAD
->LF>NAME: wibble
+<GET TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml HTTP/1.0
+*sleep 3

 End of script
 End of script