Testsuite: avoid time-quantization issue

diff --git a/test/confs/0357 b/test/confs/0357
index 07f3fc857af32cf1574ce20a32aee7115ee3b827..3f11016f532316527c7b244d68b911b0c1ee90f9 100644 (file)
--- a/test/confs/0357
+++ b/test/confs/0357
@@ -32,6 +32,6 @@ t1:
 
 begin retry
 
-*   *   F,3s,1s; G,1h,2s,2
+*   *   F,6s,2s; G,1h,4s,2
 
 # End

diff --git a/test/confs/0358 b/test/confs/0358
index 24611d0fb58e206ab8a643bbb4bb046d3b4492c8..311687026e0fcef5cb295add5c77026985e5d876 100644 (file)
--- a/test/confs/0358
+++ b/test/confs/0358
@@ -32,6 +32,6 @@ t1:
 
 begin retry
 
-*   *   F,3s,1s; G,1h,2s,2
+*   *   F,6s,2s; G,1h,4s,2
 
 # End

diff --git a/test/confs/0554 b/test/confs/0554
index cbcd357a9c7fbb085627b14e11ac90e51cde26fd..c4f240c391e5a72d9384f682639c8b1081c9e6d1 100644 (file)
--- a/test/confs/0554
+++ b/test/confs/0554
@@ -30,6 +30,6 @@ smtp:
 
 begin retry
 
-* * F,10s,1s
+* * F,10s,2s
 
 # End

diff --git a/test/scripts/0000-Basic/0357 b/test/scripts/0000-Basic/0357
index ba1f5fa4a45435a6bcf1741f4e9411fac54aaa93..33d59bf4dfc46a3d74670d3fe914e3f38136d0c4 100644 (file)
--- a/test/scripts/0000-Basic/0357
+++ b/test/scripts/0000-Basic/0357
@@ -16,7 +16,7 @@ exim -odi -d-all+retry userx
 Testing 1
 ****
 dump retry
-sleep 1
+sleep 2
 server PORT_S
 220 ESMTP
 EHLO
@@ -31,7 +31,7 @@ QUIT
 exim -q -d-all+retry
 ****
 dump retry
-sleep 3
+sleep 6
 server PORT_S
 220 ESMTP
 EHLO

diff --git a/test/scripts/0000-Basic/0358 b/test/scripts/0000-Basic/0358
index 7571c277f550b76947182b6f36915e2ba2c6315e..032bfc1bb081228edc985e4dea59cfea2716f2dd 100644 (file)
--- a/test/scripts/0000-Basic/0358
+++ b/test/scripts/0000-Basic/0358
@@ -18,7 +18,7 @@ exim -odi -d-all+retry userx usery
 Testing 1
 ****
 dump retry
-sleep 4
+sleep 6
 server PORT_S
 220 ESMTP
 EHLO

diff --git a/test/scripts/0000-Basic/0554 b/test/scripts/0000-Basic/0554
index 0cf76b9d99c56761edb3c049ddf5b198ef9a3941..da0d2efbd1fba6b6c21de41bb58598fd4ab520db 100644 (file)
--- a/test/scripts/0000-Basic/0554
+++ b/test/scripts/0000-Basic/0554
@@ -37,5 +37,7 @@ QUIT
 ****
 exim -odi -d-all+retry -M $msg1
 ****
+#
 dump retry
 no_msglog_check
+#

diff --git a/test/stderr/0357 b/test/stderr/0357
index 522cf03c477ea6dec2e0ab104004cb1c92bf2088..9ed549a0b1d4a7a55b9de483fb6edccdcb82a60e 100644 (file)
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -38,7 +38,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
-  first failed=dddd last try=dddd next try=+1 expired=0
+  first failed=dddd last try=dddd next try=+2 expired=0
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -91,7 +91,7 @@ deleted retry information for R:test.ex
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
-  first failed=dddd last try=dddd next try=+1 expired=0
+  first failed=dddd last try=dddd next try=+2 expired=0
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
 end of retry processing
 LOG: queue_run MAIN
@@ -145,7 +145,7 @@ deleted retry information for R:test.ex
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
-  first failed=dddd last try=dddd next try=+2 expired=0
+  first failed=dddd last try=dddd next try=+4 expired=0
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
 end of retry processing
 LOG: queue_run MAIN

diff --git a/test/stderr/0358 b/test/stderr/0358
index f4c629b0981b41d12d48af9d5636750607cf90d5..9506b152903c3a64047ee742c09909b4dc54c211 100644 (file)
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -48,13 +48,13 @@ locking TESTSUITE/spool/db/retry.lockfile
 retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:usery@test.ex:<CALLER@test.ex>
-  first failed=dddd last try=dddd next try=+1 expired=0
+  first failed=dddd last try=dddd next try=+2 expired=0
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error
  userx@test.ex
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
-  first failed=dddd last try=dddd next try=+1 expired=0
+  first failed=dddd last try=dddd next try=+2 expired=0
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -128,7 +128,7 @@ deleted retry information for R:test.ex
 retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:usery@test.ex:<CALLER@test.ex>
-  first failed=dddd last try=dddd next try=+2 expired=0
+  first failed=dddd last try=dddd next try=+4 expired=0
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error
  userx@test.ex
 deleted retry information for R:userx@test.ex
@@ -136,7 +136,7 @@ deleted retry information for R:test.ex
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
-  first failed=dddd last try=dddd next try=+2 expired=0
+  first failed=dddd last try=dddd next try=+4 expired=0
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
 end of retry processing
 LOG: queue_run MAIN

diff --git a/test/stderr/0554 b/test/stderr/0554
index bbb76dbd471843324a6d48fb9c2125585258b0b0..af486a04bf49b22bd3a8007f840aa70c91be6465 100644 (file)
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -31,7 +31,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 retry for R:x@y:<CALLER@myhost.test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:x@y:<CALLER@myhost.test.ex>
-  first failed=dddd last try=dddd next try=+1 expired=0
+  first failed=dddd last try=dddd next try=+2 expired=0
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stdout/0357 b/test/stdout/0357
index 648513eab4be55a3ef19d6e2fa12653fefd26c78..8c39856afc31120fde7fbf74a7165e29bce96b1e 100644 (file)
--- a/test/stdout/0357
+++ b/test/stdout/0357
@@ -1,12 +1,12 @@
 +++++++++++++++++++++++++++
   R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
-first failed = time last try = time2 next try = time2 + 1
+first failed = time last try = time2 next try = time2 + 2
 +++++++++++++++++++++++++++
   R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
-first failed = time last try = time2 next try = time2 + 1
+first failed = time last try = time2 next try = time2 + 2
 +++++++++++++++++++++++++++
   R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
-first failed = time last try = time2 next try = time2 + 2
+first failed = time last try = time2 next try = time2 + 4
 
 ******** SERVER ********
 Listening on port 1224 ... 

diff --git a/test/stdout/0358 b/test/stdout/0358
index 80553ee2b88db36a0d7a9eb08465820f5dd45321..e8641ea86e0f0cbcc79aef4b6b991eb7ea8c2b44 100644 (file)
--- a/test/stdout/0358
+++ b/test/stdout/0358
@@ -1,13 +1,13 @@
 +++++++++++++++++++++++++++
   R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
-first failed = time last try = time2 next try = time2 + 1
+first failed = time last try = time2 next try = time2 + 2
   R:usery@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error
-first failed = time last try = time2 next try = time2 + 1
+first failed = time last try = time2 next try = time2 + 2
 +++++++++++++++++++++++++++
   R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error
-first failed = time last try = time2 next try = time2 + 2
+first failed = time last try = time2 next try = time2 + 4
   R:usery@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error
-first failed = time last try = time2 next try = time2 + 2
+first failed = time last try = time2 next try = time2 + 4
 
 ******** SERVER ********
 Listening on port 1224 ... 

diff --git a/test/stdout/0447 b/test/stdout/0447
index a3faf356a814f8ff637bc45cb12f2eb642fb6b87..caecaea8abbd489c4da4742f063aee338e8735ae 100644 (file)
--- a/test/stdout/0447
+++ b/test/stdout/0447
@@ -11,7 +11,7 @@ first failed = time last try = time2 next try = time2 + 60
 first failed = time last try = time2 next try = time2 + 30
 +++++++++++++++++++++++++++
   T:127.0.0.1:127.0.0.1:1224 dd 321 Connection timed out
-first failed = time last try = time2 next try = time2 + 29
+first failed = time last try = time2 next try = time2 + 30
 +++++++++++++++++++++++++++
   R:xx.test.again.dns -1 0 host lookup did not complete
 first failed = time last try = time2 next try = time2 + 180

diff --git a/test/stdout/0554 b/test/stdout/0554
index 2f38af2b5aeea32ab0e11bb02a23e00a20f6702b..cb371719582a9c2d1cd36a33a36ed43364dafa9b 100644 (file)
--- a/test/stdout/0554
+++ b/test/stdout/0554
@@ -1,6 +1,6 @@
 +++++++++++++++++++++++++++
   R:x@y:<CALLER@myhost.test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
-first failed = time last try = time2 next try = time2 + 1
+first failed = time last try = time2 next try = time2 + 2
 +++++++++++++++++++++++++++
 
 ******** SERVER ********