Hintsdb transactions

[exim.git] / test / stderr / 0628

diff --git a/test/stderr/0628 b/test/stderr/0628
index 9c2db0ec327402cfcd78923b9b088c449fb779ef..24f94e5c3b68c8a4b2667d024b8bec616351e3ec 100644 (file)
--- a/test/stderr/0628
+++ b/test/stderr/0628
@@ -3,8 +3,8 @@
 01:01:01 p1237  accept: condition test succeeded in ACL "chk_data"
 01:01:01 p1237  end of ACL "chk_data": ACCEPT
 01:01:01 p1237   ╭considering: ${tod_full}
-01:01:01 p1237   ├──expanding: ${tod_full}
-01:01:01 p1237   ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
+01:01:01 p1237   ├───expanded: ${tod_full}
+01:01:01 p1237   ╰─────result: Tue,░2░Mar░1999░09:44:33░+0000
 01:01:01 p1237  Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000
 01:01:01 p1237  DSN: **** SPOOL_OUT - address: <dest@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 01:01:01 p1237  Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H
@@ -25,6 +25,7 @@
 01:01:01 p1237  LOG: smtp_connection MAIN
 01:01:01 p1237    SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT
 01:01:01 p1239  Exim version x.yz uid=EXIM_UID gid=EXIM_GID pid=p1239 D=fff9ffff
+01:01:01 p1239  Hints DB:
 01:01:01 p1239  macros_trusted overridden to true by whitelisting
 01:01:01 p1239  changed uid/gid: forcing real = effective
 01:01:01 p1239    uid=uuuu gid=EXIM_GID pid=p1239
@@ -52,8 +53,6 @@
 01:01:01 p1239  DSN: set orcpt:   flags: 0x0
 01:01:01 p1239  Delivery address list:
 01:01:01 p1239    dest@test.ex 
-01:01:01 p1239   locking TESTSUITE/spool/db/retry.lockfile
-01:01:01 p1239   locked  TESTSUITE/spool/db/retry.lockfile
 01:01:01 p1239   EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
 01:01:01 p1239   returned from EXIM_DBOPEN: (nil)
 01:01:01 p1239   failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
@@ -92,10 +91,10 @@
 01:01:01 p1239    uid=EXIM_UID gid=EXIM_GID pid=p1239
 01:01:01 p1239  set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 01:01:01 p1239  Processing retry items
-01:01:01 p1239  Succeeded addresses:
-01:01:01 p1239   dest@test.ex: no retry items
-01:01:01 p1239  Failed addresses:
-01:01:01 p1239  Deferred addresses:
+01:01:01 p1239   Succeeded addresses:
+01:01:01 p1239    dest@test.ex: no retry items
+01:01:01 p1239   Failed addresses:
+01:01:01 p1239   Deferred addresses:
 01:01:01 p1239  end of retry processing
 01:01:01 p1239  DSN: processing router : r1
 01:01:01 p1239  DSN: processing successful delivery address: dest@test.ex
@@ -120,8 +119,8 @@
 01:01:01 p1240  accept: condition test succeeded in ACL "chk_data"
 01:01:01 p1240  end of ACL "chk_data": ACCEPT
 01:01:01 p1240   ╭considering: ${tod_full}
-01:01:01 p1240   ├──expanding: ${tod_full}
-01:01:01 p1240   ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
+01:01:01 p1240   ├───expanded: ${tod_full}
+01:01:01 p1240   ╰─────result: Tue,░2░Mar░1999░09:44:33░+0000
 01:01:01 p1240  Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000
 01:01:01 p1240  DSN: **** SPOOL_OUT - address: <dest2@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 01:01:01 p1240  Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H
@@ -158,8 +157,6 @@
 01:01:01 p1241  DSN: set orcpt:   flags: 0x0
 01:01:01 p1241  Delivery address list:
 01:01:01 p1241    dest2@test.ex 
-01:01:01 p1241   locking TESTSUITE/spool/db/retry.lockfile
-01:01:01 p1241   locked  TESTSUITE/spool/db/retry.lockfile
 01:01:01 p1241   EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
 01:01:01 p1241   returned from EXIM_DBOPEN: (nil)
 01:01:01 p1241   failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
@@ -198,10 +195,10 @@
 01:01:01 p1241    uid=EXIM_UID gid=EXIM_GID pid=p1241
 01:01:01 p1241  set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000
 01:01:01 p1241  Processing retry items
-01:01:01 p1241  Succeeded addresses:
-01:01:01 p1241   dest2@test.ex: no retry items
-01:01:01 p1241  Failed addresses:
-01:01:01 p1241  Deferred addresses:
+01:01:01 p1241   Succeeded addresses:
+01:01:01 p1241    dest2@test.ex: no retry items
+01:01:01 p1241   Failed addresses:
+01:01:01 p1241   Deferred addresses:
 01:01:01 p1241  end of retry processing
 01:01:01 p1241  DSN: processing router : r1
 01:01:01 p1241  DSN: processing successful delivery address: dest2@test.ex