Try to make test 0461 less unreliable.

diff --git a/test/log/0461 b/test/log/0461
index fbd0be47349a4f24cfb384ab7fbe77b138a79c8b..9d6f352ad6001f960e72960ec58d7cb377dfaf72 100644 (file)
--- a/test/log/0461
+++ b/test/log/0461
@@ -7,12 +7,11 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss

+1999-03-02 09:44:33 10HmaZ-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error

 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss

-1999-03-02 09:44:33 10HmbA-0005vi-00 V4NET.0.0.1 [V4NET.0.0.1] Network Error
-1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@test.ex R=r1 T=t1 defer (dd): Network Error
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** userx@test.ex: retry timeout exceeded
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** userx@test.ex R=r1 T=t1: retry time not reached for any host after a long failure period

 1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER <CALLER@test.ex> R=r0 T=t2
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER <CALLER@test.ex> R=r0 T=t2
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed

diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER
index d24aaaa4e756b242350be3b1cb7d654169cc3c98..7faa6251a17c228e3667745f6ee3e1baddbc4972 100644 (file)
--- a/test/mail/0461.CALLER
+++ b/test/mail/0461.CALLER
@@ -16,7 +16,7 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   userx@test.ex
 recipients. This is a permanent error. The following address(es) failed:
 
   userx@test.ex

-    retry timeout exceeded
+    retry time not reached for any host after a long failure period

 
 ------ This is a copy of the message, including all the headers. ------
 
 
 ------ This is a copy of the message, including all the headers. ------
 

diff --git a/test/scripts/0000-Basic/0461 b/test/scripts/0000-Basic/0461
index a9fd584dfb0605205aa433f51f23d3c3c53fc136..0d89ec1dc07c05ebb99eb827667ff0c8fb6d2453 100644 (file)
--- a/test/scripts/0000-Basic/0461
+++ b/test/scripts/0000-Basic/0461
@@ -19,7 +19,7 @@ QUIT
 exim -odi userx@test.ex
 Short message
 ****
 exim -odi userx@test.ex
 Short message
 ****

-sleep 3
+sleep 2

 server PORT_S
 220 server ready
 EHLO
 server PORT_S
 220 server ready
 EHLO


@@ -38,6 +38,7 @@ QUIT
 exim -odi userx@test.ex
 Short message
 ****
 exim -odi userx@test.ex
 Short message
 ****

+sleep 1

 server PORT_S
 220 server ready
 EHLO
 server PORT_S
 220 server ready
 EHLO