Hintsdb: fix dumpdb for sqlite

[exim.git] / test / scripts / 4000-scanning / 4002

diff --git a/test/scripts/4000-scanning/4002 b/test/scripts/4000-scanning/4002
index 201fdf1973c7351b410d8966c61c22e06e11a161..fcfae698b73a1a979e96669b376d486f56a0f864 100644 (file)
--- a/test/scripts/4000-scanning/4002
+++ b/test/scripts/4000-scanning/4002
@@ -1,75 +1,45 @@
-# content scan interface: aveserver
-#
-server DIR/eximdir/aveserver_sock
->200 ready
-<SCAN
->200 done
-<quit
->200 ready
-*eof
-****
-#
+# 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.

 #
 exim -odi -bs
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 data
 #
 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
+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
 ****
 .
 quit
 ****

-#
-#
-#
-server DIR/eximdir/aveserver_sock
->2xx ready
-<SCAN
->5xx defer
-<quit
->2xx ready
-*eof
-****
-#
-#
-#

 exim -odi -bs
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 data
 exim -odi -bs
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 data

-Date: Fri, 17 Dec 2004 14:35:01 +0100
-Subject: defer this one
+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
+MIME-Version: 1.0
+Content-Type: text/plain

 
 

-.
-quit
-****
-#
-#
-#
-server DIR/eximdir/aveserver_sock
->2xx ready
-<SCAN
->322 VNAME found
->2xx ready
-<quit
->2xx ready
-*eof
-****
-#
-#
-#
-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
+OK, this should look like a genuine message, but
+it will trip on THIS gazornenplaz REGEX.

 
 

+This checks proper release of variable used for mime_regex
+firstname@foobar.com
+secondname@blaz.com
+thirdname@blaz.com

 .
 quit
 ****
 .
 quit
 ****