X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/40bffa31bd7057a0e88e29bb76fa63382d4aa1bc..2c3ac6dd18dbf1f048a7054a85879dbf90c1e7f4:/test/scripts/0000-Basic/0622?ds=inline diff --git a/test/scripts/0000-Basic/0622 b/test/scripts/0000-Basic/0622 index f3016f2cf..e98a53aeb 100644 --- a/test/scripts/0000-Basic/0622 +++ b/test/scripts/0000-Basic/0622 @@ -1,49 +1,42 @@ -# bounce_message_file and warn_message_file +# PIPELINING and 250 after 452 in a set of RCPT responses +need_ipv4 # -exim -odf a@test.ex -Subject: test 1.1 - Default deny message +exim -DSERVER=server -bd -oX PORT_D **** -exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl b@test.ex -Subject: test 1.2 - Specified deny message file +exim -odq -t +To: A@test.ex,B@test.ex,C@test.ex,D@test.ex,E@test.ex,F@test.ex + +Testing **** -exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl c@test.ex -Subject: test 1.3 - Specified, missing deny message file -**** -exim -odf -DOPT=relative_file_path d@test.ex -Subject: test 1.4 - Specified, non-absolute -**** -exim -odf -DOPT='$acl_m_unset' e@test.ex -Subject: test 1.5 - Specified, expansion empty -**** -exim -odf -DOPT='DIR/aux-fixed/TESTNUM.$sender_address' f@test.ex -Subject: test 1.6 - Specified, expansion tainted -**** -exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' g@test.ex -Subject: test 1.7 - Specified, expansion good +# "A" should go throuugh as one MAIL FROM message, B,E,F as a second, C,D +# as a third - due to the server responses. Note that the client logging +# gets overlapped; look at the server's id= logged with the 250 by the client. +exim -M $msg1 **** # -exim -odf delay_p@test.ex -Subject: test 2.1 - Default delay message -**** -exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl delay_q@test.ex -Subject: test 2.2 - Specified delay message file -**** -exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl delay_r@test.ex -Subject: test 2.3 - Specified, missing delay message file -**** -exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' delay_s@test.ex -Subject: test 2.7 - Specified, expansion good -**** -sleep 1 -exim -M $msg1 +# +# +# +# Repeat without pipelining, just as a baseline check. +# The optimisation, that does another message attempt immediately on the open +# connection, is only there for the pipelined case at present. So we must +# kick the message three times for three separate connections. +# (A possible enhancement, if anyone cares. "first_addr" in +# smtp_deliver/sync_responses is the key). +# +exim -odq -t +To: A@test.ex,B@test.ex,C@test.ex,D@test.ex,E@test.ex,F@test.ex + +Testing **** -exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg2 +exim -DHAP=hosts_avoid_pipelining=127.0.0.1 -M $msg1 **** -exim -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl -M $msg3 +exim -DHAP=hosts_avoid_pipelining=127.0.0.1 -M $msg1 **** -exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg4 +exim -DHAP=hosts_avoid_pipelining=127.0.0.1 -M $msg1 **** -sleep 1 # # +killdaemon no_msglog_check +sleep 1