Testsuite: drop PRDR testcase from general MAIL-FROM-with-options testing

[exim.git] / test / stdout / 4012

diff --git a/test/stdout/4012 b/test/stdout/4012
index 6d66c7d648edcc81923827bb8d43f81e0b2af3ee..3816b5f54ca5cce369f8a1637eb05e4a9c5f933c 100644 (file)
--- a/test/stdout/4012
+++ b/test/stdout/4012
@@ -1,17 +1,19 @@
 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

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\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-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
+250 OK id=10HmaZ-000000005vi-0000\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
 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-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r


@@ -23,6 +25,7 @@
 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

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r

 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r


@@ -34,26 +37,27 @@
 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

+250-LIMITS MAILMAX=1000 RCPTMAX=50000\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-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
+250 OK id=10HmbA-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]
 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]

-<GET TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml HTTP/1.0
+<GET TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/10HmaZ-000000005vi-0000.eml HTTP/1.0

 <
 ><summary code="11">
 >*eof
 End of script
 Listening on port 1224 ... 
 Connection request from [IP_LOOPBACK_ADDR]
 <
 ><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
+<GET TESTSUITE/spool/scan/10HmaX-000000005vi-0000/10HmaX-000000005vi-0000.eml HTTP/1.0

 <
 >
 >
 <
 >
 >


@@ -65,11 +69,11 @@ Connection request from [IP_LOOPBACK_ADDR]
 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]

-<GET TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml HTTP/1.0
+<GET TESTSUITE/spool/scan/10HmaY-000000005vi-0000/10HmaY-000000005vi-0000.eml HTTP/1.0

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

-<GET TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml HTTP/1.0
+<GET TESTSUITE/spool/scan/10HmbA-000000005vi-0000/10HmbA-000000005vi-0000.eml HTTP/1.0

 *sleep 3
 End of script
 *sleep 3
 End of script