diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-01-17 12:44:25 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-01-17 12:44:25 +0000 |
| commit | 7b90bba702ae0f7267931524c4c523c4ee9d46b6 (patch) | |
| tree | e6bde19b5f1883f4551c464c93099f71cee53991 /test | |
| parent | 24796b8d20edd438ff520630d4cf4a39d94dcada (diff) | |
Try to make test 0461 less unreliable.
Diffstat (limited to 'test')
| -rw-r--r-- | test/log/0461 | 5 | ||||
| -rw-r--r-- | test/mail/0461.CALLER | 2 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0461 | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/log/0461 b/test/log/0461 index fbd0be473..9d6f352ad 100644 --- 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 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 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 diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER index d24aaaa4e..7faa6251a 100644 --- 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 - 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. ------ diff --git a/test/scripts/0000-Basic/0461 b/test/scripts/0000-Basic/0461 index a9fd584df..0d89ec1dc 100644 --- a/test/scripts/0000-Basic/0461 +++ b/test/scripts/0000-Basic/0461 @@ -19,7 +19,7 @@ QUIT exim -odi userx@test.ex Short message **** -sleep 3 +sleep 2 server PORT_S 220 server ready EHLO @@ -38,6 +38,7 @@ QUIT exim -odi userx@test.ex Short message **** +sleep 1 server PORT_S 220 server ready EHLO |