Filters: fix "vacation" in Exim filter. Bug 2593

[users/heiko/exim.git] / test / scripts / 0000-Basic / 0618

diff --git a/test/scripts/0000-Basic/0618 b/test/scripts/0000-Basic/0618
index f841177a0415b67b372cd1e64ed82a0037628e54..69a53c6918120cc8a7d7f7d51838c6d193228a05 100644 (file)
--- a/test/scripts/0000-Basic/0618
+++ b/test/scripts/0000-Basic/0618
@@ -76,8 +76,9 @@ exim -q
 #
 # Client requests notification of deferral.  First time of trying, we get
 # a defer but queue-time probably has not hit the 1st retry time yet, so no DSN
 #
 # Client requests notification of deferral.  First time of trying, we get
 # a defer but queue-time probably has not hit the 1st retry time yet, so no DSN

-# will be sent and the message remains queued.  Later, after a sleep, we will
-# try again.
+# will be sent and the message remains queued.  Then, claiming time has elapsed,
+# we will look again (expecting a delay-DSN to be produced).  We won't see a
+# retry since the actual retry time has not passed.

 exim -z defer/delay
 ****
 client HOSTIPV4 PORT_D
 exim -z defer/delay
 ****
 client HOSTIPV4 PORT_D


@@ -126,7 +127,6 @@ QUIT
 ****
 exim -q
 ****
 ****
 exim -q
 ****

-sleep 3

 #
 #
 #
 #
 #
 #


@@ -134,8 +134,46 @@ sleep 3
 # We should see the notify for c@dump.ex but not d@dump.ex
 exim -z playout
 ****
 # We should see the notify for c@dump.ex but not d@dump.ex
 exim -z playout
 ****

+exim -Tqt 10s/ -q
+****
+sleep 1
+exim -Mrm $msg1 $msg2
+****
+#
+#
+#
+#
+# Client requests bounce+delay notification; bounce happens
+exim -z rej/failure+delay
+****
+client HOSTIPV4 PORT_D
+??? 220
+EHLO testclient
+??? 250-
+??? 250-SIZE
+??? 250-DSN
+??? 250 HELP
+MAIL FROM:<e@dump.ex>
+??? 250
+RCPT TO:<rmt_reject@test.ex> NOTIFY=fAiLuRe,DELAY
+??? 250
+DATA
+??? 354
+Subject: test
+.
+??? 250
+QUIT
+??? 221
+****
+# MSA send msg to MDA
+exim -q
+****
+# deliver notification from MDA
+exim -z 'deliver DSN'
+****

 exim -q
 ****
 exim -q
 ****

+sleep 1

 killdaemon
 #
 #
 killdaemon
 #
 #