Merge branch 'bug/2390-tmpfile-race'

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

diff --git a/test/stdout/4003 b/test/stdout/4003
index e0241c121bcde649f3a496ac38a2bc2001adbe1e..afff4e4dfa56b4564388d7db62dc0acbd7b90c31 100644 (file)
--- a/test/stdout/4003
+++ b/test/stdout/4003
@@ -7,49 +7,41 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-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
-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
+250 OK id=10HmaX-0005vi-00\r
 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
-Listening on TESTSUITE/eximdir/fsec_sock ... 
-Connection request
-<CONFIGURE     ARCHIVE 1
->ignored_response
-<CONFIGURE     TIMEOUT 0
->ignored_response
-<CONFIGURE     MAXARCH 5
->ignored_response
-<CONFIGURE     MIME    1
->ignored_response
-<SCAN  TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml
->LF>random ignored line
->LF>random ignored line 2
->LF>OK Scan ok.
-Expected EOF read from client
-End of script
-Listening on TESTSUITE/eximdir/fsec_sock ... 
-Connection request
-<CONFIGURE     ARCHIVE 1
->ignored_response
-<CONFIGURE     TIMEOUT 0
->ignored_response
-<CONFIGURE     MAXARCH 5
->ignored_response
-<CONFIGURE     MIME    1
->ignored_response
-<SCAN  TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml
->LF>xxxINFECTED        blah    VNAME   blah
->LF>OK Scan ok.
+Listening on port 11333 ... 
+Connection request from [127.0.0.1]
+<CHECK RSPAMC/1.3
+<Content-length: ddd
+<Queue-Id: 10HmaX-0005vi-00
+<From: <CALLER@myhost.test.ex>
+<Recipient-Number: 1
+<Rcpt: <userx@test.ex>
+<Helo: test.ex
+<User: CALLER
+<
+<From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+<X-Envelope-From: <CALLER@myhost.test.ex>
+<X-Envelope-To: userx@test.ex
+<Received: from CALLER (helo=test.ex)
+<      by myhost.test.ex with local-esmtp (Exim x.yz)
+<      (envelope-from <CALLER@myhost.test.ex>)
+<      id 10HmaX-0005vi-00
+<      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<From: MAILER_DAEMON <>
+<Content-type: text/plain
+<Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+<Sender: CALLER_NAME <CALLER@myhost.test.ex>
+<Date: Tue, 2 Mar 1999 09:44:33 +0000
+<
+<test
+>RSPAMD/1.3 0 EX_OK
+>Metric: default; True; 15.00 / 15.00 / 0.0
+>Action: reject
+>Symbol: FAKE_SYMBOL_A(15.00)
+>Symbol: FAKE_SYMBOL_B(0.00)
+>Message-ID: undef
 Expected EOF read from client
 End of script