Skip to content

Commit

Permalink
Allow SSLError or socket.error in this test.
Browse files Browse the repository at this point in the history
  • Loading branch information
bdarnell committed Jan 17, 2015
1 parent 929dd80 commit be31c92
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tornado/test/iostream_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ def test_handshake_fail(self):
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


Expand All @@ -899,7 +899,7 @@ def test_check_hostname(self):
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


Expand Down

0 comments on commit be31c92

Please sign in to comment.