Fixup testsuite cases affected by dual-tls - mainly EHLO on callouts.

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

diff --git a/test/scripts/5400-cutthrough/5400 b/test/scripts/5400-cutthrough/5400
index 4aa332b86a52ecd5c17a42c81d7cd830595bd389..843e24b30828868b113c0fb329686843eb9c5e4c 100644 (file)
--- a/test/scripts/5400-cutthrough/5400
+++ b/test/scripts/5400-cutthrough/5400
@@ -3,7 +3,7 @@ need_ipv4
 #
 server PORT_S
 220 ESMTP
 #
 server PORT_S
 220 ESMTP

-HELO
+EHLO

 250 OK
 MAIL FROM:
 250 Sender OK
 250 OK
 MAIL FROM:
 250 Sender OK


@@ -28,7 +28,7 @@ QUIT
 # cutthrough cancelled by multiple recipients
 server PORT_S 2
 220 ESMTP
 # cutthrough cancelled by multiple recipients
 server PORT_S 2
 220 ESMTP

-HELO
+EHLO

 250 OK
 MAIL FROM:
 250 Sender OK
 250 OK
 MAIL FROM:
 250 Sender OK


@@ -55,8 +55,8 @@ QUIT
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
 MAIL FROM:<eximtest@myhost.test.ex>
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
 MAIL FROM:<eximtest@myhost.test.ex>

-RCPT TO:<userx@domain.com>

 RCPT TO:<usery@domain.com>
 RCPT TO:<usery@domain.com>

+RCPT TO:<userz@domain.com>

 DATA
 
 .
 DATA
 
 .