Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / test / stderr / 0529

diff --git a/test/stderr/0529 b/test/stderr/0529
index 406de192ccc05269e983fedbeb1943db159a3267..49ca6dcaf5aa6ff9ab7f6da956afd4acc45758d1 100644 (file)
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -69,8 +69,9 @@ After routing:
 locking TESTSUITE/spool/db/retry.lockfile
 retry record exists: age=ttt (max 1w)
   time to retry = tttt expired = 0
 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
 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