Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0554

diff --git a/test/stderr/0554 b/test/stderr/0554
index 66e995e2e5a422f2b5187adf0c7ba3587c795e2e..4289094b1ed6cc5735cd9dc662bc8cf169446226 100644 (file)
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -1,8 +1,8 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid

-locking TESTSUITE/spool/db/retry.lockfile

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y


@@ -15,11 +15,10 @@ After routing:
     x@y
   Failed addresses:
   Deferred addresses:
     x@y
   Failed addresses:
   Deferred addresses:

-checking status of 127.0.0.1
-locking TESTSUITE/spool/db/retry.lockfile
+checking retry status of 127.0.0.1

 no retry data available
 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=-44 more_errno=dd,A flags=0
 no retry data available
 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=-44 more_errno=dd,A flags=0

-cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'

 reading retry information for R:x@y:<CALLER@myhost.test.ex> from subprocess
   added retry item
 LOG: MAIN
 reading retry information for R:x@y:<CALLER@myhost.test.ex> from subprocess
   added retry item
 LOG: MAIN


@@ -29,7 +28,6 @@ Succeeded addresses:
 Failed addresses:
 Deferred addresses:
  x@y
 Failed addresses:
 Deferred addresses:
  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
 Writing retry data for R:x@y:<CALLER@myhost.test.ex>
 retry for R:x@y:<CALLER@myhost.test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:x@y:<CALLER@myhost.test.ex>


@@ -38,10 +36,10 @@ Writing retry data for R:x@y:<CALLER@myhost.test.ex>
 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid

-locking TESTSUITE/spool/db/retry.lockfile

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y
 no   domain  retry record
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@y
 no   domain  retry record


@@ -56,14 +54,12 @@ After routing:
     x@y
   Failed addresses:
   Deferred addresses:
     x@y
   Failed addresses:
   Deferred addresses:

-checking status of 127.0.0.1
-locking TESTSUITE/spool/db/retry.lockfile
+checking retry status of 127.0.0.1

 no host retry record
 no message retry record
 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=dd more_errno=dd,A flags=1
 added retry item for R:x@y: errno=dd more_errno=dd,A flags=1
 no host retry record
 no message retry record
 added retry item for R:x@y:<CALLER@myhost.test.ex>: errno=dd more_errno=dd,A flags=1
 added retry item for R:x@y: errno=dd more_errno=dd,A flags=1

-locking TESTSUITE/spool/db/wait-smtp.lockfile
-cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250'
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250'

 reading retry information for R:x@y from subprocess
   existing delete item dropped
   added delete item
 reading retry information for R:x@y from subprocess
   existing delete item dropped
   added delete item


@@ -84,7 +80,6 @@ LOG: MAIN
 Processing retry items
 Succeeded addresses:
  x@y
 Processing retry items
 Succeeded addresses:
  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
 deleted retry information for R:y
 deleted retry information for R:x@y:<CALLER@myhost.test.ex>
 deleted retry information for R:x@y
 deleted retry information for R:y