Testsuite: fix 0173 + 2100+, take 2

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

diff --git a/test/scripts/4000-scanning/4004 b/test/scripts/4000-scanning/4004
index e6a142930eb6254d335dcf26338d8772498aa84f..956f045075bad6260b0f4443e9f23e5030cbd66a 100644 (file)
--- a/test/scripts/4000-scanning/4004
+++ b/test/scripts/4000-scanning/4004
@@ -8,7 +8,7 @@ server DIR/eximdir/sophie_sock
 #
 #
 #
 #
 #
 #

-exim -odi -bs
+exim -odi -bs -DOPT=

 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>


@@ -30,7 +30,7 @@ server DIR/eximdir/sophie_sock
 #
 #
 #
 #
 #
 #

-exim -odi -bs
+exim -odi -bs -DOPT=

 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>


@@ -52,7 +52,7 @@ server DIR/eximdir/sophie_sock
 #
 #
 #
 #
 #
 #

-exim -odi -bs
+exim -odi -bs -DOPT=/defer_ok

 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>
 ehlo test.ex
 mail from:<>
 rcpt to:<userx@test.ex>


@@ -63,3 +63,43 @@ Subject: message should be rejected
 .
 quit
 ****
 .
 quit
 ****

+#
+#
+#
+server DIR/eximdir/sophie_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: message should be tmp-rejected due to timeout
+
+.
+quit
+****
+#
+#
+#
+server DIR/eximdir/sophie_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: message should be accepted destpite timeout
+
+.
+quit
+****