X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9bfb7e1bec2b3b6022c2e7b42df9ac606693dcfd..600dc06981df5a906125f8442c36056a117412d4:/test/stderr/0554

diff --git a/test/stderr/0554 b/test/stderr/0554
index bbb76dbd4..4f87801df 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -1,12 +1,13 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
-locking TESTSUITE/spool/db/retry.lockfile
+dropping to exim gid; retaining priv uid
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y
-no domain retry record
-no address retry record
+no   domain  retry record
+no   address retry record
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -14,34 +15,36 @@ After routing:
     x@y
   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:x@y:<CALLER@myhost.test.ex>: errno=-44 more_errno=dd,A flags=0
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1235 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 reading retry information for R:x@y:<CALLER@myhost.test.ex> from subprocess
   added retry item
 LOG: MAIN
   == x@y R=r1 T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- x@y
-locking TESTSUITE/spool/db/retry.lockfile
-retry for R:x@y:<CALLER@myhost.test.ex> = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:x@y:<CALLER@myhost.test.ex>
-  first failed=dddd last try=dddd next try=+1 expired=0
-  errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  x@y
+ retry for R:x@y:<CALLER@myhost.test.ex> = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:x@y:<CALLER@myhost.test.ex>
+   first failed=dddd last try=dddd next try=+2 expired=0
+   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
 end of retry processing
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
-locking TESTSUITE/spool/db/retry.lockfile
+dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y
-no domain retry record
+no   domain  retry record
+have address retry record; next_try = now+0
 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=-1 more_errno=dd flags=1
 added retry item for R:x@y: errno=-1 more_errno=dd flags=1
 added retry item for R:y: errno=-1 more_errno=dd flags=1
@@ -52,13 +55,13 @@ After routing:
     x@y
   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:x@y:<CALLER@myhost.test.ex>: errno=dd more_errno=dd,A flags=1
 added retry item for R:x@y: errno=dd more_errno=dd,A flags=1
-locking TESTSUITE/spool/db/wait-smtp.lockfile
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1237 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 reading retry information for R:x@y from subprocess
   existing delete item dropped
   added delete item
@@ -77,15 +80,14 @@ reading retry information for R:x@y:<CALLER@myhost.test.ex> from subprocess
 LOG: MAIN
   => x@y R=r1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 Processing retry items
-Succeeded addresses:
- x@y
-locking TESTSUITE/spool/db/retry.lockfile
-deleted retry information for R:x@y:<CALLER@myhost.test.ex>
-deleted retry information for R:x@y
-deleted retry information for R:y
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  x@y
+ deleted retry information for R:x@y:<CALLER@myhost.test.ex>
+ deleted retry information for R:x@y
+ deleted retry information for R:y
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>