Cutthrough: handle request when a callout-hold is active. Bug 2604

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

diff --git a/test/scripts/0000-Basic/0618 b/test/scripts/0000-Basic/0618
index 13d395f02f29309b542b1097847b6c068dc30f7c..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,7 +134,7 @@ 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 -q
+exim -Tqt 10s/ -q

 ****
 sleep 1
 exim -Mrm $msg1 $msg2
 ****
 sleep 1
 exim -Mrm $msg1 $msg2