X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ccec2d82e2fda6d764f6cd1a9dd21c4f6285b614..36bee217cba7c61313cce8e4a4a0c477db421dd0:/test/stderr/0379

diff --git a/test/stderr/0379 b/test/stderr/0379
index ac97e71dd..b67f47861 100644
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -1,15 +1,16 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer@myhost.test.ex
@@ -24,6 +25,7 @@ routing aaaa@myhost.test.ex
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
+aaaa in local_parts? no (end of list)
 defer router skipped: local_parts mismatch
 --------> aaaa_redirect router <--------
 local_part=aaaa domain=myhost.test.ex
@@ -59,7 +61,6 @@ defer router: defer for defer@myhost.test.ex
   message: forced defer
 LOG: MAIN
   == defer@myhost.test.ex R=defer defer (-1): forced defer
-locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: bbbb@myhost.test.ex
@@ -74,10 +75,12 @@ routing cccc@myhost.test.ex
 --------> defer router <--------
 local_part=cccc domain=myhost.test.ex
 checking local_parts
+cccc in local_parts? no (end of list)
 defer router skipped: local_parts mismatch
 --------> aaaa_redirect router <--------
 local_part=cccc domain=myhost.test.ex
 checking local_parts
+cccc in local_parts? no (end of list)
 aaaa_redirect router skipped: local_parts mismatch
 --------> bc router <--------
 local_part=cccc domain=myhost.test.ex
@@ -98,10 +101,12 @@ routing bbbb@myhost.test.ex
 --------> defer router <--------
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
+bbbb in local_parts? no (end of list)
 defer router skipped: local_parts mismatch
 --------> aaaa_redirect router <--------
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
+bbbb in local_parts? no (end of list)
 aaaa_redirect router skipped: local_parts mismatch
 --------> bc router <--------
 local_part=bbbb domain=myhost.test.ex
@@ -125,22 +130,19 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@myhost.test.ex
-locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => bbbb <aaaa@myhost.test.ex> R=bc T=t1
-locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => cccc <aaaa@myhost.test.ex> R=bc T=t1
-locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 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
-locking TESTSUITE/spool/db/retry.lockfile
+  Start queue run: pid=p1234 -qf
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer@myhost.test.ex
 unique = defer@myhost.test.ex
@@ -167,8 +169,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer@myhost.test.ex
-locking TESTSUITE/spool/db/retry.lockfile
->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
-  End queue run: pid=pppp -qf
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+  End queue run: pid=p1234 -qf
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>