Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0315

diff --git a/test/stderr/0315 b/test/stderr/0315
index 4105ca321b8c44059f65584824355f880fac9db4..6ecc61f4301812da9f7f3216497ac431b06857ad 100644 (file)
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -12,7 +12,6 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 delivering 10HmaX-000000005vi-0000
 admin user
 dropping to exim gid; retaining priv uid
 delivering 10HmaX-000000005vi-0000

-locking TESTSUITE/spool/db/retry.lockfile

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@ten-1.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@ten-1.test.ex


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

-locking TESTSUITE/spool/db/retry.lockfile

 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


@@ -73,7 +71,6 @@ trusted user
 admin user
 dropping to exim gid; retaining priv uid
 delivering 10HmaY-000000005vi-0000
 admin user
 dropping to exim gid; retaining priv uid
 delivering 10HmaY-000000005vi-0000

-locking TESTSUITE/spool/db/retry.lockfile

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@ten-2.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@ten-2.test.ex


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

-locking TESTSUITE/spool/db/retry.lockfile

 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