changeset:   85450:498957c97c2b
branch:      3.3
parent:      85412:694e50a79638
user:        Charles-François Natali <cf.natali@gmail.com>
date:        Thu Aug 29 19:01:40 2013 +0200
files:       Lib/test/support/__init__.py Lib/test/test_socket.py
description:
Issue #18643: Fix some test_socket failures due to large default socket buffer
sizes.


diff -r 694e50a79638 -r 498957c97c2b Lib/test/support/__init__.py
--- a/Lib/test/support/__init__.py	Mon Aug 26 14:00:39 2013 +0300
+++ b/Lib/test/support/__init__.py	Thu Aug 29 19:01:40 2013 +0200
@@ -601,8 +601,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 -r 694e50a79638 -r 498957c97c2b Lib/test/test_socket.py
--- a/Lib/test/test_socket.py	Mon Aug 26 14:00:39 2013 +0300
+++ b/Lib/test/test_socket.py	Thu Aug 29 19:01:40 2013 +0200
@@ -1210,11 +1210,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)
@@ -4047,7 +4048,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)