X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/54c5ebb14ead7439af300e9d7d9d7d2ba29ff32e..96c065cb7bcdfc0965fb111e1eab6e9180e9e186:/test/stderr/0358?ds=sidebyside diff --git a/test/stderr/0358 b/test/stderr/0358 index 04029aea0..c48a96e4b 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -29,12 +29,11 @@ After routing: 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 -added retry item for R:usery@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 for R:userx@test.ex:: errno=-44 more_errno=dd,A flags=0 +added retry item for R:usery@test.ex:: errno=-44 more_errno=dd,A flags=0 +reading retry information for R:userx@test.ex: from subprocess added retry item -reading retry information for R:usery@test.ex from subprocess +reading retry information for R:usery@test.ex: from subprocess added retry item LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error @@ -46,13 +45,15 @@ Failed addresses: Deferred addresses: usery@test.ex locking TESTSUITE/spool/db/retry.lockfile -retry for R:usery@test.ex = * -Writing retry data for R:usery@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=+1 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error userx@test.ex -retry for R:userx@test.ex = * -Writing retry data 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:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error end of retry processing @@ -86,25 +87,24 @@ checking status of 127.0.0.1 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 -added retry item for R:usery@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 for R:userx@test.ex:: errno=-44 more_errno=dd,A flags=0 +added retry item for R:usery@test.ex:: errno=-44 more_errno=dd,A flags=0 +reading retry information for R:userx@test.ex: from subprocess added retry item reading retry information for R:test.ex from subprocess existing delete item dropped added delete item reading retry information for R:userx@test.ex from subprocess - delete item not added: non-delete item exists -reading retry information for R:usery@test.ex from subprocess existing delete item dropped + added delete item +reading retry information for R:usery@test.ex: from subprocess added retry item reading retry information for R:test.ex from subprocess existing delete item dropped added delete item reading retry information for R:usery@test.ex from subprocess - delete item not added: non-delete item exists + existing delete item dropped + added delete item LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error LOG: MAIN @@ -115,15 +115,19 @@ Failed addresses: Deferred addresses: usery@test.ex locking TESTSUITE/spool/db/retry.lockfile +deleted retry information for R:usery@test.ex deleted retry information for R:test.ex -retry for R:usery@test.ex = * -Writing retry data for R:usery@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:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error userx@test.ex +deleted retry information for R:userx@test.ex deleted retry information for R:test.ex -retry for R:userx@test.ex = * -Writing retry data 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:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error end of retry processing