X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/afd5e75ffc8f64f0ebed1df9dce64793011c14a6..d9de268dd629b0a01c6e01a6bc816dca51f76b12:/test/stderr/0332?ds=inline diff --git a/test/stderr/0332 b/test/stderr/0332 index 549a66302..11f0429dc 100644 --- a/test/stderr/0332 +++ b/test/stderr/0332 @@ -3,7 +3,7 @@ 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: ok@no.delay @@ -21,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 @@ -34,11 +34,12 @@ After routing: 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' 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 pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -49,7 +50,7 @@ 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 @@ -66,7 +67,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 @@ -80,15 +81,16 @@ After routing: 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' LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> 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): retry time not reached + == delay@test.again.dns routing defer (-52): retry time not reached >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: @@ -96,7 +98,7 @@ After routing: Failed addresses: Deferred addresses: delay@test.again.dns ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>