From 54882a4e1152ec5068099515f22ed01bdd3a117c Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 9 Nov 2018 19:56:32 +0000 Subject: [PATCH] Testsuite: avoid time-quantization issue --- test/confs/0357 | 2 +- test/confs/0358 | 2 +- test/confs/0554 | 2 +- test/scripts/0000-Basic/0357 | 4 ++-- test/scripts/0000-Basic/0358 | 2 +- test/scripts/0000-Basic/0554 | 2 ++ test/stderr/0357 | 6 +++--- test/stderr/0358 | 8 ++++---- test/stderr/0554 | 2 +- test/stdout/0357 | 6 +++--- test/stdout/0358 | 8 ++++---- test/stdout/0447 | 2 +- test/stdout/0554 | 2 +- 13 files changed, 25 insertions(+), 23 deletions(-) diff --git a/test/confs/0357 b/test/confs/0357 index 07f3fc857..3f11016f5 100644 --- 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 24611d0fb..311687026 100644 --- 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 cbcd357a9..c4f240c39 100644 --- 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 ba1f5fa4a..33d59bf4d 100644 --- 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 7571c277f..032bfc1bb 100644 --- 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 0cf76b9d9..da0d2efbd 100644 --- 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 522cf03c4..9ed549a0b 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -38,7 +38,7 @@ locking TESTSUITE/spool/db/retry.lockfile retry for R:userx@test.ex: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@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:: 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: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@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:: 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: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@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:: 451 Temporary error end of retry processing LOG: queue_run MAIN diff --git a/test/stderr/0358 b/test/stderr/0358 index f4c629b09..9506b1529 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -48,13 +48,13 @@ locking TESTSUITE/spool/db/retry.lockfile retry for R:usery@test.ex: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:usery@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:: 451 Temporary error userx@test.ex retry for R:userx@test.ex: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@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:: 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: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:usery@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:: 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: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@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:: 451 Temporary error end of retry processing LOG: queue_run MAIN diff --git a/test/stderr/0554 b/test/stderr/0554 index bbb76dbd4..af486a04b 100644 --- a/test/stderr/0554 +++ b/test/stderr/0554 @@ -31,7 +31,7 @@ locking TESTSUITE/spool/db/retry.lockfile retry for R:x@y: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:x@y: - 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:: 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 648513eab..8c39856af 100644 --- a/test/stdout/0357 +++ b/test/stdout/0357 @@ -1,12 +1,12 @@ +++++++++++++++++++++++++++ R:userx@test.ex: -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 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: -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 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: -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 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 80553ee2b..e8641ea86 100644 --- a/test/stdout/0358 +++ b/test/stdout/0358 @@ -1,13 +1,13 @@ +++++++++++++++++++++++++++ R:userx@test.ex: -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 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: -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 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: -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 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: -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 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 a3faf356a..caecaea8a 100644 --- 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 2f38af2b5..cb3717195 100644 --- a/test/stdout/0554 +++ b/test/stdout/0554 @@ -1,6 +1,6 @@ +++++++++++++++++++++++++++ R:x@y: -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error -first failed = time last try = time2 next try = time2 + 1 +first failed = time last try = time2 next try = time2 + 2 +++++++++++++++++++++++++++ ******** SERVER ******** -- 2.25.1