]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Add a timeout to test_sslv2_fail so it passes on cygwin.
authorBen Darnell <ben@bendarnell.com>
Mon, 23 Jan 2012 02:15:01 +0000 (18:15 -0800)
committerBen Darnell <ben@bendarnell.com>
Mon, 23 Jan 2012 02:15:01 +0000 (18:15 -0800)
tornado/test/httpserver_test.py

index 9a5c201ee54c37a200e43baa6b0cc1de0a09606e..1a53a34fd6103bbe5ac8094ec262bda5b5c34844 100644 (file)
@@ -113,7 +113,12 @@ if hasattr(ssl, 'PROTOCOL_SSLv2'):
             # we've got all the other ssl version tests here.
             # Clients should have SSLv2 disabled by default.
             try:
-                response = self.fetch('/')
+                # The server simply closes the connection when it gets
+                # an SSLv2 ClientHello packet.
+                # request_timeout is needed here because on some platforms
+                # (cygwin, but not native windows python), the close is not
+                # detected promptly.
+                response = self.fetch('/', request_timeout=1)
             except ssl.SSLError:
                 # In some python/ssl builds the PROTOCOL_SSLv2 constant
                 # exists but SSLv2 support is still compiled out, which