Expansions: better error messages for parse errors, and better debug

[exim.git] / test / stderr / 0476

diff --git a/test/stderr/0476 b/test/stderr/0476
index f0dc33650a4ec18adad5031cfc7778ca850f07db..29b9c3ebb2d5d9905354e911fb5a5792039b7d74 100644 (file)
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -23,6 +23,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
          250-PIPELINING
          250 OK
 using PIPELINING
          250-PIPELINING
          250 OK
 using PIPELINING

+not using DSN

   SMTP>> MAIL FROM:<CALLER@the.local.host.name>
   SMTP>> RCPT TO:<userx@test.ex>
   SMTP>> DATA
   SMTP>> MAIL FROM:<CALLER@the.local.host.name>
   SMTP>> RCPT TO:<userx@test.ex>
   SMTP>> DATA


@@ -35,6 +36,7 @@ transport_check_waiting entered
   sequence=1 local_max=500 global_max=-1
   SMTP>> RSET
 H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET
   sequence=1 local_max=500 global_max=-1
   SMTP>> RSET
 H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET

+  SMTP(close)>>

 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for userx@test.ex: result OK
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess)
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for userx@test.ex: result OK
 Leaving t1 transport
 set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess)


@@ -106,7 +108,7 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@test.e
 set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish
 set_process_info: pppp delivering 10HmaY-0005vi-00
 LOG: retry_defer MAIN
 set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish
 set_process_info: pppp delivering 10HmaY-0005vi-00
 LOG: retry_defer MAIN

-  == usery@test.ex R=r1 T=t1 defer (-53): retry time not reached for any host
+  == usery@test.ex R=r1 T=t1 defer (-53): retry time not reached for any host for 'test.ex'

 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
 set_process_info: pppp running queue: waiting for children of pppp
 set_process_info: pppp running queue
 set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00
 set_process_info: pppp running queue: waiting for children of pppp
 set_process_info: pppp running queue