mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-17 17:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Surrounded with try/finally to socket's default timeout setting

Browse source 
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).
This commit is contained in:
Facundo Batista 2007-03-23 20:23:08 +00:00
parent e6a7039451
commit 14553b08a1
2 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/test/test_httplib.py
View file

@ -176,17 +176,19 @@ class TimeoutTest(TestCase):
self.assertTrue(httpConn.sock.gettimeout() is None) self.assertTrue(httpConn.sock.gettimeout() is None)
# a value # a value
httpConn = httplib.HTTPConnection(HOST, PORT, timeout=10) httpConn = httplib.HTTPConnection(HOST, PORT, timeout=30)
httpConn.connect() httpConn.connect()
self.assertEqual(httpConn.sock.gettimeout(), 10) self.assertEqual(httpConn.sock.gettimeout(), 30)
# None, having other default # None, having other default
previous = socket.getdefaulttimeout() previous = socket.getdefaulttimeout()
socket.setdefaulttimeout(10) socket.setdefaulttimeout(30)
httpConn = httplib.HTTPConnection(HOST, PORT, timeout=None) try:
httpConn.connect() httpConn = httplib.HTTPConnection(HOST, PORT, timeout=None)
socket.setdefaulttimeout(previous) httpConn.connect()
self.assertEqual(httpConn.sock.gettimeout(), 10) finally:
socket.setdefaulttimeout(previous)
self.assertEqual(httpConn.sock.gettimeout(), 30)
def test_main(verbose=None): def test_main(verbose=None):

20
Lib/test/test_socket.py
View file

@ -844,22 +844,24 @@ class NetworkConnectionAttributesTest(unittest.TestCase):
self.assertTrue(sock.gettimeout() is None) self.assertTrue(sock.gettimeout() is None)
# a value, named # a value, named
sock = socket.create_connection((HOST, PORT), timeout=10) sock = socket.create_connection((HOST, PORT), timeout=30)
self.assertEqual(sock.gettimeout(), 10) self.assertEqual(sock.gettimeout(), 30)
# a value, just the value # a value, just the value
sock = socket.create_connection((HOST, PORT), 10) sock = socket.create_connection((HOST, PORT), 30)
self.assertEqual(sock.gettimeout(), 10) self.assertEqual(sock.gettimeout(), 30)
# None, having other default # None, having other default
previous = socket.getdefaulttimeout() previous = socket.getdefaulttimeout()
socket.setdefaulttimeout(10) socket.setdefaulttimeout(30)
sock = socket.create_connection((HOST, PORT), timeout=None) try:
socket.setdefaulttimeout(previous) sock = socket.create_connection((HOST, PORT), timeout=None)
self.assertEqual(sock.gettimeout(), 10) finally:
socket.setdefaulttimeout(previous)
self.assertEqual(sock.gettimeout(), 30)
def testFamily(self): def testFamily(self):
sock = socket.create_connection((HOST, PORT), timeout=10) sock = socket.create_connection((HOST, PORT), timeout=30)
self.assertEqual(sock.family, 2) self.assertEqual(sock.family, 2)