Apply timeout consistently to all malware scanner types

[users/jgh/exim.git] / test / scripts / 2100-OpenSSL / 2150

diff --git a/test/scripts/2100-OpenSSL/2150 b/test/scripts/2100-OpenSSL/2150
index cfc6a20d75b3b7f657c4625eefcb07ef65a85a83..9ee9eb13f4b76c1faf5148d9869b0bd48f8b3267 100644 (file)
--- a/test/scripts/2100-OpenSSL/2150
+++ b/test/scripts/2100-OpenSSL/2150
@@ -4,39 +4,13 @@ exim -DSERVER=server -bd -oX PORT_D
 # The pause (+++ 1) at the end of this is so that we don't close the input
 # until some time after sending the dot.
 #
 # The pause (+++ 1) at the end of this is so that we don't close the input
 # until some time after sending the dot.
 #

-client-gnutls 127.0.0.1 PORT_D
+client-ssl 127.0.0.1 PORT_D

 ??? 220
 ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 220
 ehlo abcd
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

-??? 250
-starttls
-??? 220
-mail from:<userx@test.ex>
-??? 250
-rcpt to:<userx@test.ex>
-??? 250
-data
-??? 354
-This is a test message.
-.
-+++ 1
-****
-sleep 1
-killdaemon
-#
-# Also check for next input sent too soon
-#
-exim -DSERVER=server -bd -oX PORT_D
-****
-client-gnutls 127.0.0.1 PORT_D
-??? 220
-ehlo abcd
-??? 250-
-??? 250-
-??? 250-

 ??? 250-
 ??? 250
 starttls
 ??? 250-
 ??? 250
 starttls


@@ -48,7 +22,7 @@ rcpt to:<userx@test.ex>
 data
 ??? 354
 This is a test message.
 data
 ??? 354
 This is a test message.

-.\r\nrset
+.

 +++ 1
 ****
 sleep 1
 +++ 1
 ****
 sleep 1