Missed one case of "retry time not reached" when adding additional

[users/jgh/exim.git] / test / stderr / 0476

diff --git a/test/stderr/0476 b/test/stderr/0476
index c58e7206082f809341bb78c87418aaeccb1349c3..c70ad24615a77b6cd3dea19ee5d2c91a54290b4a 100644 (file)
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -51,7 +51,6 @@ admin user
 set_process_info: pppp accepting a local non-SMTP message from <>
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 set_process_info: pppp accepting a local non-SMTP message from <>
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -75,15 +74,16 @@ added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=
 all IP addresses skipped or deferred at least one address
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaZ-0005vi-00 (just run t1 for CALLER@the.local.host.name in subprocess)
 all IP addresses skipped or deferred at least one address
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaZ-0005vi-00 (just run t1 for CALLER@the.local.host.name in subprocess)

-LOG: MAIN
-  Completed
-set_process_info: pppp running queue: waiting for children of pppp

 set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish
 set_process_info: pppp delivering 10HmaZ-0005vi-00
 LOG: MAIN
   == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused
 set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish
 set_process_info: pppp delivering 10HmaZ-0005vi-00
 LOG: MAIN
   == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused
 set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>

+>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+LOG: MAIN
+  Completed
+set_process_info: pppp running queue: waiting for children of pppp

 set_process_info: pppp running queue
 set_process_info: pppp running queue: 10HmaY-0005vi-00-H
 set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp)
 set_process_info: pppp running queue
 set_process_info: pppp running queue: 10HmaY-0005vi-00-H
 set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp)


@@ -96,7 +96,8 @@ t1 transport entered
 checking status of 127.0.0.1
 no message retry record
 host retry time not reached: checking ultimate address timeout
 checking status of 127.0.0.1
 no message retry record
 host retry time not reached: checking ultimate address timeout

-now=tttt received_time=tttt diff=tttt timeout=86400
+  now=tttt first_failed=tttt next_try=tttt expired=0
+  received_time=tttt diff=tttt timeout=86400

 127.0.0.1 [127.0.0.1]:1111 status = unusable
 all IP addresses skipped or deferred at least one address
 Leaving t1 transport
 127.0.0.1 [127.0.0.1]:1111 status = unusable
 all IP addresses skipped or deferred at least one address
 Leaving t1 transport