testsuite: tidy runtest

[users/heiko/exim.git] / test / stderr / 0426

diff --git a/test/stderr/0426 b/test/stderr/0426
index b41aed92bb8ed807474918ba16fdad647ef5a1eb..0ac7207b20826ad573ad229c19315723cbfe8c1d 100644 (file)
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -4,9 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log

-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -29,16 +26,7 @@ local_part=x domain=uppercase.test.ex
 calling r1 router
 r1 router called for x@uppercase.test.ex
   domain = uppercase.test.ex
 calling r1 router
 r1 router called for x@uppercase.test.ex
   domain = uppercase.test.ex

-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp

 uppercase.test.ex (MX resp) DNSSEC
 uppercase.test.ex (MX resp) DNSSEC

-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp

 local host found for non-MX address
 fully qualified name = UpperCase.test.ex
 uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 
 local host found for non-MX address
 fully qualified name = UpperCase.test.ex
 uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 


@@ -47,7 +35,7 @@ set transport t1
 queued for t1 transport: local_part = x
 domain = uppercase.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = x
 domain = uppercase.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by r1 router
   envelope to: x@UpperCase.test.ex
   transport: t1
 routed by r1 router
   envelope to: x@UpperCase.test.ex
   transport: t1


@@ -59,25 +47,16 @@ After routing:
     x@UpperCase.test.ex
   Failed addresses:
   Deferred addresses:
     x@UpperCase.test.ex
   Failed addresses:
   Deferred addresses:

-fresh-exec forking for transport
-postfork: transport

 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile

-fresh-exec forked for transport: npppp

 LOG: MAIN
   ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown
 LOG: MAIN
   ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown

-fresh-exec forking for bounce message
-postfork: bounce message
-fresh-exec forked for bounce message: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss

-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -111,9 +90,9 @@ After routing:
   Deferred addresses:
 LOG: MAIN
   Completed
   Deferred addresses:
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   Completed
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>