Fix too-often retry bug after 4xx with more hosts than hosts_max_retry.

[exim.git] / test / stderr / 0357

diff --git a/test/stderr/0357 b/test/stderr/0357
index 74e375a70cccd2b17571259bcf0745e12da2e09c..7a6ee4d3bf1a1a310c15f755781717db951d563d 100644 (file)
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -25,7 +25,6 @@ checking status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0

-locking TESTSUITE/spool/db/wait-t1.lockfile

 reading retry information for R:userx@test.ex from subprocess
   added retry item
 LOG: MAIN
 reading retry information for R:userx@test.ex from subprocess
   added retry item
 LOG: MAIN


@@ -36,7 +35,8 @@ Failed addresses:
 Deferred addresses:
 userx@test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 Deferred addresses:
 userx@test.ex
 locking TESTSUITE/spool/db/retry.lockfile

-retry for R: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
 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


@@ -66,7 +66,6 @@ locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record
 added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0
 no host retry record
 no message retry record
 added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0

-locking TESTSUITE/spool/db/wait-t1.lockfile

 reading retry information for R:userx@test.ex from subprocess
   existing delete item dropped
   added retry item
 reading retry information for R:userx@test.ex from subprocess
   existing delete item dropped
   added retry item


@@ -84,7 +83,8 @@ Deferred addresses:
 userx@test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:test.ex
 userx@test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:test.ex

-retry for R: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
 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


@@ -115,7 +115,6 @@ locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record
 added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0
 no host retry record
 no message retry record
 added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0

-locking TESTSUITE/spool/db/wait-t1.lockfile

 reading retry information for R:userx@test.ex from subprocess
   existing delete item dropped
   added retry item
 reading retry information for R:userx@test.ex from subprocess
   existing delete item dropped
   added retry item


@@ -133,7 +132,8 @@ Deferred addresses:
 userx@test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:test.ex
 userx@test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:test.ex

-retry for R: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=+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
 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