ph10 2007/01/17 12:44:25 GMT
Modified files:
exim-test/log 0461
exim-test/mail 0461.CALLER
exim-test/scripts/0000-Basic 0461
Log:
Try to make test 0461 less unreliable.
Revision Changes Path
1.2 +2 -3 exim/exim-test/log/0461
1.2 +1 -1 exim/exim-test/mail/0461.CALLER
1.3 +2 -1 exim/exim-test/scripts/0000-Basic/0461
Index: 0461
===================================================================
RCS file: /home/cvs/exim/exim-test/log/0461,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0461 7 Feb 2006 10:34:46 -0000 1.1
+++ 0461 17 Jan 2007 12:44:25 -0000 1.2
@@ -7,12 +7,11 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@??? 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@??? 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@??? 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@??? 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@??? R=r1 T=t1 defer (dd): Network Error
-1999-03-02 09:44:33 10HmbA-0005vi-00 ** userx@???: retry timeout exceeded
+1999-03-02 09:44:33 10HmbA-0005vi-00 ** userx@??? 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@???> R=r0 T=t2
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
Index: 0461.CALLER
===================================================================
RCS file: /home/cvs/exim/exim-test/mail/0461.CALLER,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0461.CALLER 7 Feb 2006 10:34:59 -0000 1.1
+++ 0461.CALLER 17 Jan 2007 12:44:25 -0000 1.2
@@ -16,7 +16,7 @@
recipients. This is a permanent error. The following address(es) failed:
userx@???
- 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. ------
Index: 0461
===================================================================
RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0461,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0461 19 Dec 2006 16:40:27 -0000 1.2
+++ 0461 17 Jan 2007 12:44:25 -0000 1.3
@@ -19,7 +19,7 @@
exim -odi userx@???
Short message
****
-sleep 3
+sleep 2
server PORT_S
220 server ready
EHLO
@@ -38,6 +38,7 @@
exim -odi userx@???
Short message
****
+sleep 1
server PORT_S
220 server ready
EHLO
