Testsuite: output changes resulting

[exim.git] / test / stderr / 0374

diff --git a/test/stderr/0374 b/test/stderr/0374
index d1d1b99b665e6ea478ba6e12cc9b9193073f6aa4..7d881dd1dc13d2d4423983d1ac92c3f26502840a 100644 (file)
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -5,7 +5,6 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 fresh-exec forking for local-accept-delivery
   <= CALLER@myhost.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
 fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config


@@ -341,87 +340,71 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => a1 <a1@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => a1 <a1@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => b1 <b1@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => b1 <b1@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => c1 <c1@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => c1 <c1@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d1 <d1@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d1 <d1@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d2 <d2@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d2 <d2@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d3 <d3@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => d3 <d3@myhost.test.ex> R=real T=real
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => a1 <a1@myhost.test.ex> R=u1 T=ut1
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => a1 <a1@myhost.test.ex> R=u1 T=ut1
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 delivery-local forking for pipe-tpt-cmd
 delivery-local forking for pipe-tpt-cmd

-postfork: pipe-tpt-cmd

 local-accept-delivery forked for delivery-local: npppp
 delivery-local forked for pipe-tpt-cmd: npppp
 delivery-local forking for pipe-tpt-output
 local-accept-delivery forked for delivery-local: npppp
 delivery-local forked for pipe-tpt-cmd: npppp
 delivery-local forking for pipe-tpt-output

-postfork: pipe-tpt-output

 delivery-local forked for pipe-tpt-output: npppp
 transport error EPIPE ignored
 LOG: MAIN
   ** b1@myhost.test.ex R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
 delivery-local forked for pipe-tpt-output: npppp
 transport error EPIPE ignored
 LOG: MAIN
   ** b1@myhost.test.ex R=ut2 T=ut2: Child process of ut2 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 delivery-local forking for pipe-tpt-cmd
 delivery-local forking for pipe-tpt-cmd

-postfork: pipe-tpt-cmd

 local-accept-delivery forked for delivery-local: npppp
 delivery-local forked for pipe-tpt-cmd: npppp
 delivery-local forking for pipe-tpt-output
 local-accept-delivery forked for delivery-local: npppp
 delivery-local forked for pipe-tpt-cmd: npppp
 delivery-local forking for pipe-tpt-output

-postfork: pipe-tpt-output

 delivery-local forked for pipe-tpt-output: npppp
 transport error EPIPE ignored
 LOG: MAIN
   == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 local-accept-delivery forking for transport
 delivery-local forked for pipe-tpt-output: npppp
 transport error EPIPE ignored
 LOG: MAIN
   == c1@myhost.test.ex R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 local-accept-delivery forking for transport

-postfork: transport

 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 local-accept-delivery forked for transport: npppp
 LOG: MAIN
   => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 local-accept-delivery forked for transport: npppp
 LOG: MAIN
   => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 local-accept-delivery forking for transport

-postfork: transport

 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forked for transport: npppp
 LOG: MAIN
   == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
 local-accept-delivery forking for transport
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forked for transport: npppp
 LOG: MAIN
   == d2@myhost.test.ex R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: 450 soft error
 local-accept-delivery forking for transport

-postfork: transport

 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 local-accept-delivery forked for transport: npppp
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 local-accept-delivery forked for transport: npppp


@@ -429,7 +412,6 @@ LOG: MAIN
   ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for bounce-message
   ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for bounce-message

-postfork: bounce-message

 local-accept-delivery forked for bounce-message: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 local-accept-delivery forked for bounce-message: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config


@@ -438,7 +420,6 @@ admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 bounce-message forking for local-accept-delivery
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 bounce-message forking for local-accept-delivery

-postfork: local-accept-delivery

 bounce-message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 bounce-message forked for local-accept-delivery: npppp
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config


@@ -490,7 +471,6 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 local-accept-delivery forking for delivery-local

-postfork: delivery-local

 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => CALLER <CALLER@myhost.test.ex> R=real T=real
 local-accept-delivery forked for delivery-local: npppp
 LOG: MAIN
   => CALLER <CALLER@myhost.test.ex> R=real T=real