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

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

diff --git a/test/stderr/0360 b/test/stderr/0360
index af11caa8e1ad76d7ec22e336378f4a901b9eeb7f..decaa15943d9b177e298e7daf5f146f7252c7cdb 100644 (file)
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -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


@@ -49,7 +46,7 @@ v0 router called for postmaster@test.ex
 queued for <unset> transport: local_part = postmaster
 domain = test.ex
   errors_to=NULL
 queued for <unset> transport: local_part = postmaster
 domain = test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=postmaster

 routed by v0 router
   envelope to: postmaster@test.ex
   transport: <none>
 routed by v0 router
   envelope to: postmaster@test.ex
   transport: <none>


@@ -106,19 +103,7 @@ checking domains
 calling r1 router
 r1 router called for unknown@recurse.test.ex
   domain = recurse.test.ex
 calling r1 router
 r1 router called for unknown@recurse.test.ex
   domain = recurse.test.ex

-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp

 r1 router widened recurse.test.ex to recurse.test.ex.test.ex
 r1 router widened recurse.test.ex to recurse.test.ex.test.ex

-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp

 domain changed to recurse.test.ex.test.ex
 rewriting header lines
 re-routed to unknown@recurse.test.ex.test.ex
 domain changed to recurse.test.ex.test.ex
 rewriting header lines
 re-routed to unknown@recurse.test.ex.test.ex


@@ -139,9 +124,6 @@ checking domains
 calling r1 router
 r1 router called for unknown@recurse.test.ex.test.ex
   domain = recurse.test.ex.test.ex
 calling r1 router
 r1 router called for unknown@recurse.test.ex.test.ex
   domain = recurse.test.ex.test.ex

-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp

 set transport t1
 queued for t1 transport: local_part = unknown
 domain = recurse.test.ex.test.ex
 set transport t1
 queued for t1 transport: local_part = unknown
 domain = recurse.test.ex.test.ex


@@ -160,22 +142,17 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@test.ex
   Failed addresses:
   Deferred addresses:
     defer@test.ex

-local-accept-delivery forking for transport
-postfork: transport

 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/retry.lockfile

-local-accept-delivery forked for transport: npppp

 LOG: MAIN
   *> unknown@recurse.test.ex.test.ex <cms@test.ex> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   *> unknown@recurse.test.ex.test.ex <cms@test.ex> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option"

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

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf

-fresh-exec forking for qrun delivery
-postfork: qrun delivery

 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -212,7 +189,7 @@ v0 router called for postmaster@test.ex
 queued for <unset> transport: local_part = postmaster
 domain = test.ex
   errors_to=NULL
 queued for <unset> transport: local_part = postmaster
 domain = test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=postmaster

 routed by v0 router
   envelope to: postmaster@test.ex
   transport: <none>
 routed by v0 router
   envelope to: postmaster@test.ex
   transport: <none>


@@ -266,7 +243,6 @@ After routing:
   Deferred addresses:
     defer@test.ex
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
   Deferred addresses:
     defer@test.ex
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

-fresh-exec forked for qrun delivery: npppp

 LOG: queue_run MAIN
   End queue run: pid=pppp -qf
 LOG: queue_run MAIN
   End queue run: pid=pppp -qf

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