Fix docs and relax a test.

diff --git a/tornado/httpclient.py b/tornado/httpclient.py
index 87d1adac4e07e8c595227b40688294b4b13e71b3..abb81cf0a533c0c3f133b8031d53a6725f335f4e 100644 (file)
--- a/tornado/httpclient.py
+++ b/tornado/httpclient.py
@@ -385,7 +385,7 @@ class HTTPRequest(object):
            note below when used with ``curl_httpclient``.
         :arg string client_cert: Filename for client SSL certificate, if any.
            See note below when used with ``curl_httpclient``.
-        :arg SSLContext ssl_options: `ssl.SSLContext` object for use in
+        :arg ssl.SSLContext ssl_options: `ssl.SSLContext` object for use in
            ``simple_httpclient`` (unsupported by ``curl_httpclient``).
            Overrides ``validate_cert``, ``ca_certs``, ``client_key``,
            and ``client_cert``.
@@ -413,7 +413,7 @@ class HTTPRequest(object):
         .. versionadded:: 4.0
            The ``body_producer`` and ``expect_100_continue`` arguments.
 
-        .. verisonadded:: 4.2
+        .. versionadded:: 4.2
            The ``ssl_options`` argument.
         """
         # Note that some of these attributes go through property setters

diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py
index f6f518c57fe3fdbe373a1b8b447666b65c8077a1..be3c2d940614b71ef48ea00727c864e497cf171a 100644 (file)
--- a/tornado/test/simple_httpclient_test.py
+++ b/tornado/test/simple_httpclient_test.py
@@ -445,7 +445,8 @@ class SimpleHTTPSClientTestCase(SimpleHTTPClientTestMixin, AsyncHTTPSTestCase):
         self.assertEqual(resp.body, b"Hello world!")
 
     def test_ssl_options_handshake_fail(self):
-        with ExpectLog(gen_log, "SSL Error|Uncaught exception"):
+        with ExpectLog(gen_log, "SSL Error|Uncaught exception",
+                       required=False):
             resp = self.fetch(
                 "/hello", ssl_options=dict(cert_reqs=ssl.CERT_REQUIRED))
             # On python 2.6, the server logs an exception a little after