ph10 2006/07/04 10:07:20 BST
Modified files:
exim-src/src deliver.c
exim-test runtest
exim-test/stderr 0476 0529
Log:
Missed one case of "retry time not reached" when adding additional
debugging information.
Revision Changes Path
1.35 +7 -3 exim/exim-src/src/deliver.c
1.12 +2 -2 exim/exim-test/runtest
1.5 +1 -1 exim/exim-test/stderr/0476
1.3 +2 -1 exim/exim-test/stderr/0529
Index: deliver.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/deliver.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- deliver.c 30 Jun 2006 15:36:08 -0000 1.34
+++ deliver.c 4 Jul 2006 09:07:20 -0000 1.35
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/deliver.c,v 1.34 2006/06/30 15:36:08 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/deliver.c,v 1.35 2006/07/04 09:07:20 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2328,8 +2328,13 @@
retry_record->more_errno);
DEBUG(D_deliver|D_retry)
+ {
debug_printf("retry time not reached for %s: "
"checking ultimate address timeout\n", addr2->address);
+ debug_printf(" now=%d first_failed=%d next_try=%d expired=%d\n",
+ (int)now, (int)retry_record->first_failed,
+ (int)retry_record->next_try, retry_record->expired);
+ }
if (retry != NULL && retry->rules != NULL)
{
@@ -2338,9 +2343,8 @@
last_rule->next != NULL;
last_rule = last_rule->next);
DEBUG(D_deliver|D_retry)
- debug_printf("now=%d received_time=%d diff=%d timeout=%d\n",
- (int)now, received_time, (int)now - received_time,
- last_rule->timeout);
+ debug_printf(" received_time=%d diff=%d timeout=%d\n",
+ received_time, (int)now - received_time, last_rule->timeout);
if (now - received_time > last_rule->timeout) ok = TRUE;
}
else
Index: runtest
===================================================================
RCS file: /home/cvs/exim/exim-test/runtest,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- runtest 3 Jul 2006 15:39:06 -0000 1.11
+++ runtest 4 Jul 2006 09:07:20 -0000 1.12
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
-# $Cambridge: exim/exim-test/runtest,v 1.11 2006/07/03 15:39:06 ph10 Exp $
+# $Cambridge: exim/exim-test/runtest,v 1.12 2006/07/04 09:07:20 ph10 Exp $
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
@@ -414,7 +414,7 @@
$_ = " first failed=dddd last try=dddd next try=+$next $4\n";
}
s/^(\s*)now=\d+ first_failed=\d+ next_try=\d+ expired=(\d)/$1now=tttt first_failed=tttt next_try=tttt expired=$2/;
- s/^(\s*)received_time=\d+ diff=\d+ timeout=(\d+)/$1now=tttt received_time=tttt diff=tttt timeout=$2/;
+ s/^(\s*)received_time=\d+ diff=\d+ timeout=(\d+)/$1received_time=tttt diff=tttt timeout=$2/;
# Time to retry may vary
s/time to retry = \S+/time to retry = tttt/;
@@ -859,7 +859,7 @@
if (! -e $sf)
{
- return 0 if (! -s $rf && ! -s $rsf);
+ return 0 if (! -s $rf && (! defined $rsf || ! -s $rsf));
print "\n";
print "** $rf is not empty\n" if (-s $rf);
Index: 0476
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0476,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0476 3 Jul 2006 15:39:06 -0000 1.4
+++ 0476 4 Jul 2006 09:07:20 -0000 1.5
@@ -97,7 +97,7 @@
no message retry record
host retry time not reached: checking ultimate address timeout
now=tttt first_failed=tttt next_try=tttt expired=0
- now=tttt received_time=tttt diff=tttt timeout=86400
+ received_time=tttt diff=tttt timeout=86400
127.0.0.1 [127.0.0.1]:1111 status = unusable
all IP addresses skipped or deferred at least one address
Leaving t1 transport
Index: 0529
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0529,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 0529 9 Feb 2006 14:50:58 -0000 1.2
+++ 0529 4 Jul 2006 09:07:20 -0000 1.3
@@ -70,7 +70,8 @@
retry record exists: age=ttt (max 1w)
time to retry = tttt expired = 0
retry time not reached for TESTSUITE/test-mail/rmbox: checking ultimate address timeout
-now=tttt received_time=tttt diff=tttt timeout=259200
+ now=tttt first_failed=tttt next_try=tttt expired=0
+ received_time=tttt diff=tttt timeout=259200
LOG: retry_defer MAIN
== TESTSUITE/test-mail/rmbox <x@???> R=r1 T=t1 defer (-52): Retry time not yet reached
Processing retry items
