Surrounded with try/finally to socket's default timeout setting
changes in the tests, so failing one test won't produce strange
results in others. Also relaxed the timeout settings in the test
(where actually the value didn't mean anything).
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index a39a3eb..78aa651 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -176,17 +176,19 @@
self.assertTrue(httpConn.sock.gettimeout() is None)
# a value
- httpConn = httplib.HTTPConnection(HOST, PORT, timeout=10)
+ httpConn = httplib.HTTPConnection(HOST, PORT, timeout=30)
httpConn.connect()
- self.assertEqual(httpConn.sock.gettimeout(), 10)
+ self.assertEqual(httpConn.sock.gettimeout(), 30)
# None, having other default
previous = socket.getdefaulttimeout()
- socket.setdefaulttimeout(10)
- httpConn = httplib.HTTPConnection(HOST, PORT, timeout=None)
- httpConn.connect()
- socket.setdefaulttimeout(previous)
- self.assertEqual(httpConn.sock.gettimeout(), 10)
+ socket.setdefaulttimeout(30)
+ try:
+ httpConn = httplib.HTTPConnection(HOST, PORT, timeout=None)
+ httpConn.connect()
+ finally:
+ socket.setdefaulttimeout(previous)
+ self.assertEqual(httpConn.sock.gettimeout(), 30)
def test_main(verbose=None):
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index a7ebe04..ade524f 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -844,22 +844,24 @@
self.assertTrue(sock.gettimeout() is None)
# a value, named
- sock = socket.create_connection((HOST, PORT), timeout=10)
- self.assertEqual(sock.gettimeout(), 10)
+ sock = socket.create_connection((HOST, PORT), timeout=30)
+ self.assertEqual(sock.gettimeout(), 30)
# a value, just the value
- sock = socket.create_connection((HOST, PORT), 10)
- self.assertEqual(sock.gettimeout(), 10)
+ sock = socket.create_connection((HOST, PORT), 30)
+ self.assertEqual(sock.gettimeout(), 30)
# None, having other default
previous = socket.getdefaulttimeout()
- socket.setdefaulttimeout(10)
- sock = socket.create_connection((HOST, PORT), timeout=None)
- socket.setdefaulttimeout(previous)
- self.assertEqual(sock.gettimeout(), 10)
+ socket.setdefaulttimeout(30)
+ try:
+ sock = socket.create_connection((HOST, PORT), timeout=None)
+ finally:
+ socket.setdefaulttimeout(previous)
+ self.assertEqual(sock.gettimeout(), 30)
def testFamily(self):
- sock = socket.create_connection((HOST, PORT), timeout=10)
+ sock = socket.create_connection((HOST, PORT), timeout=30)
self.assertEqual(sock.family, 2)