X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/799253d6a75db70c631716a190736c285a97155c..4e36acaf2a61de089bceeeba7c69b3fe0b76c47a:/test/stderr/0377 diff --git a/test/stderr/0377 b/test/stderr/0377 index 560192970..186c897c2 100644 --- a/test/stderr/0377 +++ b/test/stderr/0377 @@ -11,7 +11,6 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex @@ -74,8 +73,8 @@ cccc_redirect router generated cccc@myhost.test.ex errors_to=NULL transport=NULL uid=unset gid=unset home=NULL routed by cccc_redirect router - envelope to: cccc@myhost.test.ex - transport: + envelope to: cccc@myhost.test.ex + transport: >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing bbbb@myhost.test.ex --------> defer router <-------- @@ -111,8 +110,8 @@ bbbb router generated bbbb@myhost.test.ex errors_to=NULL transport=NULL uid=unset gid=unset home=NULL routed by bbbb router - envelope to: bbbb@myhost.test.ex - transport: + envelope to: bbbb@myhost.test.ex + transport: >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing aaaa@myhost.test.ex --------> defer router <-------- @@ -134,10 +133,9 @@ unseen_aaaa router generated defer_aaaa@myhost.test.ex errors_to=NULL transport=NULL uid=unset gid=unset home=NULL routed by unseen_aaaa router (unseen) - envelope to: aaaa@myhost.test.ex - transport: + envelope to: aaaa@myhost.test.ex + transport: "unseen" set: replicated aaaa@myhost.test.ex -locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex @@ -224,8 +222,8 @@ domain = myhost.test.ex errors_to=NULL domain_data=NULL local_part_data=cccc routed by cccc_accept router - envelope to: cccc@myhost.test.ex - transport: t1 + envelope to: cccc@myhost.test.ex + transport: t1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing defer_bbbb@myhost.test.ex --------> defer router <-------- @@ -272,8 +270,8 @@ domain = myhost.test.ex errors_to=NULL domain_data=NULL local_part_data=bbbb routed by bbbb_0 router - envelope to: bbbb@myhost.test.ex - transport: t1 + envelope to: bbbb@myhost.test.ex + transport: t1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing defer_aaaa@myhost.test.ex --------> defer router <-------- @@ -303,8 +301,8 @@ domain = myhost.test.ex errors_to=NULL domain_data=NULL local_part_data=aaaa routed by seen_aaaa router - envelope to: aaaa@myhost.test.ex - transport: t1 + envelope to: aaaa@myhost.test.ex + transport: t1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: @@ -317,16 +315,15 @@ After routing: defer_aaaa@myhost.test.ex defer_bbbb@myhost.test.ex defer_cccc@myhost.test.ex -locking TESTSUITE/spool/db/retry.lockfile +>>>>>>>>>>>>>>>> Exim pid=p1238 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => aaaa R=seen_aaaa T=t1 -locking TESTSUITE/spool/db/retry.lockfile +>>>>>>>>>>>>>>>> Exim pid=p1239 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => bbbb R=bbbb_0 T=t1 -locking TESTSUITE/spool/db/retry.lockfile +>>>>>>>>>>>>>>>> Exim pid=p1240 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN => cccc R=cccc_accept T=t1 -locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -336,7 +333,6 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=p1234 -qf -locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex unique = aaaa@myhost.test.ex @@ -390,8 +386,8 @@ cccc_2nd_time router generated cccc@myhost.test.ex errors_to=NULL transport=NULL uid=unset gid=unset home=NULL routed by cccc_2nd_time router - envelope to: cccc@myhost.test.ex - transport: + envelope to: cccc@myhost.test.ex + transport: >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing bbbb@myhost.test.ex --------> defer router <-------- @@ -426,8 +422,8 @@ domain = myhost.test.ex errors_to=NULL domain_data=NULL local_part_data=bbbb routed by bbbb_0 router - envelope to: bbbb@myhost.test.ex - transport: t1 + envelope to: bbbb@myhost.test.ex + transport: t1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing aaaa@myhost.test.ex --------> defer router <-------- @@ -452,9 +448,8 @@ domain = myhost.test.ex errors_to=NULL domain_data=NULL local_part_data=aaaa routed by seen_aaaa router - envelope to: aaaa@myhost.test.ex - transport: t1 -locking TESTSUITE/spool/db/retry.lockfile + envelope to: aaaa@myhost.test.ex + transport: t1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: cccc@myhost.test.ex unique = \0\cccc@myhost.test.ex @@ -505,9 +500,8 @@ cccc_redirect router generated cccc@myhost.test.ex errors_to=NULL transport=NULL uid=unset gid=unset home=NULL routed by cccc_redirect router - envelope to: cccc@myhost.test.ex - transport: -locking TESTSUITE/spool/db/retry.lockfile + envelope to: cccc@myhost.test.ex + transport: >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: cccc@myhost.test.ex unique = \1\cccc@myhost.test.ex @@ -574,8 +568,8 @@ domain = myhost.test.ex errors_to=NULL domain_data=NULL local_part_data=cccc routed by cccc_accept router - envelope to: cccc@myhost.test.ex - transport: t1 + envelope to: cccc@myhost.test.ex + transport: t1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: @@ -589,8 +583,7 @@ After routing: cccc@myhost.test.ex was previously delivered (t1 transport): discarded aaaa@myhost.test.ex was previously delivered (t1 transport): discarded bbbb@myhost.test.ex was previously delivered (t1 transport): discarded -locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN End queue run: pid=p1234 -qf >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -601,7 +594,6 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=p1235 -qf -locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: aaaa@myhost.test.ex unique = aaaa@myhost.test.ex @@ -655,8 +647,8 @@ cccc_2nd_time router generated cccc@myhost.test.ex errors_to=NULL transport=NULL uid=unset gid=unset home=NULL routed by cccc_2nd_time router - envelope to: cccc@myhost.test.ex - transport: + envelope to: cccc@myhost.test.ex + transport: >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing bbbb@myhost.test.ex --------> defer router <-------- @@ -691,8 +683,8 @@ domain = myhost.test.ex errors_to=NULL domain_data=NULL local_part_data=bbbb routed by bbbb_0 router - envelope to: bbbb@myhost.test.ex - transport: t1 + envelope to: bbbb@myhost.test.ex + transport: t1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing aaaa@myhost.test.ex --------> defer router <-------- @@ -717,9 +709,8 @@ domain = myhost.test.ex errors_to=NULL domain_data=NULL local_part_data=aaaa routed by seen_aaaa router - envelope to: aaaa@myhost.test.ex - transport: t1 -locking TESTSUITE/spool/db/retry.lockfile + envelope to: aaaa@myhost.test.ex + transport: t1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: cccc@myhost.test.ex unique = \0\cccc@myhost.test.ex @@ -770,9 +761,8 @@ cccc_redirect router generated cccc@myhost.test.ex errors_to=NULL transport=NULL uid=unset gid=unset home=NULL routed by cccc_redirect router - envelope to: cccc@myhost.test.ex - transport: -locking TESTSUITE/spool/db/retry.lockfile + envelope to: cccc@myhost.test.ex + transport: >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: cccc@myhost.test.ex unique = \1\cccc@myhost.test.ex @@ -839,8 +829,8 @@ domain = myhost.test.ex errors_to=NULL domain_data=NULL local_part_data=cccc routed by cccc_accept router - envelope to: cccc@myhost.test.ex - transport: t1 + envelope to: cccc@myhost.test.ex + transport: t1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: @@ -854,8 +844,7 @@ After routing: cccc@myhost.test.ex was previously delivered (t1 transport): discarded aaaa@myhost.test.ex was previously delivered (t1 transport): discarded bbbb@myhost.test.ex was previously delivered (t1 transport): discarded -locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> Exim pid=p1239 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1242 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: queue_run MAIN End queue run: pid=p1235 -qf >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>