X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/799253d6a75db70c631716a190736c285a97155c..dafd09ae6c826dffaa63a54e903659a12ca5be05:/test/stderr/0529

diff --git a/test/stderr/0529 b/test/stderr/0529
index c4a292a48..11c607331 100644
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -11,13 +11,12 @@ 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: x@test.ex
-no   domain  retry record
-no   address retry record
-locking TESTSUITE/spool/db/retry.lockfile
+checking router retry status
+ no   domain  retry record
+ no   address retry record
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail/rmbox
@@ -28,24 +27,23 @@ After routing:
   Remote deliveries:
   Failed addresses:
   Deferred addresses:
-locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
+>>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 added retry item for T:TESTSUITE/test-mail/rmbox:x@test.ex: errno=-22 more_errno=dd flags=0
 LOG: MAIN
   == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
 Processing retry items
-Succeeded addresses:
- x@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
- TESTSUITE/test-mail/rmbox
-locking TESTSUITE/spool/db/retry.lockfile
-retry for T:TESTSUITE/test-mail/rmbox:x@test.ex = *@test.ex -22 0
-failing_interval=ttt message_age=ttt
-Writing retry data for T:TESTSUITE/test-mail/rmbox:x@test.ex
-  first failed=dddd last try=dddd next try=+900 expired=0
-  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
- x@test.ex: no retry items
+ Succeeded addresses:
+  x@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:
+  TESTSUITE/test-mail/rmbox
+   retry for T:TESTSUITE/test-mail/rmbox:x@test.ex = *@test.ex -22 0
+   failing_interval=ttt message_age=ttt
+   Writing retry data for T:TESTSUITE/test-mail/rmbox:x@test.ex
+     first failed=dddd last try=dddd next try=+900 expired=0
+     errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
+  x@test.ex: no retry items
 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -56,12 +54,11 @@ 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: x@test.ex
-no   domain  retry record
-no   address retry record
-locking TESTSUITE/spool/db/retry.lockfile
+checking router retry status
+ no   domain  retry record
+ no   address retry record
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail/rmbox
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -71,7 +68,6 @@ After routing:
   Remote deliveries:
   Failed addresses:
   Deferred addresses:
-locking TESTSUITE/spool/db/retry.lockfile
 retry record exists: age=ttt (max 1w)
   time to retry = tttt expired = 0
 retry time not reached: checking ultimate address timeout
@@ -80,14 +76,14 @@ retry time not reached: checking ultimate address timeout
 LOG: retry_defer MAIN
   == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-53): Retry time not yet reached
 Processing retry items
-Succeeded addresses:
- x@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
- TESTSUITE/test-mail/rmbox: no retry items
- x@test.ex: no retry items
+ Succeeded addresses:
+  x@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:
+  TESTSUITE/test-mail/rmbox: no retry items
+  x@test.ex: no retry items
 end of retry processing
->>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>