From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 5 Jul 2015 03:09:12 +0000 (-0400)
Subject: Relax a test for SSL errors in start_tls.
X-Git-Tag: v4.3.0b1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=023c67373c5d3f7efdd7c7a67198d3080d45d8c2;p=thirdparty%2Ftornado.git

Relax a test for SSL errors in start_tls.
---

diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
index 4df83e38a..bc12c8189 100644
--- a/tornado/test/iostream_test.py
+++ b/tornado/test/iostream_test.py
@@ -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