commit c4df7845143f9afe0d20f4421a41904f3cbb991a
author Antoine Pitrou <solipsis@pitrou.net> Fri Dec 03 19:59:41 2010 +0000
committer Antoine Pitrou <solipsis@pitrou.net> Fri Dec 03 19:59:41 2010 +0000
tree f41b148eba51ce36c7d45aaa15625cc41d1786b9
parent 500be24a64ff188b8cfcc1ad75d9b556bbf6ce86

Issue #10272: The ssl module now raises socket.timeout instead of a generic
SSLError on socket timeouts.

Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index c9f03c7..e5a07a3 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1499,7 +1499,7 @@
                     c.settimeout(0.2)
                     c.connect((host, port))
                     # Will attempt handshake and time out
-                    self.assertRaisesRegex(ssl.SSLError, "timed out",
+                    self.assertRaisesRegex(socket.timeout, "timed out",
                                            ssl.wrap_socket, c)
                 finally:
                     c.close()
@@ -1508,7 +1508,7 @@
                     c = ssl.wrap_socket(c)
                     c.settimeout(0.2)
                     # Will attempt handshake and time out
-                    self.assertRaisesRegex(ssl.SSLError, "timed out",
+                    self.assertRaisesRegex(socket.timeout, "timed out",
                                            c.connect, (host, port))
                 finally:
                     c.close()