[Python-checkins] r54555 - python/trunk/Lib/test/test_httplib.py python/trunk/Lib/test/test_socket.py
facundo.batista
python-checkins at python.org
Fri Mar 23 21:23:15 CET 2007
Author: facundo.batista
Date: Fri Mar 23 21:23:08 2007
New Revision: 54555
Modified:
python/trunk/Lib/test/test_httplib.py
python/trunk/Lib/test/test_socket.py
Log:
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).
Modified: python/trunk/Lib/test/test_httplib.py
==============================================================================
--- python/trunk/Lib/test/test_httplib.py (original)
+++ python/trunk/Lib/test/test_httplib.py Fri Mar 23 21:23:08 2007
@@ -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):
Modified: python/trunk/Lib/test/test_socket.py
==============================================================================
--- python/trunk/Lib/test/test_socket.py (original)
+++ python/trunk/Lib/test/test_socket.py Fri Mar 23 21:23:08 2007
@@ -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)
More information about the Python-checkins
mailing list