Pass back more info from transport to delivery process

[exim.git] / test / stderr / 0264

diff --git a/test/stderr/0264 b/test/stderr/0264
index 8a7b911e2f525294f51d1f926b06d2e88a54530b..e2876c3eb984eb8382c9f8d1761c913bbcfb8d74 100644 (file)
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-000000005vi-0000
@@ -7,6 +8,7 @@ Renaming spool header file: TESTSUITE/spool//input//10HmbJ-000000005vi-0000-H
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -25,7 +27,6 @@ body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   rz.b@outside 
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: rz.b@outside
 unique = rz.b@outside
@@ -37,22 +38,27 @@ routing rz.b@outside
 --------> r1 router <--------
 local_part=rz.b domain=outside
 checking domains
+outside in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=rz.b domain=outside
 checking domains
+outside in domains? no (end of list)
 r2 router skipped: domains mismatch
 --------> r3 router <--------
 local_part=rz.b domain=outside
 checking local_parts
+rz.b in local_parts? no (end of list)
 r3 router skipped: local_parts mismatch
 --------> r4 router <--------
 local_part=rz.b domain=outside
 checking local_parts
+rz.b in local_parts? no (end of list)
 r4 router skipped: local_parts mismatch
 --------> r5 router <--------
 local_part=rz.b domain=outside
 checking local_parts
+rz.b in local_parts? no (end of list)
 r5 router skipped: local_parts mismatch
 --------> r_remain router <--------
 local_part=rz.b domain=outside
@@ -77,16 +83,19 @@ After routing:
     rz.b@outside
 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- rz.b@outside
-locking TESTSUITE/spool/db/retry.lockfile
-retry for R:outside = * 0 0
-failing_interval=ttt message_age=ttt
-Writing retry data for R:outside
-  first failed=dddd last try=dddd next try=+300 expired=0
-  errno=-1 more_errno=dd not just now
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  rz.b@outside
+ *@outside in "^\*@r5domain.ex"? no (end of list)
+ *@outside in "userx@test.ex"? no (end of list)
+ outside in "test.ex"? no (end of list)
+ *@outside in "test.ex"? no (end of list)
+ retry for R:outside = * 0 0
+ failing_interval=ttt message_age=ttt
+ Writing retry data for R:outside
+   first failed=dddd last try=dddd next try=+300 expired=0
+   errno=-1 more_errno=dd not just now
 end of retry processing
 time on queue = 0s  id 10HmbJ-000000005vi-0000  addr rz.b@outside
 warning counts: required 0 done 0