]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Allow SSLError or socket.error in this test.
authorBen Darnell <ben@bendarnell.com>
Sat, 17 Jan 2015 22:38:35 +0000 (17:38 -0500)
committerBen Darnell <ben@bendarnell.com>
Sat, 17 Jan 2015 22:38:35 +0000 (17:38 -0500)
tornado/test/iostream_test.py

index 973b0e7bfa465ff611c6b9b9f53387fc4d046aab..f8f30b498855521c02f73cf4729212c0413f955f 100644 (file)
@@ -881,7 +881,7 @@ class TestIOStreamStartTLS(AsyncTestCase):
         with ExpectLog(gen_log, "SSL Error"):
             with self.assertRaises(ssl.SSLError):
                 yield client_future
-        with self.assertRaises(ssl.SSLError):
+        with self.assertRaises((ssl.SSLError, socket.error)):
             yield server_future
 
 
@@ -899,7 +899,7 @@ class TestIOStreamStartTLS(AsyncTestCase):
         with ExpectLog(gen_log, "SSL Error"):
             with self.assertRaises(ssl.SSLError):
                 yield client_future
-        with self.assertRaises(ssl.SSLError):
+        with self.assertRaises((ssl.SSLError, socket.error)):
             yield server_future