Testsuite: Fix more end-of-input markers (****)

[exim.git] / test / scripts / 5400-cutthrough / 5403

diff --git a/test/scripts/5400-cutthrough/5403 b/test/scripts/5400-cutthrough/5403
index dbe7ef3c54b47a1dd5f3f5e46656547aa5b3f421..ad1b44646c5f480d2377670176f04da1edc20795 100644 (file)
--- a/test/scripts/5400-cutthrough/5403
+++ b/test/scripts/5400-cutthrough/5403
@@ -1,30 +1,42 @@
-# cutthrough_delivery with MAIL SIZE=
+# cutthrough_delivery and -bhc

 need_ipv4
 munge loopback
 need_ipv4
 munge loopback

+no_msglog_check

 #
 #

-server PORT_S
-220 ESMTP
-EHLO
-250-OK
-250 SIZE 65536
-MAIL FROM:<fred@myhost.test.ex> SIZE=1123
-250 Sender OK
-RCPT TO:
-250 Recipient OK
+# Despite config for cutthrough should not make onward conn
+server -t -2 PORT_S
+****
+exim -bhc 1.2.3.4
+EHLO myhost.test.ex
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<plain@domain.com>

 DATA
 DATA

-354 Send data
+

 .
 .

-250 OK

 QUIT
 QUIT

+****
+#
+# Onward conn made for r-verify but cleared before DATA
+server PORT_S
+220 server ready
+EHLO
+250 OK
+MAIL

 250 OK
 250 OK

+RCPT
+250 OK
+QUIT
+220 OK
+*eof

 ****
 ****

-exim -bs
+exim -bhc 1.2.3.4

 EHLO myhost.test.ex
 EHLO myhost.test.ex

-MAIL FROM:<fred@myhost.test.ex> SIZE=99
-RCPT TO:<userx@domain.com>
+MAIL FROM:<sender@myhost.test.ex>
+RCPT TO:<verify@domain.com>

 DATA
 
 .
 QUIT
 ****
 DATA
 
 .
 QUIT
 ****

+#

 # End
 # End