X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/50dc740948ba43eaeb6d33757bc83beff33f2a64..72c385bddd9732b63b9c8fedb18e4469ddbead75:/test/stderr/0377?ds=sidebyside diff --git a/test/stderr/0377 b/test/stderr/0377 index ca3949890..82e492365 100644 --- a/test/stderr/0377 +++ b/test/stderr/0377 @@ -1,14 +1,6 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: defer propagating DSN -DSN: unseen_aaaa propagating DSN -DSN: seen_aaaa propagating DSN -DSN: bbbb propagating DSN -DSN: bbbb_0 propagating DSN -DSN: cccc_2nd_time propagating DSN -DSN: cccc_redirect propagating DSN -DSN: cccc_accept propagating DSN LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log @@ -16,14 +8,6 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user -DSN: defer propagating DSN -DSN: unseen_aaaa propagating DSN -DSN: seen_aaaa propagating DSN -DSN: bbbb propagating DSN -DSN: bbbb_0 propagating DSN -DSN: cccc_2nd_time propagating DSN -DSN: cccc_redirect propagating DSN -DSN: cccc_accept propagating DSN locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -63,7 +47,7 @@ bbbb_0 router skipped: local_parts mismatch --------> cccc_2nd_time router <-------- local_part=cccc domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... cccc_2nd_time router skipped: condition failure --------> cccc_redirect router <-------- local_part=cccc domain=myhost.test.ex @@ -101,7 +85,7 @@ seen_aaaa router skipped: local_parts mismatch --------> bbbb router <-------- local_part=bbbb domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... calling bbbb router rda_interpret (string): bbbb@$domain, defer_bbbb@$domain expanded: bbbb@myhost.test.ex, defer_bbbb@myhost.test.ex @@ -127,7 +111,7 @@ defer router skipped: local_parts mismatch --------> unseen_aaaa router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... calling unseen_aaaa router rda_interpret (string): defer_aaaa@$domain expanded: defer_aaaa@myhost.test.ex @@ -207,7 +191,7 @@ bbbb_0 router skipped: local_parts mismatch --------> cccc_2nd_time router <-------- local_part=cccc domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... cccc_2nd_time router skipped: condition failure --------> cccc_redirect router <-------- cccc_redirect router skipped: previously routed cccc@myhost.test.ex @@ -323,19 +307,11 @@ locking TESTSUITE/spool/db/retry.lockfile LOG: MAIN => cccc R=cccc_accept T=t1 locking TESTSUITE/spool/db/retry.lockfile ->>>>>>>>>>>>>>>> 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 -DSN: defer propagating DSN -DSN: unseen_aaaa propagating DSN -DSN: seen_aaaa propagating DSN -DSN: bbbb propagating DSN -DSN: bbbb_0 propagating DSN -DSN: cccc_2nd_time propagating DSN -DSN: cccc_redirect propagating DSN -DSN: cccc_accept propagating DSN LOG: queue_run MAIN Start queue run: pid=pppp -qf locking TESTSUITE/spool/db/retry.lockfile @@ -376,7 +352,7 @@ bbbb_0 router skipped: local_parts mismatch --------> cccc_2nd_time router <-------- local_part=cccc domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... calling cccc_2nd_time router rda_interpret (string): $local_part@$domain expanded: cccc@myhost.test.ex @@ -406,7 +382,7 @@ seen_aaaa router skipped: local_parts mismatch --------> bbbb router <-------- local_part=bbbb domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... bbbb router skipped: condition failure --------> bbbb_0 router <-------- local_part=bbbb domain=myhost.test.ex @@ -431,7 +407,7 @@ defer router skipped: local_parts mismatch --------> unseen_aaaa router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... unseen_aaaa router skipped: condition failure --------> seen_aaaa router <-------- local_part=aaaa domain=myhost.test.ex @@ -575,18 +551,10 @@ bbbb@myhost.test.ex was previously delivered (t1 transport): discarded locking TESTSUITE/spool/db/retry.lockfile LOG: queue_run MAIN End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> 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 -DSN: defer propagating DSN -DSN: unseen_aaaa propagating DSN -DSN: seen_aaaa propagating DSN -DSN: bbbb propagating DSN -DSN: bbbb_0 propagating DSN -DSN: cccc_2nd_time propagating DSN -DSN: cccc_redirect propagating DSN -DSN: cccc_accept propagating DSN LOG: queue_run MAIN Start queue run: pid=pppp -qf locking TESTSUITE/spool/db/retry.lockfile @@ -627,7 +595,7 @@ bbbb_0 router skipped: local_parts mismatch --------> cccc_2nd_time router <-------- local_part=cccc domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... calling cccc_2nd_time router rda_interpret (string): $local_part@$domain expanded: cccc@myhost.test.ex @@ -657,7 +625,7 @@ seen_aaaa router skipped: local_parts mismatch --------> bbbb router <-------- local_part=bbbb domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... bbbb router skipped: condition failure --------> bbbb_0 router <-------- local_part=bbbb domain=myhost.test.ex @@ -682,7 +650,7 @@ defer router skipped: local_parts mismatch --------> unseen_aaaa router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... unseen_aaaa router skipped: condition failure --------> seen_aaaa router <-------- local_part=aaaa domain=myhost.test.ex @@ -826,4 +794,4 @@ bbbb@myhost.test.ex was previously delivered (t1 transport): discarded locking TESTSUITE/spool/db/retry.lockfile LOG: queue_run MAIN End queue run: pid=pppp -qf ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>