Transport: permit an empty string for the transport_filter option. Bug 1714

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

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
 ****
 exim -odi userx@test.ex
 Test message
 ****

+# defers from both

 dump retry
 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
 exim -q
 ****
 dump retry

-sleep 1
+millisleep 2100
+# This should be similar

 exim -q
 ****
 dump retry
 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.
 ****
 exim -odi usery@test.ex
 Test message 2.
 ****

-sleep 1
+dump retry
+millisleep 2000

 exim -q
 ****
 killdaemon
 exim -q
 ****
 killdaemon