Testsuite: handle 1s-boundary crossing

diff --git a/test/confs/0608 b/test/confs/0608
index a2ec1be27a849e4aa79f97e5814ca67bd268178f..34638d2e89104371c37774b2898a60a10faa8ae1 100644 (file)
--- a/test/confs/0608
+++ b/test/confs/0608
@@ -15,7 +15,7 @@ bounce_message_file = OPT
 warn_message_file = OPT
 .endif
 
 warn_message_file = OPT
 .endif
 

-delay_warning =        1s
+delay_warning =        2s

 
 # ----- Routers -----
 
 
 # ----- Routers -----
 

diff --git a/test/scripts/0000-Basic/0608 b/test/scripts/0000-Basic/0608
index f3016f2cfd0d2d871116d265e3c0d7f990f7794d..a3065d097f4cdd8f4f6bfcda18cddda952d6771e 100644 (file)
--- a/test/scripts/0000-Basic/0608
+++ b/test/scripts/0000-Basic/0608
@@ -34,7 +34,8 @@ Subject: test 2.3 - Specified, missing delay message file
 exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' delay_s@test.ex
 Subject: test 2.7 - Specified, expansion good
 ****
 exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' delay_s@test.ex
 Subject: test 2.7 - Specified, expansion good
 ****

-sleep 1
+# Wait past the delay_warning interval
+sleep 3

 exim -M $msg1
 ****
 exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg2
 exim -M $msg1
 ****
 exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg2


@@ -43,7 +44,7 @@ exim -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl -M $msg3
 ****
 exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg4
 ****
 ****
 exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg4
 ****

-sleep 1
+#sleep 1

 #
 #
 no_msglog_check
 #
 #
 no_msglog_check