Cutthrough: handle request when a callout-hold is active. Bug 2604

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

diff --git a/test/stderr/0380 b/test/stderr/0380
index 7f05f1eb484cfb9b849e524e59e4c62378a00f49..46dc1c55aae5ab0f0b90754aa26b811a3551b7c2 100644 (file)
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -4,9 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 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
-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


@@ -82,11 +79,8 @@ After routing:
   Deferred addresses:
     aaaa@myhost.test.ex
 locking TESTSUITE/spool/db/retry.lockfile
   Deferred addresses:
     aaaa@myhost.test.ex
 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
   => bbbb <bbbb@myhost.test.ex> R=r3 T=t1
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => bbbb <bbbb@myhost.test.ex> R=r3 T=t1
 locking TESTSUITE/spool/db/retry.lockfile

->>>>>>>>>>>>>>>> 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 >>>>>>>>>>>>>>>>