X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=test%2Fstderr%2F0357;h=3e16d18267f8917ff349417fd952987fa4caf745;hp=3692e95741baaa84d35e790f865581ce6752584d;hb=dca6d121a4bdc3fd58cf1e72e9fe04278ae6fac0;hpb=ea49d0e16fbc6f56fc5b8519d266f88d09139187 diff --git a/test/stderr/0357 b/test/stderr/0357 index 3692e9574..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: @@ -24,25 +24,25 @@ 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 -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 +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 -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 +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 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,9 @@ 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 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -65,33 +67,37 @@ 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 -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 +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 + == 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 -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 +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 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 @@ -100,7 +106,9 @@ 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 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -114,30 +122,65 @@ 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 -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 +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 + == 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 -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 +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=+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 (main) 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 +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=F + 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 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>