Skip to content

Commit 8f7c058

Browse files
committed
Simplify test
1 parent 01f92d3 commit 8f7c058

File tree

1 file changed

+11
-26
lines changed

1 file changed

+11
-26
lines changed

Lib/test/test_socket.py

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7072,43 +7072,28 @@ def close_fds(fds):
70727072
self.assertEqual(data, str(index).encode())
70737073

70747074
def testSendAndRecvFdsByAddress(self):
7075-
def close_pipes(pipes):
7076-
for fd1, fd2 in pipes:
7077-
os.close(fd1)
7078-
os.close(fd2)
7079-
7080-
def close_fds(fds):
7081-
for fd in fds:
7082-
os.close(fd)
7083-
7084-
# send 10 file descriptors
7085-
pipes = [os.pipe() for _ in range(10)]
7086-
self.addCleanup(close_pipes, pipes)
7087-
fds = [rfd for rfd, wfd in pipes]
7075+
rfd, wfd = os.pipe()
7076+
self.addCleanup(os.close, rfd)
7077+
self.addCleanup(os.close, wfd)
70887078

70897079
sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
70907080
address = socket_helper.create_unix_domain_name()
70917081
self.addCleanup(os_helper.unlink, address)
70927082
socket_helper.bind_unix_socket(sock, address)
70937083

7094-
socket.send_fds(sock, [MSG], fds, 0, address)
7084+
socket.send_fds(sock, [MSG], [rfd], 0, address)
70957085

70967086
# request more data and file descriptors than expected
7097-
msg, fds2, flags, addr = socket.recv_fds(sock, len(MSG) * 2, len(fds) * 2)
7098-
self.addCleanup(close_fds, fds2)
7099-
7087+
msg, (rfd2,), flags, addr = socket.recv_fds(sock, len(MSG) * 2, 2)
7088+
self.addCleanup(os.close, rfd2)
71007089
self.assertEqual(msg, MSG)
7101-
self.assertEqual(len(fds2), len(fds))
71027090
self.assertEqual(flags, 0)
7091+
self.assertEqual(addr, address)
71037092

7104-
# test that file descriptors are connected
7105-
for index, fds in enumerate(pipes):
7106-
rfd, wfd = fds
7107-
os.write(wfd, str(index).encode())
7108-
7109-
for index, rfd in enumerate(fds2):
7110-
data = os.read(rfd, 100)
7111-
self.assertEqual(data, str(index).encode())
7093+
# test that the file descriptor is connected
7094+
os.write(wfd, b'data')
7095+
data = os.read(rfd2, 100)
7096+
self.assertEqual(data, b'data')
71127097

71137098

71147099
def setUpModule():

0 commit comments

Comments
 (0)