Make smtp_receive_timeout main option expanded. Bug 564

[users/jgh/exim.git] / test / scripts / 4000-scanning / 4005

diff --git a/test/scripts/4000-scanning/4005 b/test/scripts/4000-scanning/4005
index 32a281b03f8713aa716d12d7174d4e77f1320ac9..0095157d14b6aaadaa28eb9f31314799d418b228 100644 (file)
--- a/test/scripts/4000-scanning/4005
+++ b/test/scripts/4000-scanning/4005
@@ -10,7 +10,7 @@ server DIR/eximdir/clam_sock
 #
 #
 #
-exim -odi -bs
+exim -odi -bs -DOPT=
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -32,13 +32,13 @@ server DIR/eximdir/clam_sock
 #
 #
 #
-exim -odi -bs
+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
+Subject: defer this one due to scanner error
 
 .
 quit
@@ -54,7 +54,7 @@ server DIR/eximdir/clam_sock
 #
 #
 #
-exim -odi -bs
+exim -odi -bs -DOPT=/defer_ok
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -65,3 +65,46 @@ Subject: message should be rejected
 .
 quit
 ****
+#
+#
+#
+server DIR/eximdir/clam_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: defer this one due to timeout
+
+.
+quit
+****
+#
+#
+#
+server DIR/eximdir/clam_sock
+*sleep 3
+****
+#
+#
+#
+exim -odi -bs -DOPT="/ 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: accept this one despite timeout
+
+.
+quit
+****
+#
+#
+# Need to additionally test the timeout / defer_ok case