Testsuite: Increase test delays and retry rule times

to allow slow hosts more reliable testing

diff --git a/test/confs/0548 b/test/confs/0548
index 4cd36d918f2d5508591fec66aadf0df397418d9b..3eddcd3cee3f16af77627cf5d42934ad39f5c59c 100644 (file)
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -54,7 +54,7 @@ smtp:
 
 begin retry
 
-thishost.test.ex  *  F,15s,1s
+thishost.test.ex  *  F,20s,2s
 *                 *  F,1s,1s; F,1s,5s
 
 # End

diff --git a/test/scripts/0000-Basic/0548 b/test/scripts/0000-Basic/0548
index 7158ea58470ecd82d033bf801e37cdeda79c5ddd..29e4784d09b8b7cc1d8bdab997c0a0af1acbcd48 100644 (file)
--- a/test/scripts/0000-Basic/0548
+++ b/test/scripts/0000-Basic/0548
@@ -9,20 +9,27 @@ exim -DSERVER=server -bd -oX PORT_D
 exim -odi userx@test.ex
 Test message
 ****
+# defers from both
 dump retry
-sleep 2
-# At this point, the secondary host should have timed out
+millisleep 2100
+# At this point, the primary host retry rule ehould have timed out
+# and the secondary is ready for a retry
 exim -q
 ****
 dump retry
-sleep 1
+millisleep 2100
+# This should be similar
 exim -q
 ****
 dump retry
+# with luck this is tried within a second after the previous
+# so the primary gets tried (it's a new RCPT so the existing retry record is irrelevant)
+# but the secondary is not yet ready for a retry (host record)
 exim -odi usery@test.ex
 Test message 2.
 ****
-sleep 1
+dump retry
+millisleep 2000
 exim -q
 ****
 killdaemon

diff --git a/test/stdout/0548 b/test/stdout/0548
index 7f7d788b664afec34b1f1bb9ccb1c8c05a7ffc4c..522bec99bb1fda78bc41b78889978ab80c0ac2e6 100644 (file)
--- a/test/stdout/0548
+++ b/test/stdout/0548
@@ -2,14 +2,21 @@
   R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred
 first failed = time last try = time2 next try = time2 + 1
   T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
-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=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred
 first failed = time last try = time2 next try = time2 + 5 *
   T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
-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=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred
 first failed = time last try = time2 next try = time2 + 5 *
   T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
+first failed = time last try = time2 next try = time2 + 2
++++++++++++++++++++++++++++
+  R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred
+first failed = time last try = time2 next try = time2 + 5 *
+  R:usery@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Recipient deferred
 first failed = time last try = time2 next try = time2 + 1
+  T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred
+first failed = time last try = time2 next try = time2 + 2