tidying

[exim.git] / test / stderr / 0426

diff --git a/test/stderr/0426 b/test/stderr/0426
index 8ae6452dab350b239d40a49dcecc105b63babead..b9ab6329f197accd922845ed43dcf74a7974666e 100644 (file)
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -1,15 +1,16 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....

+Hints DB:

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

-locking TESTSUITE/spool/db/retry.lockfile

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@uppercase.test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@uppercase.test.ex


@@ -28,12 +29,13 @@ local_part=x domain=uppercase.test.ex
 calling r1 router
 r1 router called for x@uppercase.test.ex
   domain = uppercase.test.ex
 calling r1 router
 r1 router called for x@uppercase.test.ex
   domain = uppercase.test.ex

-check dnssec require list
-check dnssec request list
-uppercase.test.ex (MX resp) DNSSEC
+main lookup for domain
+ check dnssec require list
+ check dnssec request list
+ uppercase.test.ex (MX resp) DNSSEC

 local host found for non-MX address
 local host found for non-MX address

-fully qualified name = UpperCase.test.ex
-uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 
+ fully qualified name = UpperCase.test.ex
+ uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 

 remote host address is the local host: uppercase.test.ex: configured to try delivery anyway
 set transport t1
 queued for t1 transport: local_part = x
 remote host address is the local host: uppercase.test.ex: configured to try delivery anyway
 set transport t1
 queued for t1 transport: local_part = x


@@ -51,23 +53,23 @@ After routing:
     x@UpperCase.test.ex
   Failed addresses:
   Deferred addresses:
     x@UpperCase.test.ex
   Failed addresses:
   Deferred addresses:

-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-t1.lockfile

 cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT+:250'
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT+:250'

+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown
 Exim version x.yz ....
 LOG: MAIN
   ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
 Exim version x.yz ....

+Hints DB:

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

-locking TESTSUITE/spool/db/retry.lockfile

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@test.ex


@@ -95,8 +97,8 @@ After routing:
   Deferred addresses:
 LOG: MAIN
   Completed
   Deferred addresses:
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=p1236 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>

 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>