Debug: expansions: refactor ascii-art/UTF8; mark up space & nl

[exim.git] / test / stderr / 0021

diff --git a/test/stderr/0021 b/test/stderr/0021
index 6c9d189b37812029cc38e73e4c93d8ec9398326d..59251c0b6a0ebabf36143acb87831bd8f9cb408e 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -34,8 +34,6 @@ LOG: MAIN
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT

-host in pipelining_connect_advertise_hosts?
- list element: 

 host in hosts_require_helo?
  list element: 
 host in hosts_require_helo? no (end of list)
 host in hosts_require_helo?
  list element: 
 host in hosts_require_helo? no (end of list)


@@ -155,7 +153,7 @@ LOG: PANIC
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 LOG: smtp_connection MAIN
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 LOG: smtp_connection MAIN

-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT

 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 Exim version x.yz ....
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 Exim version x.yz ....


@@ -194,8 +192,6 @@ LOG: MAIN
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT

-host in pipelining_connect_advertise_hosts?
- list element: 

 host in hosts_require_helo?
  list element: 
 host in hosts_require_helo? no (end of list)
 host in hosts_require_helo?
  list element: 
 host in hosts_require_helo? no (end of list)


@@ -299,8 +295,8 @@ LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN

-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT

 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored
 1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT

-1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 no recipients found in headers
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 no recipients found in headers