GnuTLS: fix hanging callout connections

[users/jgh/exim.git] / test / scripts / 2000-GnuTLS / 2015

diff --git a/test/scripts/2000-GnuTLS/2015 b/test/scripts/2000-GnuTLS/2015
index 140af797f6a1c6a64c85f66fc22b36b3fa8c26c0..07fda35b3da13d44063ef4c2ccab19e08c0f6fd4 100644 (file)
--- a/test/scripts/2000-GnuTLS/2015
+++ b/test/scripts/2000-GnuTLS/2015
@@ -1,10 +1,10 @@
-# TLS server: timeout after accepting STARTTLS
+# TLS server: timeout or close after accepting STARTTLS

 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
 client-gnutls 127.0.0.1 PORT_D
 ??? 220
 gnutls
 exim -DSERVER=server -bd -oX PORT_D
 ****
 client-gnutls 127.0.0.1 PORT_D
 ??? 220

-ehlo rhu.barb
+ehlo timeout.rhu.barb

 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-


@@ -16,4 +16,17 @@ starttls_wait
 +++ 2
 ??? 421
 ****
 +++ 2
 ??? 421
 ****

+client-gnutls 127.0.0.1 PORT_D
+??? 220
+ehlo close.rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls_wait
+??? 220
+****
+millisleep 500

 killdaemon
 killdaemon