X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/cc5a3f43827026193110cb663151a95eac4ee379..8280aa0c334a7ce06c55df35d9da7a99f79c3568:/test/stderr/0378?ds=sidebyside diff --git a/test/stderr/0378 b/test/stderr/0378 index bb7b4a40a..e48fb7e76 100644 --- a/test/stderr/0378 +++ b/test/stderr/0378 @@ -1,10 +1,6 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: bounce propagating DSN -DSN: defer propagating DSN -DSN: aaaa_2nd_time propagating DSN -DSN: aaaa propagating DSN LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log @@ -12,10 +8,7 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user -DSN: bounce propagating DSN -DSN: defer propagating DSN -DSN: aaaa_2nd_time propagating DSN -DSN: aaaa propagating DSN +dropping to exim gid; retaining priv uid locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -35,24 +28,19 @@ defer router skipped: local_parts mismatch --------> aaaa_2nd_time router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... aaaa_2nd_time router skipped: condition failure --------> aaaa router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts calling aaaa router -rda_interpret (string): # Exim filter -deliver defer_aaaa@$domain -save TESTSUITE/test-mail/file -pipe "/bin/sh -c exit" -mail subject autoreply -text "This is an autoreply" -expanded: # Exim filter +rda_interpret (string): '# Exim filter\ndeliver defer_aaaa@$domain\nsave TESTSUITE/test-mail/file\npipe "/bin/sh -c exit"\nmail subject autoreply\ntext "This is an autoreply"' +expanded: '# Exim filter deliver defer_aaaa@myhost.test.ex save TESTSUITE/test-mail/file pipe "/bin/sh -c exit" mail subject autoreply -text "This is an autoreply" +text "This is an autoreply"' data is an Exim filter program Filter: start of processing Filter: end of processing @@ -106,8 +94,8 @@ bounce router skipped: senders mismatch local_part=defer_aaaa domain=myhost.test.ex checking local_parts calling defer router -rda_interpret (string): :defer: forced defer -expanded: :defer: forced defer +rda_interpret (string): ':defer: forced defer' +expanded: ':defer: forced defer' file is not a filter file parse_forward_list: :defer: forced defer extract item: :defer: forced defer @@ -129,20 +117,13 @@ locking TESTSUITE/spool/db/retry.lockfile Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -DSN: bounce propagating DSN -DSN: defer propagating DSN -DSN: aaaa_2nd_time propagating DSN -DSN: aaaa propagating DSN LOG: MAIN <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user -DSN: bounce propagating DSN -DSN: defer propagating DSN -DSN: aaaa_2nd_time propagating DSN -DSN: aaaa propagating DSN +dropping to exim gid; retaining priv uid locking TESTSUITE/spool/db/retry.lockfile no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -155,8 +136,8 @@ routing CALLER@myhost.test.ex local_part=CALLER domain=myhost.test.ex checking senders calling bounce router -rda_interpret (string): :blackhole: -expanded: :blackhole: +rda_interpret (string): ':blackhole:' +expanded: ':blackhole:' file is not a filter file parse_forward_list: :blackhole: extract item: :blackhole: @@ -171,8 +152,8 @@ After routing: Deferred addresses: LOG: MAIN Completed ->>>>>>>>>>>>>>>> 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 >>>>>>>>>>>>>>>> LOG: MAIN => >CALLER@myhost.test.ex R=aaaa T=t3 locking TESTSUITE/spool/db/retry.lockfile @@ -183,15 +164,12 @@ locking TESTSUITE/spool/db/retry.lockfile LOG: MAIN => TESTSUITE/test-mail/file R=aaaa 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: bounce propagating DSN -DSN: defer propagating DSN -DSN: aaaa_2nd_time propagating DSN -DSN: aaaa propagating DSN +dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qf locking TESTSUITE/spool/db/retry.lockfile @@ -212,10 +190,10 @@ defer router skipped: local_parts mismatch --------> aaaa_2nd_time router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... calling aaaa_2nd_time router -rda_interpret (string): aaaa@$domain -expanded: aaaa@myhost.test.ex +rda_interpret (string): 'aaaa@$domain' +expanded: 'aaaa@myhost.test.ex' file is not a filter file parse_forward_list: aaaa@myhost.test.ex extract item: aaaa@myhost.test.ex @@ -246,18 +224,13 @@ aaaa_2nd_time router skipped: previously routed aaaa@myhost.test.ex local_part=aaaa domain=myhost.test.ex checking local_parts calling aaaa router -rda_interpret (string): # Exim filter -deliver defer_aaaa@$domain -save TESTSUITE/test-mail/file -pipe "/bin/sh -c exit" -mail subject autoreply -text "This is an autoreply" -expanded: # Exim filter +rda_interpret (string): '# Exim filter\ndeliver defer_aaaa@$domain\nsave TESTSUITE/test-mail/file\npipe "/bin/sh -c exit"\nmail subject autoreply\ntext "This is an autoreply"' +expanded: '# Exim filter deliver defer_aaaa@myhost.test.ex save TESTSUITE/test-mail/file pipe "/bin/sh -c exit" mail subject autoreply -text "This is an autoreply" +text "This is an autoreply"' data is an Exim filter program Filter: start of processing Filter: end of processing @@ -310,8 +283,8 @@ bounce router skipped: senders mismatch local_part=defer_aaaa domain=myhost.test.ex checking local_parts calling defer router -rda_interpret (string): :defer: forced defer -expanded: :defer: forced defer +rda_interpret (string): ':defer: forced defer' +expanded: ':defer: forced defer' file is not a filter file parse_forward_list: :defer: forced defer extract item: :defer: forced defer @@ -329,4 +302,4 @@ After routing: 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 >>>>>>>>>>>>>>>>