X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0f9c36e64b3ded09b1972515fc62a673e1be2b8d..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/scripts/0000-Basic/0623

diff --git a/test/scripts/0000-Basic/0623 b/test/scripts/0000-Basic/0623
index d43d13ca6..315bc4914 100644
--- a/test/scripts/0000-Basic/0623
+++ b/test/scripts/0000-Basic/0623
@@ -1,57 +1,114 @@
-# free of local_part_data, domain_data, sender_data
+# PIPELINING of QUIT
+need_ipv4
 #
-exim -bh 99.99.99.99
-HELO tester
-MAIL FROM:<a@test.ex>
-RCPT TO:<fred@good1.ex>
-DATA
-.
-RSET
-MAIL FROM:<b@test.ex>
-RCPT TO:<jim@good2.ex>
+# Baseline: no error.  Check the QUIT arrived befre we ack message-data
+server PORT_D
+220 Server ready
+EHLO
+250-hi there
+250-PIPELINING
+250 OK
+MAIL FROM
+250 OK mail
+RCPT TO
+250 OK rcpt
 DATA
+300 go ahead
 .
 QUIT
+250 OK message data
+221 Closing connection
+****
+exim -odi good@test.ex
 ****
 #
-#
-exim -bd -DSERVER=server -oX PORT_D
-****
-client 127.0.0.1 PORT_D
-??? 220
-HELO tester
-??? 250
-MAIL FROM:<a@test.ex>
-??? 250
-RCPT TO:<fred@good1.ex>
-??? 250
+# QUIT-pipeliining should not be done when PIPELINING not advertised
+server PORT_D
+220 Server ready
+EHLO
+250-hi there
+250 OK
+MAIL FROM
+250 OK mail
+RCPT TO
+250 OK rcpt
 DATA
-??? 354
+300 go ahead
 .
-??? 250
-RSET
-??? 250
-MAIL FROM:<b@test.ex>
-??? 250
-RCPT TO:<jim@good2.ex>
-??? 250
+250 OK message data
+*sleep 1
+<<
+QUIT
+221 Closing connection
+****
+exim -odi nopipe@test.ex
+****
+#
+# Temp-error response to message-data
+# Check specifically for a close, and no repeated command
+# Also check Exim's list of commands sent
+server PORT_D
+220 Server ready
+EHLO
+250-hi there
+250-PIPELINING
+250 OK
+MAIL FROM
+250 OK mail
+RCPT TO
+250 OK rcpt
 DATA
-??? 354
+300 go ahead
 .
-??? 250
 QUIT
+451 Service not available
+221 Closing connection
+*eof
+****
+exim -d-all+transport -odi tempreject@test.ex
+****
+exim -Mrm $msg1
 ****
-killdaemon
-#
 #
-exim -bs
-HELO tester
-MAIL FROM:<a@test.ex>
-RCPT TO:<fred@good1.ex>
+# Perm-error response to message-data
+server PORT_D
+220 Server ready
+EHLO
+250-hi there
+250-PIPELINING
+250 OK
+MAIL FROM
+250 OK mail
+RCPT TO
+250 OK rcpt
 DATA
+300 go ahead
 .
 QUIT
+550 content rejected
+221 Closing connection
+*eof
+****
+exim -d-all+transport -odi permreject@test.ex
 ****
 #
-#
-no_msglog_check
+# Channel-close response to message-data
+server PORT_D
+220 Server ready
+EHLO
+250-hi there
+250-PIPELINING
+250 OK
+MAIL FROM
+250 OK mail
+RCPT TO
+250 OK rcpt
+DATA
+300 go ahead
+.
+>*eof
+****
+exim -d-all+transport -odi permreject@test.ex
+****
+exim -Mrm $msg1
+****