DMARC: expand main-config options. Bug 3102

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

diff --git a/test/scripts/0000-Basic/0904 b/test/scripts/0000-Basic/0904
index 2157e61a87a061e31d39f2c4e9190eaf2dabe93e..3b5a79dac877a7b2e6afc7ff9c6999da03ef708f 100644 (file)
--- a/test/scripts/0000-Basic/0904
+++ b/test/scripts/0000-Basic/0904
@@ -1,6 +1,4 @@
-# CHUNKING transmission, short messages
-#
-# Start with non-pipelined cases
+# CHUNKING transmission, short messages, no PIPELINING
 #
 # Basic short message
 server PORT_S
@@ -12,8 +10,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 345 LAST
+*data 345
 250 OK
 QUIT
 225 OK
@@ -41,8 +39,8 @@ MAIL FROM
 250 good mail cmd
 RCPT TO
 250 acceptable rcpt cmd
-BDAT 329 LAST
-*data 330
+BDAT 345 LAST
+*data 346
 250 OK got that data
 QUIT
 225 OK quitting
@@ -71,8 +69,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 328
+BDAT 345 LAST
+*data 344
 250 OK
 QUIT
 225 OK
@@ -99,8 +97,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 345 LAST
+*data 345
 500 oops
 QUIT
 225 OK
@@ -127,8 +125,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 345 LAST
+*data 345
 400 not right now
 QUIT
 225 OK
@@ -146,235 +144,22 @@ QUIT
 ****
 #
 #
-###################################################
-#
-# Pipelined cases
-#
-# Basic short message
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 329 LAST
-*data 329
-250 OK mail
-250 OK rcpt
-250 OK bdat
-QUIT
-225 OK
-*eof
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@source.dom>
-RCPT TO:<p@test.ex>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# Error case: server wrongly expected more data, client gets timeout for data-ack
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 329 LAST
-*data 330
-250 good mail cmd
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@source.dom>
-RCPT TO:<q@test.ex>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# Error case: server wrongly expected less data
-# client get the data-ack, sends quit - but server
-# sees a munged quit due to the outstanding data tail
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 329 LAST
-*data 328
-250 OK mail
-250 OK rcpt
-250 OK bdat
-QUIT
-225 OK
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@source.dom>
-RCPT TO:<r@test.ex>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# server rejects MAIL cmd
-# transport coding does not handle the possible RSET-and-another transaction,
-# but always QUITs
+# Server rejects RCPT.  Client should not proceed to BDAT.
 server PORT_S
 220 Greetings
 EHLO
 250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 329 LAST
-*data 329
-550 unacceptable mail-from
-550 rcpt ungood lacking mail-from
-500 bdat ungood lacking mail-from
-QUIT
-225 OK
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@source.dom>
-RCPT TO:<s@test.ex>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# server tmp-rejects MAIL cmd
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 330 LAST
-*data 330
-450 greylisted mail-from
-550 rcpt ungood lacking mail-from
-500 bdat ungood lacking mail-from
-QUIT
-225 OK
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@source.dom>
-RCPT TO:<s1@test.ex>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# server rejects RCPT cmd
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 329 LAST
-*data 329
-250 OK mail
-550 no such recipient
-500 oops bdat
-QUIT
-225 OK
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@source.dom>
-RCPT TO:<t@test.ex>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# server rejects BDAT cmd
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM
-RCPT TO
-BDAT 329 LAST
-*data 329
-250 OK mail
-250 OK rcpt
-500 oops bdat
-QUIT
-225 OK
-****
-sudo exim -odf -bS
-EHLO test
-MAIL FROM:<sender@source.dom>
-RCPT TO:<u@test.ex>
-DATA
-Subject: foo
-
-data
-.
-QUIT
-****
-#
-# server tmp-rejects BDAT cmd
-server PORT_S
-220 Greetings
-EHLO
-250-Hello there
-250-PIPELINING
 250 CHUNKING
 MAIL FROM
+250 OK
 RCPT TO
-BDAT 329 LAST
-*data 329
-250 OK mail
-250 OK rcpt
-400 not right now bdat
+550 sorry, no
 QUIT
-225 OK
 ****
 sudo exim -odf -bS
 EHLO test
 MAIL FROM:<sender@source.dom>
-RCPT TO:<v@test.ex>
+RCPT TO:<ebad@test.ex>
 DATA
 Subject: foo