Testsuite: sort output of retry DB dumps

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

diff --git a/test/scripts/4000-scanning/4006 b/test/scripts/4000-scanning/4006
index af9af49641737415e76a5e597dd1696914366e63..1adf8b136684ba9699ff0f26aefb50a80cc1ebc5 100644 (file)
--- a/test/scripts/4000-scanning/4006
+++ b/test/scripts/4000-scanning/4006
@@ -15,7 +15,7 @@ server DIR/eximdir/avast_sock
 #
 #
 #
 #
 #
 #

-exim -odi -bs -DOPTION="FLAGS -fullfiles"
+exim -odi -bs -DOPTION="FLAGS -fullfiles" -DINSERT=

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


@@ -41,13 +41,13 @@ server DIR/eximdir/avast_sock
 #
 #
 #
 #
 #
 #

-exim -odi -bs -DOPTION=
+exim -odi -bs -DOPTION= -DINSERT=

 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, the scanner had an error

 
 .
 quit
 
 .
 quit


@@ -67,7 +67,7 @@ server DIR/eximdir/avast_sock
 #
 #
 #
 #
 #
 #

-exim -odi -bs -DOPTION=
+exim -odi -bs -DOPTION= -DINSERT="/defer_ok"

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


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

+#
+#
+#
+server DIR/eximdir/avast_sock
+*sleep 3
+****
+#
+#
+#
+exim -odi -bs -DOPTION= -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
+****
+#
+#
+#
+server DIR/eximdir/avast_sock
+*sleep 3
+****
+#
+#
+#
+exim -odi -bs -DOPTION= -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 timeout
+
+.
+quit
+****