X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bfe645c1570343d3adca657ab67998e122ca8792..0799ba118b9c83731c1db34affcf9fecc10fd627:/test/stdout/4003?ds=sidebyside

diff --git a/test/stdout/4003 b/test/stdout/4003
index e705096f6..afff4e4df 100644
--- a/test/stdout/4003
+++ b/test/stdout/4003
@@ -7,105 +7,41 @@
 250 OK
 250 Accepted
 354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
-221 myhost.test.ex closing connection
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250-myhost.test.ex Hello CALLER at test.ex
-250-SIZE 52428800
-250-8BITMIME
-250-PIPELINING
-250 HELP
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-550 Administrative prohibition
-221 myhost.test.ex closing connection
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250-myhost.test.ex Hello CALLER at test.ex
-250-SIZE 52428800
-250-8BITMIME
-250-PIPELINING
-250 HELP
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-451 Temporary local problem - please try later
-221 myhost.test.ex closing connection
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250-myhost.test.ex Hello CALLER at test.ex
-250-SIZE 52428800
-250-8BITMIME
-250-PIPELINING
-250 HELP
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
-221 myhost.test.ex closing connection
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-250-myhost.test.ex Hello CALLER at test.ex
-250-SIZE 52428800
-250-8BITMIME
-250-PIPELINING
-250 HELP
-250 OK
-250 Accepted
-354 Enter message, ending with "." on a line by itself
-550 Administrative prohibition
+250 OK id=10HmaX-0005vi-00
 221 myhost.test.ex closing connection
 
 ******** 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/10HmbB-0005vi-00/10HmbB-0005vi-00.eml
->LF>random ignored line
->LF>random ignored line 2
->LF>OK\x09Scan 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/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml
->LF>xxxINFECTED\x09blah\x09VNAME\x09blah
->LF>OK\x09Scan ok.
-Expected EOF read from client
-End of script
-Listening on TESTSUITE/eximdir/fsec_sock ... 
-Connection request
-*sleep 3
-End of script
-Listening on TESTSUITE/eximdir/fsec_sock ... 
-Connection request
-*sleep 3
-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/10HmbA-0005vi-00/10HmbA-0005vi-00.eml
->LF>xxxINFECTED\x09blah\x09VNAME\x09blah
->LF>OK\x09Scan 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