mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-33353: test_asyncio set SO_SNDBUF after connect (GH-7086)

Browse source 
bpo-32622, bpo-33353: On macOS, sock.connect() changes the
SO_SNDBUF value. Only set SO_SNDBUF and SO_RCVBUF buffer sizes
once a socket is connected or binded, not before.
This commit is contained in:
Victor Stinner 2018-05-24 02:43:45 +02:00 • committed by GitHub
parent 2932755cc1
commit b97de3dd86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_asyncio/test_events.py
View file

@ -2142,11 +2142,15 @@ class SockSendfileMixin(SendfileBase):
async def wait_closed(self): async def wait_closed(self):
await self.fut await self.fut
def set_socket_opts(self, sock):
# On macOS, SO_SNDBUF is reset by connect(). So this method
# should be called after the socket is connected.
sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 1024)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 1024)
def make_socket(self, cleanup=True): def make_socket(self, cleanup=True):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.setblocking(False) sock.setblocking(False)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 1024)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 1024)
if cleanup: if cleanup:
self.addCleanup(sock.close) self.addCleanup(sock.close)
return sock return sock
@ -2159,7 +2163,9 @@ class SockSendfileMixin(SendfileBase):
srv_sock.bind((support.HOST, port)) srv_sock.bind((support.HOST, port))
server = self.run_loop(self.loop.create_server( server = self.run_loop(self.loop.create_server(
lambda: proto, sock=srv_sock)) lambda: proto, sock=srv_sock))
self.set_socket_opts(srv_sock)
self.run_loop(self.loop.sock_connect(sock, ('127.0.0.1', port))) self.run_loop(self.loop.sock_connect(sock, ('127.0.0.1', port)))
self.set_socket_opts(sock)
def cleanup(): def cleanup():
if proto.transport is not None: if proto.transport is not None:
@ -2264,9 +2270,9 @@ class SendfileMixin(SendfileBase):
else: else:
server_hostname = None server_hostname = None
cli_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) cli_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
cli_sock.connect((support.HOST, port))
# reduce send socket buffer size to test on relative small data sets # reduce send socket buffer size to test on relative small data sets
cli_sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 1024) cli_sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 1024)
cli_sock.connect((support.HOST, port))
cli_proto = self.MySendfileProto(loop=self.loop) cli_proto = self.MySendfileProto(loop=self.loop)
tr, pr = self.run_loop(self.loop.create_connection( tr, pr = self.run_loop(self.loop.create_connection(
lambda: cli_proto, sock=cli_sock, lambda: cli_proto, sock=cli_sock,