Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0378

diff --git a/test/stderr/0378 b/test/stderr/0378
index 2511ccbca3894b877f40437ac4fe94649e553335..e18685a37767d56154769ad8154a3f2b1954a351 100644 (file)
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -1,15 +1,16 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....
+Hints DB:
 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: aaaa@myhost.test.ex
@@ -20,10 +21,13 @@ routing aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
+aaaa in local_parts? no (end of list)
 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 local_part=aaaa domain=myhost.test.ex
@@ -67,7 +71,6 @@ aaaa router generated defer_aaaa@myhost.test.ex
 routed by aaaa router
   envelope to: aaaa@myhost.test.ex
   transport: <none>
-locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer_aaaa@myhost.test.ex
@@ -90,6 +93,8 @@ routing defer_aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=defer_aaaa domain=myhost.test.ex
@@ -114,18 +119,18 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer_aaaa@myhost.test.ex
-locking TESTSUITE/spool/db/retry.lockfile
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
-  <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss
+  <= <> R=10HmaX-000000005vi-0000 U=CALLER P=local S=sss
 Exim version x.yz ....
+Hints DB:
 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: CALLER@myhost.test.ex
@@ -157,23 +162,20 @@ LOG: MAIN
 >>>>>>>>>>>>>>>> Exim pid=p1238 (autoreply) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   => >CALLER@myhost.test.ex <aaaa@myhost.test.ex> R=aaaa T=t3
-locking TESTSUITE/spool/db/retry.lockfile
 transport error EPIPE ignored
 LOG: MAIN
   => |/bin/sh -c exit <aaaa@myhost.test.ex> R=aaaa T=t2
-locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => TESTSUITE/test-mail/file <aaaa@myhost.test.ex> R=aaaa T=t1
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=p1234 -qf
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
 unique = aaaa@myhost.test.ex
@@ -183,10 +185,13 @@ routing aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
+aaaa in local_parts? no (end of list)
 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 local_part=aaaa domain=myhost.test.ex
@@ -204,7 +209,6 @@ aaaa_2nd_time router generated aaaa@myhost.test.ex
 routed by aaaa_2nd_time router
   envelope to: aaaa@myhost.test.ex
   transport: <none>
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: aaaa@myhost.test.ex
 unique = \0\aaaa@myhost.test.ex
@@ -214,10 +218,13 @@ routing aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=aaaa domain=myhost.test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
+aaaa in local_parts? no (end of list)
 defer router skipped: local_parts mismatch
 --------> aaaa_2nd_time router <--------
 aaaa_2nd_time router skipped: previously routed aaaa@myhost.test.ex
@@ -258,7 +265,6 @@ aaaa router generated defer_aaaa@myhost.test.ex
 routed by aaaa router
   envelope to: aaaa@myhost.test.ex
   transport: <none>
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: defer_aaaa@myhost.test.ex
 unique = defer_aaaa@myhost.test.ex
@@ -280,6 +286,8 @@ routing defer_aaaa@myhost.test.ex
 --------> bounce router <--------
 local_part=defer_aaaa domain=myhost.test.ex
 checking senders
+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 bounce router skipped: senders mismatch
 --------> defer router <--------
 local_part=defer_aaaa domain=myhost.test.ex
@@ -301,7 +309,6 @@ After routing:
   Failed addresses:
   Deferred addresses:
     defer_aaaa@myhost.test.ex
-locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=p1234 -qf