tidying

[exim.git] / test / stderr / 0628

diff --git a/test/stderr/0628 b/test/stderr/0628
index e033ceae2997c69dae6072c211ea59118c439091..225347acc5dd5082ae6ff1fa79e20ebb854ae0a6 100644 (file)
--- a/test/stderr/0628
+++ b/test/stderr/0628
@@ -53,15 +53,13 @@
 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   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  dest@test.ex: queued for routing
 01:01:01 p1239  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1239  routing dest@test.ex


@@ -91,10 +89,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    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
 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


@@ -157,15 +155,13 @@
 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   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  dest2@test.ex: queued for routing
 01:01:01 p1241  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1241  routing dest2@test.ex


@@ -195,10 +191,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    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
 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