Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0357

diff --git a/test/stderr/0357 b/test/stderr/0357
index 609b326120fad8b3f28d3b41bdbe207e1585a9fd..4827e3cc1ed0354871295d081ef43221128012eb 100644 (file)
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -1,15 +1,16 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@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: userx@test.ex
@@ -22,11 +23,10 @@ After routing:
     userx@test.ex
   Failed addresses:
   Deferred addresses:
-checking status of 127.0.0.1
-locking TESTSUITE/spool/db/retry.lockfile
+checking retry status of 127.0.0.1
 no retry data available
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
-cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   added retry item
 LOG: MAIN
@@ -36,7 +36,6 @@ Succeeded addresses:
 Failed addresses:
 Deferred addresses:
  userx@test.ex
-locking TESTSUITE/spool/db/retry.lockfile
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
@@ -46,12 +45,12 @@ end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1237 (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=p1234
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no   domain  retry record
@@ -66,12 +65,11 @@ After routing:
     userx@test.ex
   Failed addresses:
   Deferred addresses:
-checking status of 127.0.0.1
-locking TESTSUITE/spool/db/retry.lockfile
+checking retry status of 127.0.0.1
 no host retry record
 no message retry record
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
-cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   existing delete item dropped
   added retry item
@@ -90,7 +88,6 @@ Succeeded addresses:
 Failed addresses:
 Deferred addresses:
  userx@test.ex
-locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:userx@test.ex
 deleted retry information for R:test.ex
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
@@ -104,12 +101,12 @@ LOG: queue_run MAIN
   End queue run: pid=p1234
 >>>>>>>>>>>>>>>> Exim pid=p1234 (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=p1235
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no   domain  retry record
@@ -124,12 +121,11 @@ After routing:
     userx@test.ex
   Failed addresses:
   Deferred addresses:
-checking status of 127.0.0.1
-locking TESTSUITE/spool/db/retry.lockfile
+checking retry status of 127.0.0.1
 no host retry record
 no message retry record
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
-cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   existing delete item dropped
   added retry item
@@ -148,7 +144,6 @@ Succeeded addresses:
 Failed addresses:
 Deferred addresses:
  userx@test.ex
-locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:userx@test.ex
 deleted retry information for R:test.ex
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
@@ -162,12 +157,12 @@ LOG: queue_run MAIN
   End queue run: pid=p1235
 >>>>>>>>>>>>>>>> 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=p1236
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no   domain  retry record