Merged revisions 85931 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85931 | antoine.pitrou | 2010-10-29 20:15:33 +0200 (ven., 29 oct. 2010) | 5 lines
Issue #7547: fix transient failures due to network glitches in test_timeout.
Patch by Sandro Tosi.
........
diff --git a/Lib/test/test_timeout.py b/Lib/test/test_timeout.py
index 5f19af2..4bc125e 100644
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -130,17 +130,19 @@
def testRecvTimeout(self):
# Test recv() timeout
_timeout = 0.02
- self.sock.connect(self.addr_remote)
- self.sock.settimeout(_timeout)
- _t1 = time.time()
- self.assertRaises(socket.error, self.sock.recv, 1024)
- _t2 = time.time()
+ with test_support.transient_internet(self.addr_remote[0]):
+ self.sock.connect(self.addr_remote)
+ self.sock.settimeout(_timeout)
- _delta = abs(_t1 - _t2)
- self.assertTrue(_delta < _timeout + self.fuzz,
- "timeout (%g) is %g seconds more than expected (%g)"
- %(_delta, self.fuzz, _timeout))
+ _t1 = time.time()
+ self.assertRaises(socket.timeout, self.sock.recv, 1024)
+ _t2 = time.time()
+
+ _delta = abs(_t1 - _t2)
+ self.assertTrue(_delta < _timeout + self.fuzz,
+ "timeout (%g) is %g seconds more than expected (%g)"
+ %(_delta, self.fuzz, _timeout))
def testAcceptTimeout(self):
# Test accept() timeout