]> granicus.if.org Git - python/commitdiff
Issue #21566: Make use of socket.listen() default backlog.
authorCharles-François Natali <cf.natali@gmail.com>
Wed, 23 Jul 2014 18:28:13 +0000 (19:28 +0100)
committerCharles-François Natali <cf.natali@gmail.com>
Wed, 23 Jul 2014 18:28:13 +0000 (19:28 +0100)
18 files changed:
Lib/multiprocessing/forkserver.py
Lib/test/_test_multiprocessing.py
Lib/test/test_asynchat.py
Lib/test/test_asyncio/test_events.py
Lib/test/test_asyncore.py
Lib/test/test_epoll.py
Lib/test/test_ftplib.py
Lib/test/test_httplib.py
Lib/test/test_kqueue.py
Lib/test/test_poplib.py
Lib/test/test_selectors.py
Lib/test/test_smtplib.py
Lib/test/test_socket.py
Lib/test/test_ssl.py
Lib/test/test_support.py
Lib/test/test_telnetlib.py
Lib/test/test_timeout.py
Lib/test/test_urllib.py

index 387517ebdca8e1a08f3363ec0498826ec5c19013..5c0a1bd2d486c43608f3cc0f5e5f0b5284d03b2e 100644 (file)
@@ -107,7 +107,7 @@ class ForkServer(object):
                 address = connection.arbitrary_address('AF_UNIX')
                 listener.bind(address)
                 os.chmod(address, 0o600)
-                listener.listen(100)
+                listener.listen()
 
                 # all client processes own the write end of the "alive" pipe;
                 # when they all terminate the read end becomes ready.
index 44d6c71e408d06b83264b6fcd30c5f828397f793..78208c30499c0094938b0a4afb7b7548953b7f07 100644 (file)
@@ -2543,7 +2543,7 @@ class _TestPicklingConnections(BaseTestCase):
 
         l = socket.socket()
         l.bind((test.support.HOST, 0))
-        l.listen(1)
+        l.listen()
         conn.send(l.getsockname())
         new_conn, addr = l.accept()
         conn.send(new_conn)
@@ -3190,7 +3190,7 @@ class TestWait(unittest.TestCase):
         from multiprocessing.connection import wait
         l = socket.socket()
         l.bind((test.support.HOST, 0))
-        l.listen(4)
+        l.listen()
         addr = l.getsockname()
         readers = []
         procs = []
index fd64adc460d9909c23395494f4b7b2b2af9480f4..b74b944bbbcc72b889097788788cc34811024e2a 100644 (file)
@@ -37,7 +37,7 @@ if threading:
             self.start_resend_event = None
 
         def run(self):
-            self.sock.listen(1)
+            self.sock.listen()
             self.event.set()
             conn, client = self.sock.accept()
             self.buffer = b""
index b0657495ad4e6793e276972f979f5c6d49736fdf..cce646741f934a239d070ac92f8dc48e5a02a5df 100644 (file)
@@ -428,7 +428,7 @@ class EventLoopTestsMixin:
         listener = socket.socket()
         listener.setblocking(False)
         listener.bind(('127.0.0.1', 0))
-        listener.listen(1)
+        listener.listen()
         client = socket.socket()
         client.connect(listener.getsockname())
 
index b4f474f014ddbc6fd9f868aac6e2fa0681435533..8882b806fa73e058b6d2d3bd48507a9862b1a424 100644 (file)
@@ -64,7 +64,7 @@ class crashingdummy:
 # used when testing senders; just collects what it gets until newline is sent
 def capture_server(evt, buf, serv):
     try:
-        serv.listen(5)
+        serv.listen()
         conn, addr = serv.accept()
     except socket.timeout:
         pass
index b37f033bf8f3042b0d7bda5b3045d4d8a97da728..d72740376fde2c38b58ed690122cc3407bfbda6a 100644 (file)
@@ -44,7 +44,7 @@ class TestEPoll(unittest.TestCase):
     def setUp(self):
         self.serverSocket = socket.socket()
         self.serverSocket.bind(('127.0.0.1', 0))
-        self.serverSocket.listen(1)
+        self.serverSocket.listen()
         self.connections = [self.serverSocket]
 
     def tearDown(self):
index a9bf30b3d5da9e1f712fb4189058d2ecc87236c1..e043828e30c83de81d7093fbf87cda10769643a1 100644 (file)
@@ -137,7 +137,7 @@ class DummyFTPHandler(asynchat.async_chat):
     def cmd_pasv(self, arg):
         with socket.socket() as sock:
             sock.bind((self.socket.getsockname()[0], 0))
-            sock.listen(5)
+            sock.listen()
             sock.settimeout(TIMEOUT)
             ip, port = sock.getsockname()[:2]
             ip = ip.replace('.', ','); p1 = port / 256; p2 = port % 256
@@ -155,7 +155,7 @@ class DummyFTPHandler(asynchat.async_chat):
     def cmd_epsv(self, arg):
         with socket.socket(socket.AF_INET6) as sock:
             sock.bind((self.socket.getsockname()[0], 0))
-            sock.listen(5)
+            sock.listen()
             sock.settimeout(TIMEOUT)
             port = sock.getsockname()[1]
             self.push('229 entering extended passive mode (|||%d|)' %port)
@@ -983,7 +983,7 @@ class TestTimeouts(TestCase):
         #  1) when the connection is ready to be accepted.
         #  2) when it is safe for the caller to close the connection
         #  3) when we have closed the socket
-        self.sock.listen(5)
+        self.sock.listen()
         # (1) Signal the caller that we are ready to accept the connection.
         self.evt.set()
         try:
index 1a6d8d04d3bbba616bcd41f13592e29a5cd07970..00c272c1f55af6552045b223cc6d2c0c450fbed8 100644 (file)
@@ -919,7 +919,7 @@ class SourceAddressTest(TestCase):
         self.serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.port = support.bind_port(self.serv)
         self.source_port = support.find_unused_port()
-        self.serv.listen(5)
+        self.serv.listen()
         self.conn = None
 
     def tearDown(self):
@@ -951,7 +951,7 @@ class TimeoutTest(TestCase):
     def setUp(self):
         self.serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         TimeoutTest.PORT = support.bind_port(self.serv)
-        self.serv.listen(5)
+        self.serv.listen()
 
     def tearDown(self):
         self.serv.close()
index bafdeba6ff1379009c9feda08ad4038675ba87c0..0810f21c62e246d5f57c4454bdc2c19822c67b41 100644 (file)
@@ -89,7 +89,7 @@ class TestKQueue(unittest.TestCase):
     def test_queue_event(self):
         serverSocket = socket.socket()
         serverSocket.bind(('127.0.0.1', 0))
-        serverSocket.listen(1)
+        serverSocket.listen()
         client = socket.socket()
         client.setblocking(False)
         try:
index d695a0db124ea6a8a26f1750d481ef63b37a9ab9..8ff6d7fc3d7de2298e99e34511ec5f2751deb4b0 100644 (file)
@@ -451,7 +451,7 @@ class TestTimeouts(TestCase):
         del self.thread  # Clear out any dangling Thread objects.
 
     def server(self, evt, serv):
-        serv.listen(5)
+        serv.listen()
         evt.set()
         try:
             conn, addr = serv.accept()
index a91fe78cdac8e359fcd212dfc74d8460d09f39f1..c2eba15a47bae6951e748798779c345a666b1a6b 100644 (file)
@@ -24,7 +24,7 @@ else:
     def socketpair(family=socket.AF_INET, type=socket.SOCK_STREAM, proto=0):
         with socket.socket(family, type, proto) as l:
             l.bind((support.HOST, 0))
-            l.listen(3)
+            l.listen()
             c = socket.socket(family, type, proto)
             try:
                 c.connect(l.getsockname())
index 784c4222524527df9550a237d11f150b2c48e91e..816ed83d2773721c9818b2ec0fe032049725c666 100644 (file)
@@ -31,7 +31,7 @@ if sys.platform == 'darwin':
 
 
 def server(evt, buf, serv):
-    serv.listen(5)
+    serv.listen()
     evt.set()
     try:
         conn, addr = serv.accept()
index 0712a4f31246c034e667685d96251d2f44aad16a..950d0dc32a0d71570827a006cb11907d94a03407 100644 (file)
@@ -72,7 +72,7 @@ class SocketTCPTest(unittest.TestCase):
     def setUp(self):
         self.serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.port = support.bind_port(self.serv)
-        self.serv.listen(1)
+        self.serv.listen()
 
     def tearDown(self):
         self.serv.close()
@@ -441,7 +441,7 @@ class SocketListeningTestMixin(SocketTestBase):
 
     def setUp(self):
         super().setUp()
-        self.serv.listen(1)
+        self.serv.listen()
 
 
 class ThreadedSocketTestMixin(ThreadSafeCleanupTestCase, SocketTestBase,
@@ -3784,7 +3784,7 @@ class NonBlockingTCPTests(ThreadedTCPSocketTest):
         self.serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM |
                                                   socket.SOCK_NONBLOCK)
         self.port = support.bind_port(self.serv)
-        self.serv.listen(1)
+        self.serv.listen()
         # actual testing
         start = time.time()
         try:
@@ -4559,7 +4559,7 @@ class TestLinuxAbstractNamespace(unittest.TestCase):
         address = b"\x00python-test-hello\x00\xff"
         with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s1:
             s1.bind(address)
-            s1.listen(1)
+            s1.listen()
             with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s2:
                 s2.connect(s1.getsockname())
                 with s1.accept()[0] as s3:
@@ -4791,7 +4791,7 @@ class TIPCThreadableTest(unittest.TestCase, ThreadableTest):
         srvaddr = (socket.TIPC_ADDR_NAMESEQ, TIPC_STYPE,
                 TIPC_LOWER, TIPC_UPPER)
         self.srv.bind(srvaddr)
-        self.srv.listen(5)
+        self.srv.listen()
         self.serverExplicitReady()
         self.conn, self.connaddr = self.srv.accept()
         self.addCleanup(self.conn.close)
index 80fb06203147b08bf1e4519da0412c7d31c9b901..01aa82ad90b7b4cfbc3eb456740eee16373f553e 100644 (file)
@@ -1211,7 +1211,7 @@ class SSLErrorTests(unittest.TestCase):
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
         with socket.socket() as s:
             s.bind(("127.0.0.1", 0))
-            s.listen(5)
+            s.listen()
             c = socket.socket()
             c.connect(s.getsockname())
             c.setblocking(False)
@@ -1736,7 +1736,7 @@ else:
 
         def run(self):
             self.sock.settimeout(0.05)
-            self.sock.listen(5)
+            self.sock.listen()
             self.active = True
             if self.flag:
                 # signal an event
@@ -2162,7 +2162,7 @@ else:
             # and sets Event `listener_gone` to let the main thread know
             # the socket is gone.
             def listener():
-                s.listen(5)
+                s.listen()
                 listener_ready.set()
                 newsock, addr = s.accept()
                 newsock.close()
@@ -2590,7 +2590,7 @@ else:
             finish = False
 
             def serve():
-                server.listen(5)
+                server.listen()
                 started.set()
                 conns = []
                 while not finish:
@@ -2647,7 +2647,7 @@ else:
             peer = None
             def serve():
                 nonlocal remote, peer
-                server.listen(5)
+                server.listen()
                 # Block on the accept and wait on the connection to close.
                 evt.set()
                 remote, peer = server.accept()
index 9bd0a01948e07b59ce26ad59a70fcecfda159627..212c9f3be773e0ec48aaaf4a1850485f8a0c9b51 100644 (file)
@@ -84,7 +84,7 @@ class TestSupport(unittest.TestCase):
     def test_bind_port(self):
         s = socket.socket()
         support.bind_port(s)
-        s.listen(1)
+        s.listen()
         s.close()
 
     # Tests for temp_dir()
index ee1c35705bb0210e4c6f107eda0820c45637e83d..e1ef99af3a2ac916b02f7f4753c217a1ec2519d1 100644 (file)
@@ -11,7 +11,7 @@ threading = support.import_module('threading')
 HOST = support.HOST
 
 def server(evt, serv):
-    serv.listen(5)
+    serv.listen()
     evt.set()
     try:
         conn, addr = serv.accept()
index 703c43ab2bc7b7c1741f6bb325397b6c5058e061..3c75dcc6f922cc12b4dd58989355f272273d1749 100644 (file)
@@ -243,14 +243,14 @@ class TCPTimeoutTestCase(TimeoutTestCase):
     def testAcceptTimeout(self):
         # Test accept() timeout
         support.bind_port(self.sock, self.localhost)
-        self.sock.listen(5)
+        self.sock.listen()
         self._sock_operation(1, 1.5, 'accept')
 
     def testSend(self):
         # Test send() timeout
         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as serv:
             support.bind_port(serv, self.localhost)
-            serv.listen(5)
+            serv.listen()
             self.sock.connect(serv.getsockname())
             # Send a lot of data in order to bypass buffering in the TCP stack.
             self._sock_operation(100, 1.5, 'send', b"X" * 200000)
@@ -259,7 +259,7 @@ class TCPTimeoutTestCase(TimeoutTestCase):
         # Test sendto() timeout
         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as serv:
             support.bind_port(serv, self.localhost)
-            serv.listen(5)
+            serv.listen()
             self.sock.connect(serv.getsockname())
             # The address argument is ignored since we already connected.
             self._sock_operation(100, 1.5, 'sendto', b"X" * 200000,
@@ -269,7 +269,7 @@ class TCPTimeoutTestCase(TimeoutTestCase):
         # Test sendall() timeout
         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as serv:
             support.bind_port(serv, self.localhost)
-            serv.listen(5)
+            serv.listen()
             self.sock.connect(serv.getsockname())
             # Send a lot of data in order to bypass buffering in the TCP stack.
             self._sock_operation(100, 1.5, 'sendall', b"X" * 200000)
index 1a5013ed2696a5b507169aed5bae3c1d89211ca7..ca029d33c7740559158845ac0595414a4baf3d73 100644 (file)
@@ -1333,7 +1333,7 @@ class URLopener_Tests(unittest.TestCase):
 #     serv.settimeout(3)
 #     serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 #     serv.bind(("", 9093))
-#     serv.listen(5)
+#     serv.listen()
 #     try:
 #         conn, addr = serv.accept()
 #         conn.send("1 Hola mundo\n")