X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3b447cdfe3f9f53546d09d7e01d1e0ecf0d6696c..b0e63c7efdc2133c61545b051042d3617ecd2bbd:/test/stderr/0357 diff --git a/test/stderr/0357 b/test/stderr/0357 index 563146702..c07db78d6 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -22,10 +22,11 @@ After routing: userx@test.ex Failed addresses: Deferred addresses: -checking status of 127.0.0.1 +checking retry 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 +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' reading retry information for R:userx@test.ex: from subprocess added retry item LOG: MAIN @@ -42,14 +43,14 @@ 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 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 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1234 locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -65,11 +66,12 @@ After routing: userx@test.ex Failed addresses: Deferred addresses: -checking status of 127.0.0.1 +checking retry 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 +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' reading retry information for R:userx@test.ex: from subprocess existing delete item dropped added retry item @@ -97,16 +99,16 @@ 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 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 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1235 locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -122,11 +124,12 @@ After routing: userx@test.ex Failed addresses: Deferred addresses: -checking status of 127.0.0.1 +checking retry 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 +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' reading retry information for R:userx@test.ex: from subprocess existing delete item dropped added retry item @@ -154,16 +157,16 @@ Writing retry data for R:userx@test.ex: 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 ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1240 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1235 +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1236 locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -173,7 +176,7 @@ retry time not reached: checking ultimate address timeout 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 + == userx@test.ex routing defer (-52): retry time not reached >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: @@ -187,7 +190,7 @@ Failed addresses: Deferred addresses: userx@test.ex: no retry items end of retry processing ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1236 +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>