[Python-checkins] cpython (merge 3.3 -> default): Issue #18643: Fix some test_socket failures due to large default socket buffer
charles-francois.natali
python-checkins at python.org
Thu Aug 29 19:27:38 CEST 2013
http://hg.python.org/cpython/rev/9b27cf72c79b
changeset: 85451:9b27cf72c79b
parent: 85417:df2fdd42b375
parent: 85450:498957c97c2b
user: Charles-François Natali <cf.natali at gmail.com>
date: Thu Aug 29 19:02:23 2013 +0200
summary:
Issue #18643: Fix some test_socket failures due to large default socket buffer
sizes.
files:
Lib/test/support/__init__.py | 8 +++++++-
Lib/test/test_socket.py | 7 ++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -602,8 +602,14 @@
# Windows limit seems to be around 512 B, and many Unix kernels have a
# 64 KiB pipe buffer size or 16 * PAGE_SIZE: take a few megs to be sure.
# (see issue #17835 for a discussion of this number).
-PIPE_MAX_SIZE = 4 *1024 * 1024 + 1
+PIPE_MAX_SIZE = 4 * 1024 * 1024 + 1
+# A constant likely larger than the underlying OS socket buffer size, to make
+# writes blocking.
+# The socket buffer sizes can usually be tuned system-wide (e.g. through sysctl
+# on Linux), or on a per-socket basis (SO_SNDBUF/SO_RCVBUF). See issue #18643
+# for a discussion of this number).
+SOCK_MAX_SIZE = 16 * 1024 * 1024 + 1
# decorator for skipping tests on non-IEEE 754 platforms
requires_IEEE_754 = unittest.skipUnless(
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1245,11 +1245,12 @@
c.settimeout(1.5)
with self.assertRaises(ZeroDivisionError):
signal.alarm(1)
- c.sendall(b"x" * (1024**2))
+ c.sendall(b"x" * support.SOCK_MAX_SIZE)
if with_timeout:
signal.signal(signal.SIGALRM, ok_handler)
signal.alarm(1)
- self.assertRaises(socket.timeout, c.sendall, b"x" * (1024**2))
+ self.assertRaises(socket.timeout, c.sendall,
+ b"x" * support.SOCK_MAX_SIZE)
finally:
signal.alarm(0)
signal.signal(signal.SIGALRM, old_alarm)
@@ -4136,7 +4137,7 @@
self.serv_skipped = None
self.serv_conn.setblocking(False)
# Try to saturate the socket buffer pipe with repeated large writes.
- BIG = b"x" * (1024 ** 2)
+ BIG = b"x" * support.SOCK_MAX_SIZE
LIMIT = 10
# The first write() succeeds since a chunk of data can be buffered
n = self.write_file.write(BIG)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list