Testsuite: fix 0173 + 2100+, take 2

[users/heiko/exim.git] / test / scripts / 4000-scanning / 4007

diff --git a/test/scripts/4000-scanning/4007 b/test/scripts/4000-scanning/4007
index 7bf6aca34e78e8dd78e7b6649018d06d2f0ac30f..9684056a05f63545e343a2dd2ae93f7dd2cdb2f6 100644 (file)
--- a/test/scripts/4000-scanning/4007
+++ b/test/scripts/4000-scanning/4007
@@ -1,7 +1,7 @@
 # content scan interface: cmdline
 #
 #
-exim -DOPT=accept -odi -bs
+exim -DOPT=accept -odi -bs -DINSERT=
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -14,8 +14,9 @@ quit
 ****
 #
 #
+# the defer_ok should not prevent rejection
 #
-exim -DOPT=reject -odi -bs
+exim -DOPT=reject -odi -bs -DINSERT="/defer_ok"
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -26,3 +27,31 @@ Subject: message should be rejected
 .
 quit
 ****
+#
+#
+#
+exim -DOPT=pause3 -odi -bs -DINSERT="/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
+****
+#
+#
+#
+exim -DOPT=pause3 -odi -bs -DINSERT="/tmo=2s/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 accepted despite a timeout
+
+.
+quit
+****