Testsuite: sort output of retry DB dumps

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

diff --git a/test/scripts/4000-scanning/4002 b/test/scripts/4000-scanning/4002
index 201fdf1973c7351b410d8966c61c22e06e11a161..4754609c0bb17ae76b90de76169a2f8ce7a69f32 100644 (file)
--- a/test/scripts/4000-scanning/4002
+++ b/test/scripts/4000-scanning/4002
@@ -11,7 +11,7 @@ server DIR/eximdir/aveserver_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>


@@ -36,13 +36,13 @@ server DIR/eximdir/aveserver_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
 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 (daemon tmp-err)

 
 .
 quit
 
 .
 quit


@@ -62,13 +62,106 @@ server DIR/eximdir/aveserver_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
 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
+Subject: message should be rejected (virus found)
+
+.
+quit
+****
+#
+#
+#
+server DIR/eximdir/aveserver_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 deferred due to timeout
+
+.
+quit
+****
+#
+#
+#
+server DIR/eximdir/aveserver_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 despite timeout
+
+.
+quit
+****
+#
+#
+#
+server DIR/eximdir/aveserver_sock
+>2xx ready
+<SCAN
+>5xx defer
+<quit
+>2xx ready
+*eof
+****
+#
+#
+#
+exim -odi -bs -DOPT=" / 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, overriding the scan daemon temp-error
+
+.
+quit
+****
+#
+#
+#
+# Recheck that defer_ok option does not affect a malware detection
+#
+server DIR/eximdir/aveserver_sock
+>2xx ready
+<SCAN
+>322 VNAME found
+>2xx ready
+<quit
+>2xx ready
+*eof
+****
+#
+#
+#
+exim -odi -bs -DOPT="/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 rejected (virus found)

 
 .
 quit
 
 .
 quit