Testsuite: tidying GnuTLS with TLS1.3

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

diff --git a/test/scripts/4000-scanning/4001 b/test/scripts/4000-scanning/4001
index 0234a3d5d6cff98a94c24d235bb2b6a101a98211..a660f680533738d5389167fb623b9af3e2eab6ff 100644 (file)
--- a/test/scripts/4000-scanning/4001
+++ b/test/scripts/4000-scanning/4001
@@ -1,50 +1,38 @@
-# content scan interface: f-protd
-#
-server PORT_S
-<GET
-<
-><summary code="11">
->*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 PORT_S
-<GET
-<
->
->
->
-><detected type="foo">
-><name>wibble</name>
-><summary code="11">
->*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: message should be rejected
+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
 ****
 .
 quit
 ****