diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/runtest | 5 | ||||
| -rw-r--r-- | test/stderr/0476 | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/runtest b/test/runtest index 397ea474d..9d84232ff 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.10 2006/04/28 13:46:36 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.11 2006/07/03 15:39:06 ph10 Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -413,7 +413,8 @@ while(<IN>) my($next) = $3 - $2; $_ = " first failed=dddd last try=dddd next try=+$next $4\n"; } - s/^now=\d+ received_time=\d+ diff=\d+ timeout=(\d+)/now=tttt received_time=tttt diff=tttt timeout=$1/; + 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/; # Time to retry may vary s/time to retry = \S+/time to retry = tttt/; diff --git a/test/stderr/0476 b/test/stderr/0476 index 5369e437b..01251066f 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -96,7 +96,8 @@ t1 transport entered checking status of 127.0.0.1 no message retry record host retry time not reached: checking ultimate address timeout -now=tttt received_time=tttt diff=tttt timeout=86400 + now=tttt first_failed=tttt next_try=tttt expired=0 + now=tttt 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 |