git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
DMARC: expand main-config options. Bug 3102
[exim.git] / test / stderr / 5005
diff --git a/test/stderr/5005 b/test/stderr/5005
index 603ad30f6e7505964325563aa1d30aaa32bcc4f8..9f3d8c172bb524c474442942e02314a8518156a6 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -72,9 +72,6 @@ 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
@@ -108,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
@@ -262,9 +256,6 @@ 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
@@ -298,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
@@ -454,9 +442,6 @@ 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
@@ -490,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
@@ -550,26 +532,21 @@ Processing retry items
  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 "*"?
+   userx@test.ex in "*"?
+   ╎list element: *
+   ╎address match test: subject=userx@test.ex pattern=*
+   ╎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
+   ╎ 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
@@ -655,24 +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
+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
 userx@test.ex: queued for routing
- EXIM_DBCLOSE(0xAAAAAAAA)
- closed hints database
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing userx@test.ex
 --------> r1 router <--------
@@ -698,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
@@ -750,26 +717,21 @@ Processing retry items
  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 "*"?
+   userx@test.ex in "*"?
+   ╎list element: *
+   ╎address match test: subject=userx@test.ex pattern=*
+   ╎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
+   ╎ 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