X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/50dc740948ba43eaeb6d33757bc83beff33f2a64..ee549a2ed04164407f4f897be3bf545f32579c5c:/test/stderr/0332?ds=sidebyside diff --git a/test/stderr/0332 b/test/stderr/0332 index 7dea91571..54cd5d8d2 100644 --- a/test/stderr/0332 +++ b/test/stderr/0332 @@ -1,11 +1,10 @@ Exim version x.yz .... +Hints DB: configuration file is TESTSUITE/test-config admin user -DSN: r1 propagating DSN -DSN: r2 propagating DSN +dropping to exim gid; retaining priv uid LOG: queue_run MAIN - Start queue run: pid=pppp -locking TESTSUITE/spool/db/retry.lockfile + Start queue run: pid=p1234 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: ok@no.delay unique = ok@no.delay @@ -22,7 +21,7 @@ set transport t1 queued for t1 transport: local_part = ok domain = no.delay errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=no.delay local_part_data=NULL routed by r1 router envelope to: ok@no.delay transport: t1 @@ -33,24 +32,18 @@ After routing: ok@no.delay Failed addresses: Deferred addresses: -locking TESTSUITE/spool/db/retry.lockfile -locking TESTSUITE/spool/db/wait-t1.lockfile +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250' +>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>> +qrun-delivery becomes continued-delivery LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" LOG: MAIN Completed -Exim version x.yz .... -configuration file is TESTSUITE/test-config -trusted user -admin user -DSN: r1 propagating DSN -DSN: r2 propagating DSN -locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: delay@test.again.dns unique = delay@test.again.dns LOG: retry_defer MAIN - == delay@test.again.dns routing defer (-51): reusing SMTP connection skips previous routing defer + == delay@test.again.dns routing defer (-52): reusing SMTP connection skips previous routing defer >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: ok@no.delay unique = ok@no.delay @@ -63,11 +56,10 @@ checking domains calling r1 router r1 router called for ok@no.delay domain = no.delay -set transport t1 queued for t1 transport: local_part = ok domain = no.delay errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=no.delay local_part_data=NULL routed by r1 router envelope to: ok@no.delay transport: t1 @@ -79,17 +71,16 @@ After routing: Failed addresses: Deferred addresses: delay@test.again.dns -locking TESTSUITE/spool/db/retry.lockfile -locking TESTSUITE/spool/db/wait-t1.lockfile +cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250' +>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> -locking TESTSUITE/spool/db/retry.lockfile +>>>>>>>>>>>>>>>> Exim pid=p1237 (continued-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: delay@test.again.dns unique = delay@test.again.dns LOG: retry_defer MAIN - == delay@test.again.dns routing defer (-51): retry time not reached + == delay@test.again.dns routing defer (-52): retry time not reached >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: @@ -97,6 +88,7 @@ After routing: Failed addresses: Deferred addresses: delay@test.again.dns +>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>