diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-07-04 09:07:20 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-07-04 09:07:20 +0000 |
| commit | 148e1ac6c5645e53f4f80eeb4978565b5ca4233b (patch) | |
| tree | 2e13468b51f66db9fe45c7a0579f6d50aa1f41f4 /test | |
| parent | 5d00f5469eeea6c1f1fcfbce61bb84f4b7b6a41d (diff) | |
Missed one case of "retry time not reached" when adding additional
debugging information.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/runtest | 6 | ||||
| -rw-r--r-- | test/stderr/0476 | 2 | ||||
| -rw-r--r-- | test/stderr/0529 | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/test/runtest b/test/runtest index 9d84232ff..37b6fbed4 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.11 2006/07/03 15:39:06 ph10 Exp $ +# $Cambridge: 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 @@ while(<IN>) $_ = " 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 @@ my($rf,$rsf,$mf,$sf,$sortfile) = @_; 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); diff --git a/test/stderr/0476 b/test/stderr/0476 index 01251066f..c70ad2461 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -97,7 +97,7 @@ checking status of 127.0.0.1 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 diff --git a/test/stderr/0529 b/test/stderr/0529 index 406de192c..872b37402 100644 --- a/test/stderr/0529 +++ b/test/stderr/0529 @@ -70,7 +70,8 @@ locking TESTSUITE/spool/db/retry.lockfile 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@test.ex> R=r1 T=t1 defer (-52): Retry time not yet reached Processing retry items |