From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 8 Sep 2010 00:02:50 +0000 (-0700)
Subject: Disable SSL test on versions of libcurl with blocking SSL handshakes.
X-Git-Tag: v1.1.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afb82f686850116e4d3b360222c73e43a7e06ea5;p=thirdparty%2Ftornado.git

Disable SSL test on versions of libcurl with blocking SSL handshakes.
(using gnutls instead of openssl and libcurl < 7.21.0).
---

diff --git a/tornado/test/httpserver_test.py b/tornado/test/httpserver_test.py
index c3b5f4592..3d6de203f 100644
--- a/tornado/test/httpserver_test.py
+++ b/tornado/test/httpserver_test.py
@@ -39,6 +39,13 @@ class SSLTest(AsyncHTTPTestCase, LogTrapTestCase):
         response = self.wait()
         self.assertEqual(response.body, "Hello world")
 
-if ssl is None:
-    # Don't try to run ssl tests if we don't have the ssl module
+if (ssl is None or
+    (pycurl.version_info()[5].startswith('GnuTLS') and
+     pycurl.version_info()[2] < 0x71400)):
+    # Don't try to run ssl tests if we don't have the ssl module (python 2.5).
+    # Additionally, when libcurl (< 7.21.0) is compiled against gnutls
+    # instead of openssl (which is the default on at least some versions of
+    # ubuntu), libcurl does the ssl handshake in blocking mode.  That will
+    # cause this test to deadlock as the blocking network ops happen in
+    # the same IOLoop as the server.
     del SSLTest