[Python-checkins] r85931 - python/branches/py3k/Lib/test/test_timeout.py

Fri Oct 29 20:15:34 CEST 2010

Author: antoine.pitrou
Date: Fri Oct 29 20:15:33 2010
New Revision: 85931
Log:
Issue #7547: fix transient failures due to network glitches in test_timeout.
Patch by Sandro Tosi.
Modified:
 python/branches/py3k/Lib/test/test_timeout.py
Modified: python/branches/py3k/Lib/test/test_timeout.py
==============================================================================

--- python/branches/py3k/Lib/test/test_timeout.py	(original)
+++ python/branches/py3k/Lib/test/test_timeout.py	Fri Oct 29 20:15:33 2010
@@ -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()
 
- _delta = abs(_t1 - _t2)
- self.assertTrue(_delta < _timeout + self.fuzz,
- "timeout (%g) is %g seconds more than expected (%g)"
- %(_delta, self.fuzz, _timeout))
+ with support.transient_internet(self.addr_remote[0]):
+ self.sock.connect(self.addr_remote)
+ self.sock.settimeout(_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
