Lookups: sub-path for dsearch

[exim.git] / test / stderr / 0264

diff --git a/test/stderr/0264 b/test/stderr/0264
index 5d7324c18a1a39eef8fd676caa6c0b1a2cf59308..5b5770c834fa11f61f1179cc88ca4905fa5c1713 100644 (file)
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -1,9 +1,9 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

-Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-0005vi-00
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-000000005vi-0000

 DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0

-Renaming spool header file: TESTSUITE/spool//input//10HmbJ-0005vi-00-H
+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 ....
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 Exim version x.yz ....


@@ -11,9 +11,9 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
 trusted user
 admin user
 dropping to exim gid; retaining priv uid

-delivering 10HmbJ-0005vi-00
-Trying spool file TESTSUITE/spool//input//10HmbJ-0005vi-00-D
-reading spool file 10HmbJ-0005vi-00-H
+delivering 10HmbJ-000000005vi-0000
+Trying spool file TESTSUITE/spool//input//10HmbJ-000000005vi-0000-D
+reading spool file 10HmbJ-000000005vi-0000-H

 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:


@@ -37,22 +37,27 @@ routing rz.b@outside
 --------> r1 router <--------
 local_part=rz.b domain=outside
 checking domains
 --------> 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
 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
 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
 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
 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
 r5 router skipped: local_parts mismatch
 --------> r_remain router <--------
 local_part=rz.b domain=outside


@@ -82,18 +87,22 @@ Failed addresses:
 Deferred addresses:
  rz.b@outside
 locking TESTSUITE/spool/db/retry.lockfile
 Deferred addresses:
  rz.b@outside
 locking TESTSUITE/spool/db/retry.lockfile

+*@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
 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-0005vi-00  addr rz.b@outside
+time on queue = 0s  id 10HmbJ-000000005vi-0000  addr rz.b@outside

 warning counts: required 0 done 0
 delivery deferred: update_spool=1 header_rewritten=0
 warning counts: required 0 done 0
 delivery deferred: update_spool=1 header_rewritten=0

-Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-0005vi-00
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmbJ-000000005vi-0000

 DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 DSN: **** SPOOL_OUT - address: <rz.b@outside> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0

-Renaming spool header file: TESTSUITE/spool//input//10HmbJ-0005vi-00-H
-end delivery of 10HmbJ-0005vi-00
+Renaming spool header file: TESTSUITE/spool//input//10HmbJ-000000005vi-0000-H
+end delivery of 10HmbJ-000000005vi-0000

 >>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1240 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1239 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>