git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
tidying
[exim.git] / test / stderr / 5005
diff --git a/test/stderr/5005 b/test/stderr/5005
index 779cc0a2335c7befdfdd9c70b0ae30d22b59c2ac..9f3d8c172bb524c474442942e02314a8518156a6 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -72,15 +72,13 @@ body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   nofile@test.ex 
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: nofile@test.ex
 unique = nofile@test.ex
-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record
 nofile@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing nofile@test.ex
@@ -107,9 +105,6 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> nofile@test.ex <--------
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to nofile <nofile@test.ex> transport=t1
@@ -167,10 +162,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1235
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- nofile@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  nofile@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: nofile@test.ex
@@ -261,15 +256,13 @@ body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record
 userx@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
@@ -296,9 +289,6 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to userx <userx@test.ex> transport=t1
@@ -358,10 +348,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1238
 set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000
 Processing retry items
-Succeeded addresses:
- userx@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userx@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:
 end of retry processing
 DSN: processing router : r1
 DSN: processing successful delivery address: userx@test.ex
@@ -452,15 +442,13 @@ body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record
 userx@test.ex: queued for routing
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
@@ -487,9 +475,6 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to userx <userx@test.ex> transport=t1
@@ -543,30 +528,25 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1241
 set_process_info: pppp tidying up after delivering 10HmaZ-000000005vi-0000
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- userx@test.ex
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
- returned from EXIM_DBOPEN: 0xAAAAAAAA
- opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
- userx@test.ex in "*"?
-  list element: *
-  address match test: subject=userx@test.ex pattern=*
-  test.ex in "*"?
-   list element: *
-   test.ex in "*"? yes (matched "*")
-  userx@test.ex in "*"? yes (matched "*")
-retry for T:userx@test.ex = * 0 0
- dbfn_read: key=T:userx@test.ex
- dbfn_read: null return
-failing_interval=ttt message_age=ttt
-Writing retry data for T:userx@test.ex
-  first failed=dddd last try=dddd next try=+86400 expired=0
-  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
- dbfn_write: key=T:userx@test.ex datalen nn
- EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  userx@test.ex
+   userx@test.ex in "*"?
+   ╎list element: *
+   ╎address match test: subject=userx@test.ex pattern=*
+   ╎test.ex in "*"?
+   ╎ list element: *
+   ╎ test.ex in "*"? yes (matched "*")
+   ╎userx@test.ex in "*"? yes (matched "*")
+   retry for T:userx@test.ex = * 0 0
+   dbfn_read: key=T:userx@test.ex
+   dbfn_read: null return
+   failing_interval=ttt message_age=ttt
+   Writing retry data for T:userx@test.ex
+     first failed=dddd last try=dddd next try=+86400 expired=0
+     errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
+   dbfn_write: key=T:userx@test.ex datalen nn
 end of retry processing
 delivery deferred: update_spool=1 header_rewritten=0
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000
@@ -652,23 +632,19 @@ body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: 0xAAAAAAAA
- opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 unique = userx@test.ex
+checking router retry status
  dbfn_read: key=R:test.ex
  dbfn_read: null return
  dbfn_read: key=R:userx@test.ex
  dbfn_read: null return
  dbfn_read: key=R:userx@test.ex:<CALLER@test.ex>
  dbfn_read: null return
-no   domain  retry record
-no   address retry record
+ no   domain  retry record
+ no   address retry record
 userx@test.ex: queued for routing
- EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> r1 router <--------
@@ -694,15 +670,10 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: 0xAAAAAAAA
- opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
- dbfn_read: key=T:userx@test.ex
- dbfn_read: size nnn return
+dbfn_read: key=T:userx@test.ex
+dbfn_read: size nnn return
 retry record exists: age=ttt (max 1w)
   time to retry = tttt expired = 0
- EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database
 search_tidyup called
 changed uid/gid: local delivery to userx <userx@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=p1245
@@ -742,30 +713,25 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1244
 set_process_info: pppp tidying up after delivering 10HmbA-000000005vi-0000
 Processing retry items
-Succeeded addresses:
-Failed addresses:
-Deferred addresses:
- userx@test.ex
- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
- returned from EXIM_DBOPEN: 0xAAAAAAAA
- opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
- userx@test.ex in "*"?
-  list element: *
-  address match test: subject=userx@test.ex pattern=*
-  test.ex in "*"?
-   list element: *
-   test.ex in "*"? yes (matched "*")
-  userx@test.ex in "*"? yes (matched "*")
-retry for T:userx@test.ex = * 0 0
- dbfn_read: key=T:userx@test.ex
- dbfn_read: size nnn return
-failing_interval=ttt message_age=ttt
-Writing retry data for T:userx@test.ex
-  first failed=dddd last try=dddd next try=+86400 expired=0
-  errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
- dbfn_write: key=T:userx@test.ex datalen nn
- EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database
+ Succeeded addresses:
+ Failed addresses:
+ Deferred addresses:
+  userx@test.ex
+   userx@test.ex in "*"?
+   ╎list element: *
+   ╎address match test: subject=userx@test.ex pattern=*
+   ╎test.ex in "*"?
+   ╎ list element: *
+   ╎ test.ex in "*"? yes (matched "*")
+   ╎userx@test.ex in "*"? yes (matched "*")
+   retry for T:userx@test.ex = * 0 0
+   dbfn_read: key=T:userx@test.ex
+   dbfn_read: size nnn return
+   failing_interval=ttt message_age=ttt
+   Writing retry data for T:userx@test.ex
+     first failed=dddd last try=dddd next try=+86400 expired=0
+     errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex)
+   dbfn_write: key=T:userx@test.ex datalen nn
 end of retry processing
 delivery deferred: update_spool=1 header_rewritten=0
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000
Master Exim source repository