diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/runtest | 3 | ||||
| -rw-r--r-- | test/stderr/0357 | 3 | ||||
| -rw-r--r-- | test/stderr/0358 | 4 | ||||
| -rw-r--r-- | test/stderr/0388 | 8 | ||||
| -rw-r--r-- | test/stderr/0529 | 1 | ||||
| -rw-r--r-- | test/stderr/5005 | 2 |
6 files changed, 16 insertions, 5 deletions
diff --git a/test/runtest b/test/runtest index acff149af..2210cba3b 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.2 2006/02/08 14:28:51 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.3 2006/02/09 14:50:58 ph10 Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -417,6 +417,7 @@ while(<IN>) # Time to retry may vary s/time to retry = \S+/time to retry = tttt/; s/retry record exists: age=\S+/retry record exists: age=ttt/; + s/failing_interval=\S+ message_age=\S+/failing_interval=ttt message_age=ttt/; # Date/time in exim -bV output s/\d\d-[A-Z][a-z]{2}-\d{4}\s\d\d:\d\d:\d\d/07-Mar-2000 12:21:52/g; diff --git a/test/stderr/0357 b/test/stderr/0357 index 3692e9574..f7bc3f635 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -37,6 +37,7 @@ Deferred addresses: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile retry for R:userx@test.ex = * 0 0 +failing_interval=ttt message_age=ttt Writing retry data for R:userx@test.ex first failed=dddd last try=dddd next try=+1 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error @@ -85,6 +86,7 @@ userx@test.ex locking TESTSUITE/spool/db/retry.lockfile deleted retry information for R:test.ex retry for R:userx@test.ex = * 0 0 +failing_interval=ttt message_age=ttt Writing retry data for R:userx@test.ex first failed=dddd last try=dddd next try=+1 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error @@ -134,6 +136,7 @@ userx@test.ex locking TESTSUITE/spool/db/retry.lockfile deleted retry information for R:test.ex retry for R:userx@test.ex = * 0 0 +failing_interval=ttt message_age=ttt Writing retry data for R:userx@test.ex first failed=dddd last try=dddd next try=+2 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error diff --git a/test/stderr/0358 b/test/stderr/0358 index dd36d0267..2756de19a 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -47,11 +47,13 @@ Deferred addresses: usery@test.ex locking TESTSUITE/spool/db/retry.lockfile retry for R:usery@test.ex = * 0 0 +failing_interval=ttt message_age=ttt Writing retry data for R:usery@test.ex first failed=dddd last try=dddd next try=+1 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error userx@test.ex retry for R:userx@test.ex = * 0 0 +failing_interval=ttt message_age=ttt Writing retry data for R:userx@test.ex first failed=dddd last try=dddd next try=+1 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error @@ -117,12 +119,14 @@ usery@test.ex locking TESTSUITE/spool/db/retry.lockfile deleted retry information for R:test.ex retry for R:usery@test.ex = * 0 0 +failing_interval=ttt message_age=ttt Writing retry data for R:usery@test.ex first failed=dddd last try=dddd next try=+2 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error userx@test.ex deleted retry information for R:test.ex retry for R:userx@test.ex = * 0 0 +failing_interval=ttt message_age=ttt Writing retry data for R:userx@test.ex first failed=dddd last try=dddd next try=+2 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error diff --git a/test/stderr/0388 b/test/stderr/0388 index fcb73193a..ca5e45e60 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -145,9 +145,9 @@ y in "*"? yes (matched "*") x@y in "*"? yes (matched "*") retry for R:x@y = * 0 0 dbfn_read: key=R:x@y -on queue longer than maximum retry +failing_interval=ttt message_age=ttt Writing retry data for R:x@y - first failed=dddd last try=dddd next try=+0 expired=0 + first failed=dddd last try=dddd next try=+1 expired=1 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error dbfn_write: key=R:x@y address match: subject=*@V4NET.0.0.0 pattern=* @@ -155,9 +155,9 @@ V4NET.0.0.0 in "*"? yes (matched "*") *@V4NET.0.0.0 in "*"? yes (matched "*") retry for T:V4NET.0.0.0:V4NET.0.0.0:1224 (y) = * 0 0 dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 -on queue longer than maximum retry +failing_interval=ttt message_age=ttt Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:1224 - first failed=dddd last try=dddd next try=+0 expired=0 + first failed=dddd last try=dddd next try=+1 expired=1 errno=dd more_errno=dd,A Network Error dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 timed out: all retries expired diff --git a/test/stderr/0529 b/test/stderr/0529 index bed589de6..406de192c 100644 --- a/test/stderr/0529 +++ b/test/stderr/0529 @@ -38,6 +38,7 @@ Deferred addresses: TESTSUITE/test-mail/rmbox locking TESTSUITE/spool/db/retry.lockfile retry for T:TESTSUITE/test-mail/rmbox:x@test.ex = *@test.ex -22 0 +failing_interval=ttt message_age=ttt Writing retry data for T:TESTSUITE/test-mail/rmbox:x@test.ex first failed=dddd last try=dddd next try=+900 expired=0 errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox) diff --git a/test/stderr/5005 b/test/stderr/5005 index 8a8c8ad3b..87fc73f8d 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -486,6 +486,7 @@ test.ex in "*"? yes (matched "*") userx@test.ex in "*"? yes (matched "*") retry for T:userx@test.ex = * 0 0 dbfn_read: key=T:userx@test.ex +failing_interval=ttt message_age=ttt Writing retry data for T:userx@test.ex first failed=dddd last try=dddd next try=+86400 expired=0 errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) @@ -652,6 +653,7 @@ test.ex in "*"? yes (matched "*") userx@test.ex in "*"? yes (matched "*") retry for T:userx@test.ex = * 0 0 dbfn_read: key=T:userx@test.ex +failing_interval=ttt message_age=ttt Writing retry data for T:userx@test.ex first failed=dddd last try=dddd next try=+86400 expired=0 errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) |