X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0e42da1b15894b66e3726d8ce0e41e25bdc21149..68d0c019bace3e1d956ea54d4c5276b8c45b6c1d:/test/scripts/4000-scanning/4002

diff --git a/test/scripts/4000-scanning/4002 b/test/scripts/4000-scanning/4002
index 4754609c0..a660f6805 100644
--- a/test/scripts/4000-scanning/4002
+++ b/test/scripts/4000-scanning/4002
@@ -1,168 +1,38 @@
-# content scan interface: aveserver
-#
-server DIR/eximdir/aveserver_sock
->200 ready
-<SCAN
->200 done
-<quit
->200 ready
-*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/aveserver_sock
->2xx ready
-<SCAN
->5xx defer
-<quit
->2xx ready
-*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 (daemon tmp-err)
-
-.
-quit
-****
-#
-#
-#
-server DIR/eximdir/aveserver_sock
->2xx ready
-<SCAN
->322 VNAME found
->2xx ready
-<quit
->2xx ready
-*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 rejected (virus found)
-
-.
-quit
-****
+# ACL regex= test
 #
+# These tests are copies from testcase 4000;
+# they should be removed from there but I don't
+# run spamassassin so can't verify the change.
 #
-#
-server DIR/eximdir/aveserver_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 deferred due to timeout
-
-.
-quit
-****
-#
-#
-#
-server DIR/eximdir/aveserver_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 despite timeout
+From: Test person <tp@cam.ac.uk>
+To: Me <userx@test.ex>
+Subject: A real test message
+Date: Fri, 17 Dec 2004 16:13:04 +0100
+Message-ID: <41C2F849.3060203@projectile.test.ex>
 
+OK, this should look like a genuine message.
 .
 quit
 ****
-#
-#
-#
-server DIR/eximdir/aveserver_sock
->2xx ready
-<SCAN
->5xx defer
-<quit
->2xx ready
-*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: accept this, overriding the scan daemon temp-error
-
-.
-quit
-****
-#
-#
-#
-# Recheck that defer_ok option does not affect a malware detection
-#
-server DIR/eximdir/aveserver_sock
->2xx ready
-<SCAN
->322 VNAME found
->2xx ready
-<quit
->2xx ready
-*eof
-****
-#
-#
-#
-exim -odi -bs -DOPT="/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 rejected (virus found)
+From: Test person <tp@cam.ac.uk>
+To: Me <userx@test.ex>
+Subject: A real test message
+Date: Fri, 17 Dec 2004 16:13:04 +0100
+Message-ID: <41C2F849.3060203@projectile.test.ex>
+FakeReject: test fakereject
 
+OK, this should look like a genuine message, but
+it will trip on THIS gazornenplaz REGEX.
 .
 quit
 ****