Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0622

diff --git a/test/scripts/0000-Basic/0622 b/test/scripts/0000-Basic/0622
index a7c966de566ccfe78c471be317c8c0f859c68f0a..e98a53aeb20b9ce8b2bf35435088ee749d360fa9 100644 (file)
--- a/test/scripts/0000-Basic/0622
+++ b/test/scripts/0000-Basic/0622
@@ -1,32 +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
+# "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
+#
+#
+#
+# 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

 ****
 ****

-sleep 1
-exim -M $msg1
+exim -DHAP=hosts_avoid_pipelining=127.0.0.1 -M $msg1

 ****
 ****

-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

 ****
 ****

-sleep 1

 #
 #
 #
 #

+killdaemon

 no_msglog_check
 no_msglog_check

+sleep 1