summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-04-08 23:18:07 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-04-08 23:18:07 (GMT)
commit0ec2c075a2e9c82a09962c3781ba825749ed43ab (patch)
treec6069fc00ab9c6cec88884c4eee46db2d8da14c1
parentc9e8e3c4dd2cfb3506e9b4b3b87d27727fca4b5d (diff)
parentf18d6f3f443bdfe3f349b2f49231a3c08a5b2d3f (diff)
downloadcpython-0ec2c075a2e9c82a09962c3781ba825749ed43ab.zip
cpython-0ec2c075a2e9c82a09962c3781ba825749ed43ab.tar.gz
cpython-0ec2c075a2e9c82a09962c3781ba825749ed43ab.tar.bz2
Fix flakiness in test_socketserver
-rw-r--r--Lib/test/test_socketserver.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 0e76c33..353f8ff 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -34,8 +34,11 @@ def signal_alarm(n):
if hasattr(signal, 'alarm'):
signal.alarm(n)
+# Remember real select() to avoid interferences with mocking
+_real_select = select.select
+
def receive(sock, n, timeout=20):
- r, w, x = select.select([sock], [], [], timeout)
+ r, w, x = _real_select([sock], [], [], timeout)
if sock in r:
return sock.recv(n)
else: