From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 29 Oct 2010 18:16:31 +0000 (+0000)
Subject: Merged revisions 85931 via svnmerge from
X-Git-Tag: v3.1.3rc1~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0e34bbb646ffa16d796230e7bee4a6c29c3e201;p=thirdparty%2FPython%2Fcpython.git

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 b67cbc92f213..bbcdc25672ac 100644
--- a/Lib/test/test_timeout.py
+++ b/Lib/test/test_timeout.py
@@ -130,17 +130,19 @@ class TimeoutTestCase(unittest.TestCase):
     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 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