X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3a0615784b9974a727afc9d503e9647f52fc630c..433eba59095e6c0512a550cb95a687d019139763:/test/stderr/0357 diff --git a/test/stderr/0357 b/test/stderr/0357 index 0bd08647e..9cc0a6bb5 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -28,18 +28,18 @@ added retry item for R:userx@test.ex:: errno=-44 more_errno=dd,A 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 + == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -userx@test.ex + 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:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error end of retry processing >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -79,12 +79,12 @@ reading retry information for R:userx@test.ex from subprocess 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 + == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -userx@test.ex + userx@test.ex locking TESTSUITE/spool/db/retry.lockfile deleted retry information for R:userx@test.ex deleted retry information for R:test.ex @@ -92,7 +92,7 @@ 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 + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error end of retry processing LOG: queue_run MAIN End queue run: pid=pppp @@ -133,12 +133,12 @@ reading retry information for R:userx@test.ex from subprocess 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 + == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -userx@test.ex + userx@test.ex locking TESTSUITE/spool/db/retry.lockfile deleted retry information for R:userx@test.ex deleted retry information for R:test.ex @@ -146,7 +146,7 @@ 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 + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error end of retry processing LOG: queue_run MAIN End queue run: pid=pppp @@ -160,6 +160,9 @@ 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 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -173,7 +176,7 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -userx@test.ex: no retry items + userx@test.ex: no retry items end of retry processing LOG: queue_run MAIN End queue run: pid=pppp