X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6dfc009d6239de52cda0005892fcf09187e3d9ea..ec8db648d3af8af2d9e6cbd4896159235c0f1e49:/test/stderr/0357 diff --git a/test/stderr/0357 b/test/stderr/0357 index 4b7798c53..3e16d1826 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -12,8 +12,8 @@ locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: @@ -28,21 +28,21 @@ 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 + first failed=dddd last try=dddd next try=+2 expired=0 + 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 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -51,7 +51,8 @@ LOG: queue_run MAIN locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex -no domain retry record +no domain retry record +have address retry record; next_try = now+0 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 @@ -79,24 +80,24 @@ 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 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 + first failed=dddd last try=dddd next try=+2 expired=0 + 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 ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -105,7 +106,8 @@ LOG: queue_run MAIN locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex -no domain retry record +no domain retry record +have address retry record; next_try = now+0 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 @@ -133,24 +135,24 @@ 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 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 + first failed=dddd last try=dddd next try=+4 expired=0 + 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 ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -159,9 +161,10 @@ LOG: queue_run MAIN locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex -no domain retry record +no domain retry record +have address retry record; next_try = now+0 retry time not reached: checking ultimate address timeout - now=tttt first_failed=tttt next_try=tttt expired=0 + now=tttt first_failed=tttt next_try=tttt expired=F received_time=tttt diff=tttt timeout=3600 LOG: retry_defer MAIN == userx@test.ex routing defer (-51): retry time not reached @@ -176,8 +179,8 @@ 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 ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>