Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0450

diff --git a/test/stderr/0450 b/test/stderr/0450
index e502012d811a0a172be5d84cb73203fdb4d5bfb3..28dd13c54240fe3ac639b3c574b4f1edc34760a1 100644 (file)
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -1,10 +1,12 @@
 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
 configuration file is TESTSUITE/test-config
 trusted user
 admin user


@@ -15,22 +17,24 @@ t1 transport entered
   userx@test.ex
 using the transport's hosts: 127.0.0.1
 getting address for 127.0.0.1
   userx@test.ex
 using the transport's hosts: 127.0.0.1
 getting address for 127.0.0.1

-checking status of 127.0.0.1
+checking retry status of 127.0.0.1

 127.0.0.1 [127.0.0.1]:1111 retry-status = usable
 127.0.0.1 [127.0.0.1]:1111 retry-status = usable

-delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...  failed: Connection refused
+delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
+ failed: Connection refused

 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused

-added retry item for T:127.0.0.1:127.0.0.1:PORT_D: errno=dd more_errno=dd,A flags=2
+added retry item for T:[127.0.0.1]:127.0.0.1:PORT_D: errno=dd more_errno=dd,A flags=2

 all IP addresses skipped or deferred at least one address
 updating wait-t1 database
 all IP addresses skipped or deferred at least one address
 updating wait-t1 database

-added 10HmaX-0005vi-00 to queue for 127.0.0.1
+added 10HmaX-000000005vi-0000 to queue for 127.0.0.1

 Leaving t1 transport
 LOG: MAIN
   == userx@test.ex R=r1 T=t1 defer (dd): Connection refused
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 Leaving t1 transport
 LOG: MAIN
   == userx@test.ex R=r1 T=t1 defer (dd): Connection refused
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=p1235 (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


@@ -42,15 +46,16 @@ t1 transport entered
   userx@test.ex
 using the transport's hosts: 127.0.0.1
 getting address for 127.0.0.1
   userx@test.ex
 using the transport's hosts: 127.0.0.1
 getting address for 127.0.0.1

-checking status of 127.0.0.1
+checking retry status of 127.0.0.1

 no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1112 retry-status = usable
 no host retry record
 no message retry record
 127.0.0.1 [127.0.0.1]:1112 retry-status = usable

-delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_D2 ...  failed: Connection refused
+delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_D2 ...
+ failed: Connection refused

 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused

-added retry item for T:127.0.0.1:127.0.0.1:PORT_D2: errno=dd more_errno=dd,A flags=2
+added retry item for T:[127.0.0.1]:127.0.0.1:PORT_D2: errno=dd more_errno=dd,A flags=2

 all IP addresses skipped or deferred at least one address
 updating wait-t1 database
 already listed for 127.0.0.1
 all IP addresses skipped or deferred at least one address
 updating wait-t1 database
 already listed for 127.0.0.1