X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/8618b5c7a533f167bff9c25c9653d8d3ab94b68f..dd80338c6a23ab8a6af2875256f9077479f055b3:/test/stderr/5004?ds=sidebyside

diff --git a/test/stderr/5004 b/test/stderr/5004
index dd78e2352..3eba9a65b 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -76,34 +76,24 @@ body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record
 userx@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> r1 router <--------
 local_part=userx domain=test.ex
 calling r1 router
-rda_interpret (string): '# Exim filter\nsave TESTSUITE/test-mail'
-expanded: '# Exim filter
-save TESTSUITE/test-mail'
-search_tidyup called
-changed uid/gid: r1 router (recipient is userx@test.ex)
-  uid=CALLER_UID gid=CALLER_GID pid=p1236
-turned off address rewrite logging (not root or exim in this process)
-data is an Exim filter program
-Filter: start of processing
-Filter: end of processing
-search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=p1236 (router-interpret) terminating with rc=0 >>>>>>>>>>>>>>>>
-rda_interpret: subprocess yield=0 error=NULL
+rda_interpret (string): 'TESTSUITE/test-mail'
+expanded: 'TESTSUITE/test-mail'
+file is not a filter file
+parse_forward_list: TESTSUITE/test-mail
+extract item: TESTSUITE/test-mail
 set transport t1
 r1 router generated TESTSUITE/test-mail
   pipe, file, or autoreply
@@ -112,9 +102,6 @@ r1 router generated TESTSUITE/test-mail
 routed by r1 router
   envelope to: userx@test.ex
   transport: <none>
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: TESTSUITE/test-mail
@@ -130,13 +117,10 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> TESTSUITE/test-mail <--------
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to TESTSUITE/test-mail <TESTSUITE/test-mail> transport=t1
-  uid=CALLER_UID gid=CALLER_GID pid=p1237
+  uid=CALLER_UID gid=CALLER_GID pid=p1236
   home=NULL current=/
 set_process_info: pppp delivering 10HmaX-000000005vi-0000 to TESTSUITE/test-mail using t1
 appendfile transport entered
@@ -157,7 +141,7 @@ renaming temporary file
 renamed tmp/MAILDIR.mail.test.ex as new/MAILDIR.mail.test.ex
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=p1237 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1236 (delivery-local) terminating with rc=0 >>>>>>>>>>>>>>>>
 journalling TESTSUITE/test-mail:userx@test.ex
 t1 transport returned OK for TESTSUITE/test-mail
 post-process TESTSUITE/test-mail (0)