Merge branch '4.next'

[users/jgh/exim.git] / test / scripts / 5400-cutthrough / 5402

diff --git a/test/scripts/5400-cutthrough/5402 b/test/scripts/5400-cutthrough/5402
index 3e6f3189ee6594958f00716d2e1d1296878a8a6e..1113c6d32836d8980426ecccb5a40c23016eb31e 100644 (file)
--- a/test/scripts/5400-cutthrough/5402
+++ b/test/scripts/5400-cutthrough/5402
@@ -1,42 +1,49 @@
-# cutthrough_delivery and -bhc
+# cutthrough_delivery vs. recipient-verify cache entry
 need_ipv4
-munge loopback
-no_msglog_check
 #
-# Despite config for cutthrough should not make onward conn
-server -t -2 PORT_S
+# Set up callout cache
+#
+server PORT_S
+220 ESMTP
+EHLO
+250 OK
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+250 Recipient OK
+QUIT
+250 OK
 ****
-exim -bhc 1.2.3.4
+exim -bs -odf
 EHLO myhost.test.ex
 MAIL FROM:<CALLER@myhost.test.ex>
-RCPT TO:<plain@domain.com>
-DATA
-
-.
+RCPT TO:<dest@domain.com>
 QUIT
 ****
 #
-# Onward conn made for r-verify but cleared before DATA
+# Send message with cutthrough
+#
 server PORT_S
-220 server ready
+220 ESMTP
 EHLO
 250 OK
-MAIL
-250 OK
-RCPT
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+250 Recipient OK
+DATA
+354 Send data
+.
 250 OK
 QUIT
-220 OK
-*eof
+250 OK
 ****
-exim -bhc 1.2.3.4
+exim -DOPT=CUTTHROUGH -bs -odf
 EHLO myhost.test.ex
 MAIL FROM:<CALLER@myhost.test.ex>
-RCPT TO:<verify@domain.com>
+RCPT TO:<dest@domain.com>
 DATA
 
 .
 QUIT
 ****
-#
-# End