From b233b7d7b59220791e9ecb4d3469225c7646ccca Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Sat, 14 Aug 2010 17:28:36 +0000 Subject: [PATCH] Merged revisions 84021-84023 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r84021 | antoine.pitrou | 2010-08-14 18:24:38 +0200 (sam., 14 août 2010) | 4 lines Add a reasonable timeout to network SSL tests, so as to avoid buildbot timeouts when the remote server doesn't answer. ........ r84022 | antoine.pitrou | 2010-08-14 18:32:10 +0200 (sam., 14 août 2010) | 4 lines This is a better resolution than r84021 (because it will also affect ssl.get_server_certificate()). ........ r84023 | antoine.pitrou | 2010-08-14 18:33:38 +0200 (sam., 14 août 2010) | 3 lines There doesn't seem to be a reason for this test to be disabled. ........ --- Lib/test/test_ssl.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index a7bcf9434c7..c32ee04b381 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -181,6 +181,12 @@ class BasicSocketTests(unittest.TestCase): class NetworkedTests(unittest.TestCase): + def setUp(self): + self.old_timeout = socket.getdefaulttimeout() + socket.setdefaulttimeout(30) + + def tearDown(self): + socket.setdefaulttimeout(self.old_timeout) def test_connect(self): s = ssl.wrap_socket(socket.socket(socket.AF_INET),