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

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

diff --git a/test/stderr/0315 b/test/stderr/0315
index 155fb4dd0824258aeaf8152a8dae9e0a8a609a67..0c4e4a245a27a3b1ceba593b8b3450f967e8f918 100644 (file)
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -4,8 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log

-fresh-exec forking for 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


@@ -34,7 +32,7 @@ set transport t1
 queued for t1 transport: local_part = y
 domain = ten-1.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = y
 domain = ten-1.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=ten-1.test.ex localpart_data=NULL

 routed by r1 router
   envelope to: y@ten-1.test.ex
   transport: t1
 routed by r1 router
   envelope to: y@ten-1.test.ex
   transport: t1


@@ -50,9 +48,7 @@ After routing:
     y@ten-1.test.ex
   Failed addresses:
   Deferred addresses:
     y@ten-1.test.ex
   Failed addresses:
   Deferred addresses:

-local-accept-delivery forking for transport

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

-local-accept-delivery forked for transport: npppp

 LOG: MAIN
   *> x@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
 LOG: MAIN
   *> x@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN


@@ -66,8 +62,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss

-fresh-exec forking for 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


@@ -131,9 +125,7 @@ After routing:
     y@ten-2.test.ex
   Failed addresses:
   Deferred addresses:
     y@ten-2.test.ex
   Failed addresses:
   Deferred addresses:

-local-accept-delivery forking for transport

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

-local-accept-delivery forked for transport: npppp

 LOG: MAIN
   *> x@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
 LOG: MAIN
   *> x@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN