Testsuite: avoid total fail on DISABLE_EVENT build

[exim.git] / test / stdout / 4010

diff --git a/test/stdout/4010 b/test/stdout/4010
index e705096f6b02bdceef4e8d42ab74c1423b640c6e..15c1aa4acc60feb63cb80a8287939edf5995086b 100644 (file)
--- a/test/stdout/4010
+++ b/test/stdout/4010
@@ -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=10HmbB-0005vi-00\r
+250 OK id=10HmbB-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,17 +37,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=10HmaY-0005vi-00\r
+250 OK id=10HmaY-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


@@ -65,7 +70,7 @@ Connection request
 >ignored_response
 <CONFIGURE     MIME    1
 >ignored_response
 >ignored_response
 <CONFIGURE     MIME    1
 >ignored_response

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

 >LF>random ignored line
 >LF>random ignored line 2
 >LF>OK\x09Scan ok.
 >LF>random ignored line
 >LF>random ignored line 2
 >LF>OK\x09Scan ok.


@@ -81,7 +86,7 @@ Connection request
 >ignored_response
 <CONFIGURE     MIME    1
 >ignored_response
 >ignored_response
 <CONFIGURE     MIME    1
 >ignored_response

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

 >LF>xxxINFECTED\x09blah\x09VNAME\x09blah
 >LF>OK\x09Scan ok.
 Expected EOF read from client
 >LF>xxxINFECTED\x09blah\x09VNAME\x09blah
 >LF>OK\x09Scan ok.
 Expected EOF read from client


@@ -104,7 +109,7 @@ Connection request
 >ignored_response
 <CONFIGURE     MIME    1
 >ignored_response
 >ignored_response
 <CONFIGURE     MIME    1
 >ignored_response

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

 >LF>xxxINFECTED\x09blah\x09VNAME\x09blah
 >LF>OK\x09Scan ok.
 Expected EOF read from client
 >LF>xxxINFECTED\x09blah\x09VNAME\x09blah
 >LF>OK\x09Scan ok.
 Expected EOF read from client