X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0f0c8159c43045f4ad847a0129dca7eddd313285..a9231f68f7c21597260c867dc6f7ad6207a4baf1:/test/scripts/4000-scanning/4004?ds=sidebyside

diff --git a/test/scripts/4000-scanning/4004 b/test/scripts/4000-scanning/4004
index 956f04507..72e77a058 100644
--- a/test/scripts/4000-scanning/4004
+++ b/test/scripts/4000-scanning/4004
@@ -1,105 +1,52 @@
-# content scan interface: sophie
-#
-server DIR/eximdir/sophie_sock
-</
->0 no problems mate
-*eof
-****
-#
-#
-#
-exim -odi -bs -DOPT=
-ehlo test.ex
-mail from:<>
-rcpt to:<userx@test.ex>
-data
-Date: Fri, 17 Dec 2004 14:35:01 +0100
-Subject: message should be accepted
-
-.
-quit
-****
-#
-#
-#
-server DIR/eximdir/sophie_sock
-</
->-1 oops, internal error in scanner
-*eof
-****
-#
-#
-#
-exim -odi -bs -DOPT=
-ehlo test.ex
-mail from:<>
-rcpt to:<userx@test.ex>
-data
-Date: Fri, 17 Dec 2004 14:35:01 +0100
-Subject: defer this one
-
-.
-quit
-****
-#
-#
-#
-server DIR/eximdir/sophie_sock
-</
->LF>1 VNAME
+# content scan interface: rspamd
+#
+# The spooled file for scanning includes the test-runner's user name
+# hence size varies.  Munge that.
+munge scanfile_size
+#
+server 11333
+<CHECK RSPAMC/1.3
+<Content-length:
+<Queue-Id:
+<From:
+<Recipient-Number: 1
+<Rcpt:
+<Helo:
+<User:
+<
+<From
+<X-Envelope-From
+<X-Envelope-To
+<Received:
+<	by
+<	(envelope
+<	id
+<	for
+<	
+<From:
+<Content-type: text/plain
+<Message-Id:
+<Sender:
+<Date:
+<
+<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
 *eof
 ****
-#
-#
-#
-exim -odi -bs -DOPT=/defer_ok
-ehlo test.ex
-mail from:<>
-rcpt to:<userx@test.ex>
-data
-Date: Fri, 17 Dec 2004 14:35:01 +0100
-Subject: message should be rejected
-
-.
-quit
-****
-#
-#
-#
-server DIR/eximdir/sophie_sock
-*sleep 3
-****
-#
-#
-#
-exim -odi -bs -DOPT=/tmo=2s
-ehlo test.ex
-mail from:<>
-rcpt to:<userx@test.ex>
-data
-Date: Fri, 17 Dec 2004 14:35:01 +0100
-Subject: message should be tmp-rejected due to timeout
-
-.
-quit
-****
-#
-#
-#
-server DIR/eximdir/sophie_sock
-*sleep 3
-****
-#
-#
-#
-exim -odi -bs -DOPT=/tmo=2s/defer_ok
+exim -odi -bs
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 data
-Date: Fri, 17 Dec 2004 14:35:01 +0100
-Subject: message should be accepted destpite timeout
+From: MAILER_DAEMON <>
+Content-type: text/plain
 
+test
 .
 quit
 ****