From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 9 Mar 2015 02:04:59 +0000 (-0400)
Subject: Remove a special case that avoided using curl in tests for HTTPS.
X-Git-Tag: v4.2.0b1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d4eaeb6f116a6913005ef36207c768b5c83d178;p=thirdparty%2Ftornado.git

Remove a special case that avoided using curl in tests for HTTPS.

This problem should have long since been fixed; any problematic
configurations don't deserve to misleadingly pass the tests.
---

diff --git a/tornado/testing.py b/tornado/testing.py
index 3d3bcf72b..93f0dbe14 100644
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -417,10 +417,8 @@ class AsyncHTTPSTestCase(AsyncHTTPTestCase):
     Interface is generally the same as `AsyncHTTPTestCase`.
     """
     def get_http_client(self):
-        # Some versions of libcurl have deadlock bugs with ssl,
-        # so always run these tests with SimpleAsyncHTTPClient.
-        return SimpleAsyncHTTPClient(io_loop=self.io_loop, force_instance=True,
-                                     defaults=dict(validate_cert=False))
+        return AsyncHTTPClient(io_loop=self.io_loop, force_instance=True,
+                               defaults=dict(validate_cert=False))
 
     def get_httpserver_options(self):
         return dict(ssl_options=self.get_ssl_options())