Testsuite: output changes resulting

[exim.git] / test / stderr / 0628

diff --git a/test/stderr/0628 b/test/stderr/0628
index f7f3a868267cb99f1fd7837d2f1f705934d63871..7b1459f1b8bd76c86f83216984d6908972f8beb1 100644 (file)
--- a/test/stderr/0628
+++ b/test/stderr/0628
@@ -1,17 +1,17 @@
-01:01:01 p1237  warn: condition test succeeded in ACL "chk_data"
-01:01:01 p1237  processing "accept" (TESTSUITE/test-config 28)
-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  warn: condition test succeeded in ACL chk_data
+01:01:01 p1237  processing ACL chk_data "accept" (TESTSUITE/test-config 28)
+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   ╭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  Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
+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  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-0005vi-00-H
+01:01:01 p1237  Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H

 01:01:01 p1237  Size of headers = sss
 01:01:01 p1237  LOG: MAIN
 01:01:01 p1237    <= tester@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss
 01:01:01 p1237  Size of headers = sss
 01:01:01 p1237  LOG: MAIN
 01:01:01 p1237    <= tester@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss

-01:01:01 p1237  SMTP>> 250 OK id=10HmaX-0005vi-00
+01:01:01 p1237  SMTP>> 250 OK id=10HmaX-000000005vi-0000

 01:01:01 p1237  search_tidyup called
 01:01:01 p1237  Sender: tester@test.ex
 01:01:01 p1237  Recipients:
 01:01:01 p1237  search_tidyup called
 01:01:01 p1237  Sender: tester@test.ex
 01:01:01 p1237  Recipients:


@@ -20,22 +20,26 @@
 01:01:01 p1237  Process p1237 is ready for new message
 01:01:01 p1237  smtp_setup_msg entered
 01:01:01 p1237  SMTP<< QUIT
 01:01:01 p1237  Process p1237 is ready for new message
 01:01:01 p1237  smtp_setup_msg entered
 01:01:01 p1237  SMTP<< QUIT

+01:01:01 p1237  try option acl_smtp_quit

 01:01:01 p1237  SMTP>> 221 myhost.test.ex closing connection
 01:01:01 p1237  LOG: smtp_connection MAIN
 01:01:01 p1237  SMTP>> 221 myhost.test.ex closing connection
 01:01:01 p1237  LOG: smtp_connection MAIN

-01:01:01 p1237    SMTP connection from (test.ex) [127.0.0.1] closed by QUIT
+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  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
 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

+01:01:01 p1239  environment after trimming:
+01:01:01 p1239   PATH=<munged>

 01:01:01 p1239  adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 01:01:01 p1239  configuration file is TESTSUITE/test-config
 01:01:01 p1239  trusted user
 01:01:01 p1239  admin user
 01:01:01 p1239  dropping to exim gid; retaining priv uid
 01:01:01 p1239  set_process_info: pppp delivering specified messages
 01:01:01 p1239  adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 01:01:01 p1239  configuration file is TESTSUITE/test-config
 01:01:01 p1239  trusted user
 01:01:01 p1239  admin user
 01:01:01 p1239  dropping to exim gid; retaining priv uid
 01:01:01 p1239  set_process_info: pppp delivering specified messages

-01:01:01 p1239  set_process_info: pppp delivering 10HmaX-0005vi-00
-01:01:01 p1239  Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
-01:01:01 p1239  reading spool file 10HmaX-0005vi-00-H
+01:01:01 p1239  set_process_info: pppp delivering 10HmaX-000000005vi-0000
+01:01:01 p1239  Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
+01:01:01 p1239  reading spool file 10HmaX-000000005vi-0000-H

 01:01:01 p1239  user=EXIMUSER uid=EXIM_UID gid=EXIM_GID sender=tester@test.ex
 01:01:01 p1239  sender_fullhost = (test.ex) [127.0.0.1]
 01:01:01 p1239  sender_rcvhost = [127.0.0.1] (helo=test.ex)
 01:01:01 p1239  user=EXIMUSER uid=EXIM_UID gid=EXIM_GID sender=tester@test.ex
 01:01:01 p1239  sender_fullhost = (test.ex) [127.0.0.1]
 01:01:01 p1239  sender_rcvhost = [127.0.0.1] (helo=test.ex)


@@ -49,23 +53,22 @@
 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  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

 01:01:01 p1239  no retry data available
 01:01:01 p1239  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1239  Considering: dest@test.ex
 01:01:01 p1239  unique = dest@test.ex
 01:01:01 p1239  no retry data available
 01:01:01 p1239  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1239  Considering: dest@test.ex
 01:01:01 p1239  unique = dest@test.ex

-01:01:01 p1239  no   domain  retry record
-01:01:01 p1239  no   address retry record
+01:01:01 p1239  checking router retry status
+01:01:01 p1239   no   domain  retry record
+01:01:01 p1239   no   address retry record

 01:01:01 p1239  dest@test.ex: queued for routing
 01:01:01 p1239  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1239  routing dest@test.ex
 01:01:01 p1239  --------> r1 router <--------
 01:01:01 p1239  local_part=dest domain=test.ex
 01:01:01 p1239  dest@test.ex: queued for routing
 01:01:01 p1239  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1239  routing dest@test.ex
 01:01:01 p1239  --------> r1 router <--------
 01:01:01 p1239  local_part=dest domain=test.ex

+01:01:01 p1239  try option router_home_directory
+01:01:01 p1239  try option set

 01:01:01 p1239  calling r1 router
 01:01:01 p1239  calling r1 router

+01:01:01 p1239  try option qualify_domain

 01:01:01 p1239  rda_interpret (string): ':blackhole:'
 01:01:01 p1239  expanded: ':blackhole:'
 01:01:01 p1239  file is not a filter file
 01:01:01 p1239  rda_interpret (string): ':blackhole:'
 01:01:01 p1239  expanded: ':blackhole:'
 01:01:01 p1239  file is not a filter file


@@ -84,12 +87,12 @@
 01:01:01 p1239  >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
 01:01:01 p1239  changed uid/gid: post-delivery tidying
 01:01:01 p1239    uid=EXIM_UID gid=EXIM_GID pid=p1239
 01:01:01 p1239  >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
 01:01:01 p1239  changed uid/gid: post-delivery tidying
 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-0005vi-00
+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  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
 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


@@ -101,7 +104,7 @@
 01:01:01 p1239  DSN: not sending DSN success message
 01:01:01 p1239  LOG: MAIN
 01:01:01 p1239    Completed
 01:01:01 p1239  DSN: not sending DSN success message
 01:01:01 p1239  LOG: MAIN
 01:01:01 p1239    Completed

-01:01:01 p1239  end delivery of 10HmaX-0005vi-00
+01:01:01 p1239  end delivery of 10HmaX-000000005vi-0000

 01:01:01 p1239  search_tidyup called
 01:01:01 p1239  search_tidyup called
 01:01:01 p1239  >>>>>>>>>>>>>>>> Exim pid=p1239 (daemon-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 01:01:01 p1239  search_tidyup called
 01:01:01 p1239  search_tidyup called
 01:01:01 p1239  >>>>>>>>>>>>>>>> Exim pid=p1239 (daemon-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -109,22 +112,22 @@
 01:01:01 p1237  SMTP>>(close on process exit)
 01:01:01 p1237  >>>>>>>>>>>>>>>> Exim pid=p1237 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 01:01:01 p1240  check control = queue_only
 01:01:01 p1237  SMTP>>(close on process exit)
 01:01:01 p1237  >>>>>>>>>>>>>>>> Exim pid=p1237 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 01:01:01 p1240  check control = queue_only

-01:01:01 p1240  warn: condition test succeeded in ACL "chk_data"
-01:01:01 p1240  processing "accept" (TESTSUITE/test-config 28)
-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  warn: condition test succeeded in ACL chk_data
+01:01:01 p1240  processing ACL chk_data "accept" (TESTSUITE/test-config 28)
+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   ╭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  Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
+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  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-0005vi-00-H
+01:01:01 p1240  Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H

 01:01:01 p1240  Size of headers = sss
 01:01:01 p1240  LOG: MAIN
 01:01:01 p1240    <= tester2@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss
 01:01:01 p1240  LOG: delay_delivery MAIN
 01:01:01 p1240    no immediate delivery: queued by ACL
 01:01:01 p1240  Size of headers = sss
 01:01:01 p1240  LOG: MAIN
 01:01:01 p1240    <= tester2@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss
 01:01:01 p1240  LOG: delay_delivery MAIN
 01:01:01 p1240    no immediate delivery: queued by ACL

-01:01:01 p1240  SMTP>> 250 OK id=10HmaY-0005vi-00
+01:01:01 p1240  SMTP>> 250 OK id=10HmaY-000000005vi-0000

 01:01:01 p1240  search_tidyup called
 01:01:01 p1240  Sender: tester2@test.ex
 01:01:01 p1240  Recipients:
 01:01:01 p1240  search_tidyup called
 01:01:01 p1240  Sender: tester2@test.ex
 01:01:01 p1240  Recipients:


@@ -132,9 +135,10 @@
 01:01:01 p1240  Process p1240 is ready for new message
 01:01:01 p1240  smtp_setup_msg entered
 01:01:01 p1240  SMTP<< QUIT
 01:01:01 p1240  Process p1240 is ready for new message
 01:01:01 p1240  smtp_setup_msg entered
 01:01:01 p1240  SMTP<< QUIT

+01:01:01 p1240  try option acl_smtp_quit

 01:01:01 p1240  SMTP>> 221 myhost.test.ex closing connection
 01:01:01 p1240  LOG: smtp_connection MAIN
 01:01:01 p1240  SMTP>> 221 myhost.test.ex closing connection
 01:01:01 p1240  LOG: smtp_connection MAIN

-01:01:01 p1240    SMTP connection from (test.ex) [127.0.0.1] closed by QUIT
+01:01:01 p1240    SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT

 01:01:01 p1240  search_tidyup called
 01:01:01 p1240  SMTP>>(close on process exit)
 01:01:01 p1240  >>>>>>>>>>>>>>>> Exim pid=p1240 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 01:01:01 p1240  search_tidyup called
 01:01:01 p1240  SMTP>>(close on process exit)
 01:01:01 p1240  >>>>>>>>>>>>>>>> Exim pid=p1240 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -151,23 +155,22 @@
 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  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

 01:01:01 p1241  no retry data available
 01:01:01 p1241  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1241  Considering: dest2@test.ex
 01:01:01 p1241  unique = dest2@test.ex
 01:01:01 p1241  no retry data available
 01:01:01 p1241  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1241  Considering: dest2@test.ex
 01:01:01 p1241  unique = dest2@test.ex

-01:01:01 p1241  no   domain  retry record
-01:01:01 p1241  no   address retry record
+01:01:01 p1241  checking router retry status
+01:01:01 p1241   no   domain  retry record
+01:01:01 p1241   no   address retry record

 01:01:01 p1241  dest2@test.ex: queued for routing
 01:01:01 p1241  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1241  routing dest2@test.ex
 01:01:01 p1241  --------> r1 router <--------
 01:01:01 p1241  local_part=dest2 domain=test.ex
 01:01:01 p1241  dest2@test.ex: queued for routing
 01:01:01 p1241  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1241  routing dest2@test.ex
 01:01:01 p1241  --------> r1 router <--------
 01:01:01 p1241  local_part=dest2 domain=test.ex

+01:01:01 p1241  try option router_home_directory
+01:01:01 p1241  try option set

 01:01:01 p1241  calling r1 router
 01:01:01 p1241  calling r1 router

+01:01:01 p1241  try option qualify_domain

 01:01:01 p1241  rda_interpret (string): ':blackhole:'
 01:01:01 p1241  expanded: ':blackhole:'
 01:01:01 p1241  file is not a filter file
 01:01:01 p1241  rda_interpret (string): ':blackhole:'
 01:01:01 p1241  expanded: ':blackhole:'
 01:01:01 p1241  file is not a filter file


@@ -186,12 +189,12 @@
 01:01:01 p1241  >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
 01:01:01 p1241  changed uid/gid: post-delivery tidying
 01:01:01 p1241    uid=EXIM_UID gid=EXIM_GID pid=p1241
 01:01:01 p1241  >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>>
 01:01:01 p1241  changed uid/gid: post-delivery tidying
 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-0005vi-00
+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  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
 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


@@ -203,7 +206,7 @@
 01:01:01 p1241  DSN: not sending DSN success message
 01:01:01 p1241  LOG: MAIN
 01:01:01 p1241    Completed
 01:01:01 p1241  DSN: not sending DSN success message
 01:01:01 p1241  LOG: MAIN
 01:01:01 p1241    Completed

-01:01:01 p1241  end delivery of 10HmaY-0005vi-00
+01:01:01 p1241  end delivery of 10HmaY-000000005vi-0000

 01:01:01 p1241  search_tidyup called
 01:01:01 p1241  >>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 
 01:01:01 p1241  search_tidyup called
 01:01:01 p1241  >>>>>>>>>>>>>>>> Exim pid=p1241 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>