X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/f6c332bd03c89f108c7fe531156cb18d7888ba35..c04cf318cb6c0ea42d2c3e37262ac68f282fdbe4:/test/stderr/0357?ds=sidebyside diff --git a/test/stderr/0357 b/test/stderr/0357 index 7a6ee4d3b..4b7798c53 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -24,8 +24,8 @@ 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 -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 +reading retry information for R:userx@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 @@ -35,9 +35,9 @@ Failed addresses: Deferred addresses: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -retry for R:userx@test.ex = * 0 0 +retry for R:userx@test.ex: = * 0 0 failing_interval=ttt message_age=ttt -Writing retry data for R:userx@test.ex +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 @@ -52,6 +52,7 @@ locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex no domain retry record +added retry item for R:userx@test.ex:: errno=-1 more_errno=dd flags=1 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -65,14 +66,17 @@ 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 -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 +reading retry information for R:userx@test.ex: from subprocess existing delete item dropped 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 + 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 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 @@ -82,10 +86,11 @@ Failed addresses: Deferred addresses: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile +deleted retry information for R:userx@test.ex deleted retry information for R:test.ex -retry for R:userx@test.ex = * 0 0 +retry for R:userx@test.ex: = * 0 0 failing_interval=ttt message_age=ttt -Writing retry data for R:userx@test.ex +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 @@ -101,6 +106,7 @@ locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex no domain retry record +added retry item for R:userx@test.ex:: errno=-1 more_errno=dd flags=1 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -114,14 +120,17 @@ 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 -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 +reading retry information for R:userx@test.ex: from subprocess existing delete item dropped 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 + 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 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 @@ -131,13 +140,44 @@ Failed addresses: Deferred addresses: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile +deleted retry information for R:userx@test.ex deleted retry information for R:test.ex -retry for R:userx@test.ex = * 0 0 +retry for R:userx@test.ex: = * 0 0 failing_interval=ttt message_age=ttt -Writing retry data for R:userx@test.ex +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 LOG: queue_run MAIN End queue run: pid=pppp >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +LOG: queue_run MAIN + Start queue run: pid=pppp +locking TESTSUITE/spool/db/retry.lockfile +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +Considering: userx@test.ex +no domain retry record +retry time not reached: checking ultimate address timeout + now=tttt first_failed=tttt next_try=tttt expired=0 + received_time=tttt diff=tttt timeout=3600 +LOG: retry_defer MAIN + == userx@test.ex routing defer (-51): retry time not reached +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +After routing: + Local deliveries: + Remote deliveries: + Failed addresses: + Deferred addresses: + userx@test.ex +Processing retry items +Succeeded addresses: +Failed addresses: +Deferred addresses: +userx@test.ex: no retry items +end of retry processing +LOG: queue_run MAIN + End queue run: pid=pppp +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>