X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fstderr%2F0529;h=63f3bcf3407043e6f5b5fc9242999d0cd6d6fae5;hb=340cbb7f4ea5185938b16a75cff05dea504a434a;hp=bed589de6d8c8a8969e37ceac54f1e52c2b97bf6;hpb=ea49d0e16fbc6f56fc5b8519d266f88d09139187;p=exim.git

diff --git a/test/stderr/0529 b/test/stderr/0529
index bed589de6..63f3bcf34 100644
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -8,12 +8,13 @@ Exim version x.yz ....
 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
+no   domain  retry record
+no   address retry record
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -32,29 +33,31 @@ 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 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@test.ex
-no domain retry record
-no address retry record
+no   domain  retry record
+no   address retry record
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail/rmbox
@@ -68,18 +71,19 @@ 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=F
+  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
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>