From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 17 Jan 2015 22:38:35 +0000 (-0500)
Subject: Allow SSLError or socket.error in this test.
X-Git-Tag: v4.1.0b1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be31c92e485677401f0e6cc6f99fe6c34c81bfa8;p=thirdparty%2Ftornado.git

Allow SSLError or socket.error in this test.
---

diff --git a/tornado/test/iostream_test.py b/tornado/test/iostream_test.py
index 973b0e7bf..f8f30b498 100644
--- a/tornado/test/iostream_test.py
+++ b/tornado/test/iostream_test.py
@@ -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