X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/836c3e4102dae52604590a6674bec10087dbf17e..8df47dca3671434f40108b0eef16086c7cee70bc:/test/stderr/0218 diff --git a/test/stderr/0218 b/test/stderr/0218 index bbf2b52b9..c07bd2a46 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -7,48 +7,32 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories looking in TESTSUITE/spool//input -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmaY-0005vi-00 (queue run pid ppppp) +delivering 10HmaY-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmaX-0005vi-00 (queue run pid ppppp) +delivering 10HmaX-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK 250 PIPELINING - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 Send more SMTP>> writing message and terminating "." SMTP<< 250 OK -transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp -continued-transport-interproc forking for continued-transport -continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN => a@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK" @@ -60,20 +44,20 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmaY-0005vi-00 (queue run pid ppppp) +delivering 10HmaY-0005vi-00 (queue run pid pppp) R: client (ACL) -continued-transport forking for transport -continued-transport forked for transport: npppp T: send_to_server (ACL) - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 Send more SMTP>> writing message and terminating "." + SMTP+> QUIT + SMTP(shutdown)>> + SMTP<< 250 OK SMTP<< 250 OK - SMTP>> QUIT SMTP(close)>> LOG: MAIN => b@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK" @@ -92,48 +76,36 @@ LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories looking in TESTSUITE/spool//input -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +delivering 10HmaZ-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> queue running combined directories looking in TESTSUITE/spool//input -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmaZ-0005vi-00 (queue run pid ppppp) +delivering 10HmaZ-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK 250 PIPELINING - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 550 NO SMTP<< 503 Unexpected RCPT SMTP<< 503 Unexpected DATA - SMTP>> QUIT + SMTP+> QUIT + SMTP(shutdown)>> + SMTP<< 250 OK SMTP(close)>> LOG: MAIN ** a@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:: 550 NO -qrun-delivery forking for bounce-message -qrun-delivery forked for bounce-message: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -144,12 +116,8 @@ LOG: MAIN LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused LOG: MAIN @@ -166,17 +134,11 @@ admin user dropping to exim gid; retaining priv uid LOG: queue_run MAIN Start queue run: pid=pppp -qqf -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmbB-0005vi-00 (queue run pid ppppp) +delivering 10HmbB-0005vi-00 (queue run pid pppp) R: bounce (ACL) LOG: MAIN ** CALLER@test.ex F=<> R=bounce: just discard @@ -185,43 +147,29 @@ LOG: MAIN LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmbC-0005vi-00 (queue run pid ppppp) +delivering 10HmbC-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> -fresh-exec forking for qrun-delivery -fresh-exec forked for qrun-delivery: npppp -delivering 10HmbA-0005vi-00 (queue run pid ppppp) +delivering 10HmbA-0005vi-00 (queue run pid pppp) R: client (ACL) -qrun-delivery forking for transport -qrun-delivery forked for transport: npppp T: send_to_server (ACL) Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO myhost.test.ex SMTP<< 250-OK 250 PIPELINING - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 550 Unknown SMTP<< 503 Unexpected DATA SMTP>> RSET SMTP<< 250 OK -transport forking for continued-transport-interproc -transport forked for continued-transport-interproc: npppp -continued-transport-interproc forking for continued-transport -continued-transport-interproc forked for continued-transport: npppp SMTP(close)>> LOG: MAIN ** b@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 Unknown -qrun-delivery forking for bounce-message -qrun-delivery forked for bounce-message: npppp Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -237,20 +185,20 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid -delivering 10HmbC-0005vi-00 (queue run pid ppppp) +delivering 10HmbC-0005vi-00 (queue run pid pppp) R: client (ACL) -continued-transport forking for transport -continued-transport forked for transport: npppp T: send_to_server (ACL) - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 OK SMTP>> writing message and terminating "." + SMTP+> QUIT + SMTP(shutdown)>> + SMTP<< 250 OK SMTP<< 250 OK - SMTP>> QUIT SMTP(close)>> LOG: MAIN => c@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK"