Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0332

diff --git a/test/stderr/0332 b/test/stderr/0332
index 11f0429dcc5ed7d259a2902934a61ce2e29a95ef..b717038d9eb16a6d6c4b30c40e47ada131852d3b 100644 (file)
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -1,10 +1,10 @@
 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=p1234
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: ok@no.delay
 unique = ok@no.delay
@@ -32,8 +32,6 @@ After routing:
     ok@no.delay
   Failed addresses:
   Deferred addresses:
-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-t1.lockfile
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
@@ -41,11 +39,11 @@ LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=p1235 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns
@@ -79,13 +77,10 @@ After routing:
   Failed addresses:
   Deferred addresses:
     delay@test.again.dns
-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-t1.lockfile
-cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT:250'
+cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250'
 LOG: MAIN
   => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
 >>>>>>>>>>>>>>>> Exim pid=p1236 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>>
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: delay@test.again.dns
 unique = delay@test.again.dns