Skip to content

Commit 838183b

Browse files
committed
Address review: use context managers and assert transferred bytes
1 parent df46bde commit 838183b

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

Lib/test/test_socket.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7521,9 +7521,9 @@ def __buffer__(self, flags):
75217521
seq = [MutBuffer(), b'World', b'Test']
75227522

75237523
left, right = socket.socketpair()
7524-
self.addCleanup(left.close)
7525-
self.addCleanup(right.close)
7526-
left.sendmsg(seq)
7524+
with left, right:
7525+
left.sendmsg(seq)
7526+
self.assertEqual(right.recv(1024), b'HelloWorldTest')
75277527

75287528
@unittest.skipUnless(hasattr(socket.socket, "recvmsg_into"),
75297529
"recvmsg_into not supported")
@@ -7532,6 +7532,7 @@ def test_recvmsg_into_reentrant_buffer_mutation(self):
75327532
# via __buffer__ protocol.
75337533
# See: https://github.com/python/cpython/issues/143988
75347534
seq = []
7535+
buf1 = bytearray(100)
75357536

75367537
class MutBuffer:
75377538
def __init__(self):
@@ -7541,15 +7542,15 @@ def __buffer__(self, flags):
75417542
if not self.tripped:
75427543
self.tripped = True
75437544
seq.clear()
7544-
return memoryview(bytearray(100))
7545+
return memoryview(buf1)
75457546

75467547
seq = [MutBuffer(), bytearray(100), bytearray(100)]
75477548

75487549
left, right = socket.socketpair()
7549-
self.addCleanup(left.close)
7550-
self.addCleanup(right.close)
7551-
left.send(b'Hello World!')
7552-
right.recvmsg_into(seq)
7550+
with left, right:
7551+
left.send(b'Hello World!')
7552+
right.recvmsg_into(seq)
7553+
self.assertEqual(buf1, b'Hello World!'.ljust(100, b'\x00'))
75537554

75547555

75557556
def setUpModule():

0 commit comments

Comments
 (0)