X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/727071f81598850285bc4f6270a5bd9ad40c61ba..c26e27d5b81ed5640c00ee87f1d4287fb066dc12:/test/stderr/0358?ds=sidebyside diff --git a/test/stderr/0358 b/test/stderr/0358 index 2756de19a..a27c80ec6 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -12,12 +12,12 @@ 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 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: usery@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: @@ -29,37 +29,36 @@ 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 + == 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 LOG: MAIN - == usery@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 + == usery@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: -usery@test.ex + usery@test.ex locking TESTSUITE/spool/db/retry.lockfile -retry for R:usery@test.ex = * 0 0 +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 = * 0 0 +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 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error + 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 +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 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 @@ -68,12 +67,16 @@ 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 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: usery@test.ex -no domain retry record +no domain retry record +have address retry record; next_try = now+0 +added retry item for R:usery@test.ex:: errno=-1 more_errno=dd flags=1 added retry item for R:usery@test.ex: errno=-1 more_errno=dd flags=1 added retry item for R: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:userx@test.ex: errno=-1 more_errno=dd flags=1 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -88,49 +91,56 @@ 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 +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 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 -reading retry information for R:usery@test.ex from subprocess +reading retry information for R:usery@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:usery@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 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 LOG: MAIN - == usery@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 + == usery@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: -usery@test.ex + 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 = * 0 0 +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 +Writing retry data for R:usery@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 + userx@test.ex +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 - 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 +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 LOG: queue_run MAIN End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>