]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Relax a test for SSL errors in start_tls.
authorBen Darnell <ben@bendarnell.com>
Sun, 5 Jul 2015 03:09:12 +0000 (23:09 -0400)
committerBen Darnell <ben@bendarnell.com>
Sun, 5 Jul 2015 03:09:12 +0000 (23:09 -0400)
tornado/test/iostream_test.py

index 4df83e38a10117b1176212822e60d97e65756f1f..bc12c818967d12d06dbe1f33e26fdeda62da5dfc 100644 (file)
@@ -939,8 +939,10 @@ class TestIOStreamStartTLS(AsyncTestCase):
             server_hostname=b'127.0.0.1')
         with ExpectLog(gen_log, "SSL Error"):
             with self.assertRaises(ssl.SSLError):
+                # The client fails to connect with an SSL error.
                 yield client_future
-        with self.assertRaises(ssl.SSLError):
+        with self.assertRaises(Exception):
+            # The server fails to connect, but the exact error is unspecified.
             yield server_future