X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/8618b5c7a533f167bff9c25c9653d8d3ab94b68f..baaa69d91ad081a6920f2e29e800a30c8de0255c:/test/stderr/0554

diff --git a/test/stderr/0554 b/test/stderr/0554
index 4f87801df..8e320f709 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -6,8 +6,9 @@ dropping to exim gid; retaining priv uid
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y
-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -16,7 +17,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
 checking retry status of 127.0.0.1
-no retry data available
+ 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 >>>>>>>>>>>>>>>>
@@ -29,11 +30,11 @@ Processing retry items
  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
+   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=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -43,11 +44,12 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y
-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
+checking router retry status
+ no   domain  retry record
+ have address retry record; next_try = now+0
+added retry delete-item for R:x@y:<CALLER@myhost.test.ex>: errno=-1 more_errno=dd flags=1
+added retry delete-item for R:x@y: errno=-1 more_errno=dd flags=1
+added retry delete-item for R:y: errno=-1 more_errno=dd flags=1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -56,10 +58,10 @@ After routing:
   Failed addresses:
   Deferred addresses:
 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
+ no host retry record
+ no message retry record
+added retry delete-item for R:x@y:<CALLER@myhost.test.ex>: errno=dd more_errno=dd,A flags=1
+added retry delete-item for R:x@y: errno=dd more_errno=dd,A flags=1
 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
@@ -82,9 +84,9 @@ LOG: MAIN
 Processing retry items
  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
+   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