Testsuite: stabilize output sequence for 2x35/6

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

diff --git a/test/scripts/4000-scanning/4001 b/test/scripts/4000-scanning/4001
index 0234a3d5d6cff98a94c24d235bb2b6a101a98211..6f746307e5129bd84d6deada237d91bad16f9009 100644 (file)
--- a/test/scripts/4000-scanning/4001
+++ b/test/scripts/4000-scanning/4001
@@ -1,4 +1,6 @@
 # content scan interface: f-protd
+need_ipv4
+munge loopback
 #
 server PORT_S
 <GET
@@ -9,7 +11,7 @@ server PORT_S
 #
 #
 #
-exim -odi -bs
+exim -odi -bs -DOPT=
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -37,7 +39,7 @@ server PORT_S
 #
 #
 #
-exim -odi -bs
+exim -odi -bs -DOPT=
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
@@ -45,6 +47,49 @@ data
 Date: Fri, 17 Dec 2004 14:35:01 +0100
 Subject: message should be rejected
 
+due to the server response (above)
+.
+quit
+****
+#
+#
+#
+server PORT_S
+<GET
+*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 PORT_S
+<GET
+*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: message should be accepted despite timeout
+
 .
 quit
 ****