summaryrefslogtreecommitdiff
path: root/test/stderr
diff options
context:
space:
mode:
Diffstat (limited to 'test/stderr')
-rw-r--r--test/stderr/01432
-rw-r--r--test/stderr/02756
-rw-r--r--test/stderr/02786
-rw-r--r--test/stderr/03578
-rw-r--r--test/stderr/03588
-rw-r--r--test/stderr/03618
-rw-r--r--test/stderr/038612
-rw-r--r--test/stderr/038816
-rw-r--r--test/stderr/03989
-rw-r--r--test/stderr/040232
-rw-r--r--test/stderr/04036
-rw-r--r--test/stderr/040418
-rw-r--r--test/stderr/04086
-rw-r--r--test/stderr/04329
-rw-r--r--test/stderr/04766
-rw-r--r--test/stderr/04876
-rw-r--r--test/stderr/052912
-rw-r--r--test/stderr/05544
-rw-r--r--test/stderr/26006
-rw-r--r--test/stderr/500412
-rw-r--r--test/stderr/500532
-rw-r--r--test/stderr/50066
22 files changed, 125 insertions, 105 deletions
diff --git a/test/stderr/0143 b/test/stderr/0143
index 9b9143c72..3092135fd 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -14,6 +14,8 @@ router_name <my_main_router>
transport_name <my_smtp>
my_smtp transport entered
userx@domain.com
+hostlist:
+ 127.0.0.1:-1
checking status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com)
diff --git a/test/stderr/0275 b/test/stderr/0275
index 0806065d4..1878d3618 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -195,7 +195,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -304,7 +304,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -333,7 +333,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-userx@test.ex: no retry items
+ userx@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
diff --git a/test/stderr/0278 b/test/stderr/0278
index 2a1afdd06..702d35acc 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -142,7 +142,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
CALLER@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -206,7 +206,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> CALLER@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -235,7 +235,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-CALLER@test.ex: no retry items
+ CALLER@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
diff --git a/test/stderr/0357 b/test/stderr/0357
index 6073e8c62..9cc0a6bb5 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -33,7 +33,7 @@ Processing retry items
Succeeded addresses:
Failed addresses:
Deferred addresses:
-userx@test.ex
+ userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
failing_interval=ttt message_age=ttt
@@ -84,7 +84,7 @@ Processing retry items
Succeeded addresses:
Failed addresses:
Deferred addresses:
-userx@test.ex
+ userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
deleted retry information for R:userx@test.ex
deleted retry information for R:test.ex
@@ -138,7 +138,7 @@ Processing retry items
Succeeded addresses:
Failed addresses:
Deferred addresses:
-userx@test.ex
+ userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
deleted retry information for R:userx@test.ex
deleted retry information for R:test.ex
@@ -176,7 +176,7 @@ Processing retry items
Succeeded addresses:
Failed addresses:
Deferred addresses:
-userx@test.ex: no retry items
+ userx@test.ex: no retry items
end of retry processing
LOG: queue_run MAIN
End queue run: pid=pppp
diff --git a/test/stderr/0358 b/test/stderr/0358
index 7eec3d43f..6f75cf630 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -43,14 +43,14 @@ Processing retry items
Succeeded addresses:
Failed addresses:
Deferred addresses:
-usery@test.ex
+ usery@test.ex
locking TESTSUITE/spool/db/retry.lockfile
retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0
failing_interval=ttt message_age=ttt
Writing retry data for R:usery@test.ex:<CALLER@test.ex>
first failed=dddd last try=dddd next try=+1 expired=0
errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error
-userx@test.ex
+ userx@test.ex
retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
failing_interval=ttt message_age=ttt
Writing retry data for R:userx@test.ex:<CALLER@test.ex>
@@ -121,7 +121,7 @@ Processing retry items
Succeeded addresses:
Failed addresses:
Deferred addresses:
-usery@test.ex
+ usery@test.ex
locking TESTSUITE/spool/db/retry.lockfile
deleted retry information for R:usery@test.ex
deleted retry information for R:test.ex
@@ -130,7 +130,7 @@ failing_interval=ttt message_age=ttt
Writing retry data for R:usery@test.ex:<CALLER@test.ex>
first failed=dddd last try=dddd next try=+2 expired=0
errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error
-userx@test.ex
+ userx@test.ex
deleted retry information for R:userx@test.ex
deleted retry information for R:test.ex
retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
diff --git a/test/stderr/0361 b/test/stderr/0361
index 1c8029894..bcceadc7e 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -83,7 +83,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
kilos@recurse.test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -119,7 +119,7 @@ rewrite_one_header: type=F:
From: CALLER_NAME <CALLER@test.ex>
re-routed to kilos@recurse.test.ex.test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -158,7 +158,7 @@ routed by r3 router
envelope to: kilos@recurse.test.ex.test.ex
transport: <none>
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -206,7 +206,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> kilos@recurse.test.ex.test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
diff --git a/test/stderr/0386 b/test/stderr/0386
index 422f74d21..aaea76063 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -246,7 +246,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
2@b
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -283,7 +283,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> 2@b <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -321,7 +321,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-2@b: no retry items
+ 2@b: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
@@ -426,7 +426,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
2@b
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -462,7 +462,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> 2@b <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -500,7 +500,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
Processing retry items
Succeeded addresses:
-2@b: no retry items
+ 2@b: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
diff --git a/test/stderr/0388 b/test/stderr/0388
index accc257e1..b4d405fc2 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -8,7 +8,7 @@ DSN: r1 propagating DSN
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaX-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -75,7 +75,7 @@ changed uid/gid: remote delivery to x@y with transport=smtp
set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp
checking status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -106,7 +106,7 @@ address match test: subject=*@127.0.0.1 pattern=*
*@127.0.0.1 in "*"? yes (matched "*")
checking status of V4NET.0.0.0
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -134,9 +134,9 @@ Processing retry items
Succeeded addresses:
Failed addresses:
Deferred addresses:
-x@y
+ x@y
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
@@ -164,6 +164,7 @@ dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224
timed out: all retries expired
LOG: MAIN
** x@y: retry timeout exceeded
+closed hints database and lockfile
end of retry processing
exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xebb95ced -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00
Exim version x.yz ....
@@ -232,7 +233,7 @@ DSN: r1 propagating DSN
set_process_info: pppp delivering specified messages
set_process_info: pppp delivering 10HmaY-0005vi-00
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
@@ -245,6 +246,7 @@ dbfn_read: key=R:CALLER@myhost.test.ex:<>
no domain retry record
no address retry record
CALLER@myhost.test.ex: queued for routing
+closed hints database and lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing CALLER@myhost.test.ex
--------> r0 router <--------
@@ -275,7 +277,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
Processing retry items
Succeeded addresses:
-CALLER@myhost.test.ex: no retry items
+ CALLER@myhost.test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
diff --git a/test/stderr/0398 b/test/stderr/0398
index ca824b0d5..f7d82042f 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -117,7 +117,7 @@ routed by r2 router
host 127.0.0.1 [127.0.0.1]
Attempting full verification using callout
locking TESTSUITE/spool/db/callout.lockfile
-locked TESTSUITE/spool/db/callout.lockfile
+locked TESTSUITE/spool/db/callout.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/callout)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
@@ -125,6 +125,7 @@ dbfn_read: key=remote
callout cache: found domain record for remote
dbfn_read: key=qq@remote
callout cache: no address record found for qq@remote
+closed hints database and lockfile
interface=NULL port=1224
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 Server ready
@@ -142,7 +143,7 @@ cmd buf flush ddd bytes
SMTP>> QUIT
cmd buf flush ddd bytes
locking TESTSUITE/spool/db/callout.lockfile
-locked TESTSUITE/spool/db/callout.lockfile
+locked TESTSUITE/spool/db/callout.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/callout)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT
@@ -151,6 +152,7 @@ wrote callout cache domain record for remote:
result=1 postmaster=0 random=0
dbfn_write: key=qq@remote
wrote negative callout cache address record for qq@remote
+closed hints database and lockfile
----------- end verify ------------
l_message: $acl_verify_message
warn: condition test succeeded in ACL "rcpt"
@@ -222,7 +224,7 @@ routed by r2 router
host 127.0.0.1 [127.0.0.1]
Attempting full verification using callout
locking TESTSUITE/spool/db/callout.lockfile
-locked TESTSUITE/spool/db/callout.lockfile
+locked TESTSUITE/spool/db/callout.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/callout)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
@@ -231,6 +233,7 @@ callout cache: found domain record for remote
dbfn_read: key=qq@remote
callout cache: found address record for qq@remote
callout cache: address record is negative
+closed hints database and lockfile
----------- end verify ------------
l_message: $acl_verify_message
warn: condition test succeeded in ACL "rcpt"
diff --git a/test/stderr/0402 b/test/stderr/0402
index 24a4fcd4d..ed2835589 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -226,7 +226,7 @@ Delivery address list:
rd+CALLER@test.ex
rd+usery@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -421,7 +421,7 @@ routed by r1 router
envelope to: CALLER@test.ex
transport: t1
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -448,7 +448,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> TESTSUITE/test-mail/junk <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -506,7 +506,7 @@ LOG: MAIN
=> TESTSUITE/test-mail/junk <rd+usery@test.ex> R=r5 T=ft1
--------> TESTSUITE/test-mail/junk <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -561,7 +561,7 @@ LOG: MAIN
=> TESTSUITE/test-mail/junk <rd+CALLER@test.ex> R=r4 T=ft1
--------> CALLER@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -586,7 +586,7 @@ LOG: MAIN
=> CALLER <CALLER@test.ex> R=r1 T=t1
--------> usery@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -614,7 +614,7 @@ LOG: MAIN
=> usery <usery@test.ex> R=r2 T=t1
--------> userz@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -646,15 +646,15 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-userz@test.ex: no retry items
-usery@test.ex: no retry items
-CALLER@test.ex: no retry items
-TESTSUITE/test-mail/junk: no retry items
-rd+CALLER@test.ex: no retry items
-TESTSUITE/test-mail/junk: no retry items
-rd+usery@test.ex: no retry items
-rd+CALLER@test.ex: no retry items
-rd+usery@test.ex: no retry items
+ userz@test.ex: no retry items
+ usery@test.ex: no retry items
+ CALLER@test.ex: no retry items
+ TESTSUITE/test-mail/junk: no retry items
+ rd+CALLER@test.ex: no retry items
+ TESTSUITE/test-mail/junk: no retry items
+ rd+usery@test.ex: no retry items
+ rd+CALLER@test.ex: no retry items
+ rd+usery@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
diff --git a/test/stderr/0403 b/test/stderr/0403
index 0f5338b38..d75d61b01 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -71,7 +71,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -134,7 +134,7 @@ routed by r1 router
envelope to: userx@test.ex
transport: <none>
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -153,7 +153,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> TESTSUITE/test-mail/junk <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
diff --git a/test/stderr/0404 b/test/stderr/0404
index e8746d9c5..a1945a2a7 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -174,7 +174,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -217,7 +217,7 @@ routed by r2 router
envelope to: userx@test.ex
transport: <none>
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -236,7 +236,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -3370,7 +3370,7 @@ Delivery address list:
sender@test.ex
sender@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -17976,7 +17976,7 @@ sender@test.ex is a duplicate address: discarded
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> sender@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -18016,7 +18016,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
Processing retry items
Succeeded addresses:
-sender@test.ex: no retry items
+ sender@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
@@ -18051,9 +18051,9 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
->sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...: no retry items
-userx@test.ex: no retry items
-userx@test.ex: no retry items
+ >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...: no retry items
+ userx@test.ex: no retry items
+ userx@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
diff --git a/test/stderr/0408 b/test/stderr/0408
index 96b57117d..cd782a8cc 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -71,7 +71,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -135,7 +135,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -173,7 +173,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-userx@test.ex: no retry items
+ userx@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
diff --git a/test/stderr/0432 b/test/stderr/0432
index a27a2fe83..722408372 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -78,7 +78,7 @@ get[host|ipnode]byname[2] looked up these IP addresses:
name=127.0.0.1 address=127.0.0.1
Attempting full verification using callout
locking TESTSUITE/spool/db/callout.lockfile
-locked TESTSUITE/spool/db/callout.lockfile
+locked TESTSUITE/spool/db/callout.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/callout)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
@@ -86,6 +86,7 @@ dbfn_read: key=y
callout cache: no domain record found for y
dbfn_read: key=x@y
callout cache: no address record found for x@y
+closed hints database and lockfile
interface=NULL port=1224
Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
SMTP<< 220 server ready
@@ -103,7 +104,7 @@ cmd buf flush ddd bytes
SMTP>> QUIT
cmd buf flush ddd bytes
locking TESTSUITE/spool/db/callout.lockfile
-locked TESTSUITE/spool/db/callout.lockfile
+locked TESTSUITE/spool/db/callout.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/callout)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT
@@ -112,6 +113,7 @@ wrote callout cache domain record for y:
result=1 postmaster=0 random=0
dbfn_write: key=x@y
wrote positive callout cache address record for x@y
+closed hints database and lockfile
----------- end verify ------------
sender x@y verified ok
accept: condition test succeeded in ACL "mail"
@@ -178,7 +180,7 @@ get[host|ipnode]byname[2] looked up these IP addresses:
name=127.0.0.1 address=127.0.0.1
Attempting full verification using callout
locking TESTSUITE/spool/db/callout.lockfile
-locked TESTSUITE/spool/db/callout.lockfile
+locked TESTSUITE/spool/db/callout.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/callout)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
@@ -187,6 +189,7 @@ callout cache: found domain record for y
dbfn_read: key=x@y
callout cache: found address record for x@y
callout cache: address record is positive
+closed hints database and lockfile
----------- end verify ------------
sender x@y verified ok
accept: condition test succeeded in ACL "mail"
diff --git a/test/stderr/0476 b/test/stderr/0476
index b4f54c4f1..6868a902c 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -12,6 +12,8 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid ppppp)
set_process_info: pppp delivering 10HmaX-0005vi-00 using t1
t1 transport entered
userx@test.ex
+hostlist:
+ 127.0.0.1:-1
checking status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
@@ -67,6 +69,8 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00
set_process_info: pppp delivering 10HmaZ-0005vi-00 using t1
t1 transport entered
CALLER@the.local.host.name
+hostlist:
+ 127.0.0.1:-1
checking status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 status = usable
delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)
@@ -100,6 +104,8 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid ppppp)
set_process_info: pppp delivering 10HmaY-0005vi-00 using t1
t1 transport entered
usery@test.ex
+hostlist:
+ 127.0.0.1:-1
checking status of 127.0.0.1
no message retry record
127.0.0.1 [127.0.0.1]:1111 status = unusable
diff --git a/test/stderr/0487 b/test/stderr/0487
index 7f2ad5063..7b7aca3fe 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -101,7 +101,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -138,7 +138,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -178,7 +178,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-userx@test.ex: no retry items
+ userx@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
diff --git a/test/stderr/0529 b/test/stderr/0529
index 49ca6dcaf..a308cc147 100644
--- a/test/stderr/0529
+++ b/test/stderr/0529
@@ -32,17 +32,17 @@ LOG: MAIN
== TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
Processing retry items
Succeeded addresses:
-x@test.ex: no retry items
+ x@test.ex: no retry items
Failed addresses:
Deferred addresses:
-TESTSUITE/test-mail/rmbox
+ TESTSUITE/test-mail/rmbox
locking TESTSUITE/spool/db/retry.lockfile
retry for T:TESTSUITE/test-mail/rmbox:x@test.ex = *@test.ex -22 0
failing_interval=ttt message_age=ttt
Writing retry data for T:TESTSUITE/test-mail/rmbox:x@test.ex
first failed=dddd last try=dddd next try=+900 expired=0
errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox)
-x@test.ex: no retry items
+ x@test.ex: no retry items
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -76,11 +76,11 @@ LOG: retry_defer MAIN
== TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-52): Retry time not yet reached
Processing retry items
Succeeded addresses:
-x@test.ex: no retry items
+ x@test.ex: no retry items
Failed addresses:
Deferred addresses:
-TESTSUITE/test-mail/rmbox: no retry items
-x@test.ex: no retry items
+ TESTSUITE/test-mail/rmbox: no retry items
+ x@test.ex: no retry items
end of retry processing
LOG: queue_run MAIN
End queue run: pid=pppp
diff --git a/test/stderr/0554 b/test/stderr/0554
index 5cabbf9ae..460a2c22b 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -26,7 +26,7 @@ Processing retry items
Succeeded addresses:
Failed addresses:
Deferred addresses:
-x@y
+ x@y
locking TESTSUITE/spool/db/retry.lockfile
retry for R:x@y:<CALLER@myhost.test.ex> = * 0 0
failing_interval=ttt message_age=ttt
@@ -78,7 +78,7 @@ LOG: MAIN
=> x@y R=r1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
Processing retry items
Succeeded addresses:
-x@y
+ x@y
locking TESTSUITE/spool/db/retry.lockfile
deleted retry information for R:x@y:<CALLER@myhost.test.ex>
deleted retry information for R:x@y
diff --git a/test/stderr/2600 b/test/stderr/2600
index 6f2eaeac1..62b96aaef 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -355,7 +355,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@myhost.test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -402,7 +402,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@myhost.test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -449,7 +449,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-userx@myhost.test.ex: no retry items
+ userx@myhost.test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
diff --git a/test/stderr/5004 b/test/stderr/5004
index c619887d3..4730672b5 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -75,7 +75,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -113,7 +113,7 @@ routed by r1 router
envelope to: userx@test.ex
transport: <none>
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -132,7 +132,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> TESTSUITE/test-mail <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -171,9 +171,9 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-TESTSUITE/test-mail: no retry items
-userx@test.ex: no retry items
-userx@test.ex: no retry items
+ TESTSUITE/test-mail: no retry items
+ userx@test.ex: no retry items
+ userx@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
diff --git a/test/stderr/5005 b/test/stderr/5005
index ad683388f..b25c6c5be 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -71,7 +71,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
nofile@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -108,7 +108,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> nofile@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -165,7 +165,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-nofile@test.ex: no retry items
+ nofile@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
@@ -257,7 +257,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -293,7 +293,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -352,7 +352,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
Processing retry items
Succeeded addresses:
-userx@test.ex: no retry items
+ userx@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing
@@ -444,7 +444,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -480,7 +480,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -536,9 +536,9 @@ Processing retry items
Succeeded addresses:
Failed addresses:
Deferred addresses:
-userx@test.ex
+ userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
@@ -552,6 +552,7 @@ 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
+closed hints database and lockfile
end of retry processing
delivery deferred: update_spool=1 header_rewritten=0
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
@@ -639,7 +640,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
@@ -652,6 +653,7 @@ dbfn_read: key=R:userx@test.ex:<CALLER@test.ex>
no domain retry record
no address retry record
userx@test.ex: queued for routing
+closed hints database and lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
routing userx@test.ex
--------> r1 router <--------
@@ -678,13 +680,14 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY
dbfn_read: key=T:userx@test.ex
retry record exists: age=ttt (max 1w)
time to retry = tttt expired = 0
+closed hints database and lockfile
search_tidyup called
changed uid/gid: local delivery to userx <userx@test.ex> transport=t1
uid=CALLER_UID gid=CALLER_GID pid=pppp
@@ -724,9 +727,9 @@ Processing retry items
Succeeded addresses:
Failed addresses:
Deferred addresses:
-userx@test.ex
+ userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
@@ -740,6 +743,7 @@ 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
+closed hints database and lockfile
end of retry processing
delivery deferred: update_spool=1 header_rewritten=0
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
diff --git a/test/stderr/5006 b/test/stderr/5006
index 6162c9bb0..9dd41c8e8 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -71,7 +71,7 @@ DSN: set orcpt: NULL flags: 0
Delivery address list:
userx@test.ex
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim
@@ -108,7 +108,7 @@ search_tidyup called
>>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
--------> userx@test.ex <--------
locking TESTSUITE/spool/db/retry.lockfile
-locked TESTSUITE/spool/db/retry.lockfile
+locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN(TESTSUITE/spool/db/retry)
returned from EXIM_DBOPEN
no retry data available
@@ -163,7 +163,7 @@ changed uid/gid: post-delivery tidying
set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
Processing retry items
Succeeded addresses:
-userx@test.ex: no retry items
+ userx@test.ex: no retry items
Failed addresses:
Deferred addresses:
end of retry processing