Fix logging of drop-after-EHLO-reject.

[exim.git] / test / stderr / 0529

diff --git a/test/stderr/0529 b/test/stderr/0529
index bed589de6d8c8a8969e37ceac54f1e52c2b97bf6..a308cc14763b87dbca2cc58d445767b957e35b97 100644 (file)
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -32,16 +32,17 @@ 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
+ x@test.ex: no retry items
 Failed addresses:
 Deferred addresses:
-TESTSUITE/test-mail/rmbox
+ 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
+ x@test.ex: no retry items
 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -68,17 +69,18 @@ After routing:
 locking TESTSUITE/spool/db/retry.lockfile
 retry record exists: age=ttt (max 1w)
   time to retry = tttt expired = 0
-retry time not reached for TESTSUITE/test-mail/rmbox: checking ultimate address timeout
-now=tttt received_time=tttt diff=tttt timeout=259200
+retry time not reached: checking ultimate address timeout
+  now=tttt first_failed=tttt next_try=tttt expired=0
+  received_time=tttt diff=tttt timeout=259200
 LOG: retry_defer MAIN
   == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-52): Retry time not yet reached
 Processing retry items
 Succeeded addresses:
-x@test.ex: no retry items
+ x@test.ex: no retry items
 Failed addresses:
 Deferred addresses:
-TESTSUITE/test-mail/rmbox: no retry items
-x@test.ex: no retry items
+ TESTSUITE/test-mail/rmbox: no retry items
+ x@test.ex: no retry items
 end of retry processing
 LOG: queue_run MAIN
   End queue run: pid=pppp