Testsuite: output changes resulting

[exim.git] / test / stderr / 0629

diff --git a/test/stderr/0629 b/test/stderr/0629
index ad96aa70e27fa1248aaffd598181aa7f9fa59aad..09712bde755982f882168f407b35026d0f1a27c3 100644 (file)
--- a/test/stderr/0629
+++ b/test/stderr/0629
@@ -1,22 +1,22 @@
-accept: condition test succeeded in ACL "chk_mail"
-end of ACL "chk_mail": ACCEPT
+accept: condition test succeeded in ACL chk_mail
+end of ACL chk_mail: ACCEPT

 SMTP>> 250 OK
 SMTP<< RCPT TO:<dest2@test.ex>
 using ACL "chk_rcpt"
 SMTP>> 250 OK
 SMTP<< RCPT TO:<dest2@test.ex>
 using ACL "chk_rcpt"

-processing "deny" (TESTSUITE/test-config 20)
+processing ACL chk_rcpt "deny" (TESTSUITE/test-config 20)

 check log_reject_target = panic
 check log_reject_target = panic

-deny: condition test succeeded in ACL "chk_rcpt"
-end of ACL "chk_rcpt": DENY
+deny: condition test succeeded in ACL chk_rcpt
+end of ACL chk_rcpt: DENY

 SMTP>> 550 Administrative prohibition
 LOG: PANIC
   H=(test.ex) [127.0.0.1] F=<test_2@paniclogrcpt> rejected RCPT <dest2@test.ex>
 SMTP<< QUIT
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP>> 550 Administrative prohibition
 LOG: PANIC
   H=(test.ex) [127.0.0.1] F=<test_2@paniclogrcpt> rejected RCPT <dest2@test.ex>
 SMTP<< QUIT
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from (test.ex) [127.0.0.1] closed by QUIT
+  SMTP connection from (test.ex) [127.0.0.1] D=qqs closed by QUIT

 search_tidyup called
 SMTP>>(close on process exit)
 search_tidyup called
 SMTP>>(close on process exit)

->>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>

 
 ******** SERVER ********
 1999-03-02 09:44:33 H=(test.ex) [127.0.0.1] F=<test_2@paniclogrcpt> rejected RCPT <dest2@test.ex>
 
 ******** SERVER ********
 1999-03-02 09:44:33 H=(test.ex) [127.0.0.1] F=<test_2@paniclogrcpt> rejected RCPT <dest2@test.ex>