From 463baf434793ca48cc892bcdcb7d3d8c6e8d887a Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Sun, 22 Jan 2012 18:15:01 -0800 Subject: [PATCH] Add a timeout to test_sslv2_fail so it passes on cygwin. --- tornado/test/httpserver_test.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py index 9a5c201e..1a53a34f 100644 --- a/tornado/test/httpserver_test.py +++ b/tornado/test/httpserver_test.py @@ -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