mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
gh-109538: Avoid RuntimeError when StreamWriter is deleted with closed loop (#111983)
Issue a ResourceWarning instead. Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
This commit is contained in:
parent
fe9db901b2
commit
e0f5127975
3 changed files with 45 additions and 5 deletions
|
@ -1082,10 +1082,11 @@ os.close(fd)
|
|||
self.assertEqual(data, b'HTTP/1.0 200 OK\r\n')
|
||||
data = await rd.read()
|
||||
self.assertTrue(data.endswith(b'\r\n\r\nTest message'))
|
||||
with self.assertWarns(ResourceWarning):
|
||||
with self.assertWarns(ResourceWarning) as cm:
|
||||
del wr
|
||||
gc.collect()
|
||||
|
||||
self.assertEqual(len(cm.warnings), 1)
|
||||
self.assertTrue(str(cm.warnings[0].message).startswith("unclosed <StreamWriter"))
|
||||
|
||||
messages = []
|
||||
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))
|
||||
|
@ -1095,6 +1096,42 @@ os.close(fd)
|
|||
|
||||
self.assertEqual(messages, [])
|
||||
|
||||
def test_loop_is_closed_resource_warnings(self):
|
||||
async def inner(httpd):
|
||||
rd, wr = await asyncio.open_connection(*httpd.address)
|
||||
|
||||
wr.write(b'GET / HTTP/1.0\r\n\r\n')
|
||||
data = await rd.readline()
|
||||
self.assertEqual(data, b'HTTP/1.0 200 OK\r\n')
|
||||
data = await rd.read()
|
||||
self.assertTrue(data.endswith(b'\r\n\r\nTest message'))
|
||||
|
||||
# Make "loop is closed" occur first before "del wr" for this test.
|
||||
self.loop.stop()
|
||||
wr.close()
|
||||
while not self.loop.is_closed():
|
||||
await asyncio.sleep(0.0)
|
||||
|
||||
with self.assertWarns(ResourceWarning) as cm:
|
||||
del wr
|
||||
gc.collect()
|
||||
self.assertEqual(len(cm.warnings), 1)
|
||||
self.assertEqual("loop is closed", str(cm.warnings[0].message))
|
||||
|
||||
messages = []
|
||||
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))
|
||||
|
||||
with test_utils.run_test_server() as httpd:
|
||||
try:
|
||||
self.loop.run_until_complete(inner(httpd))
|
||||
# This exception is caused by `self.loop.stop()` as expected.
|
||||
except RuntimeError:
|
||||
pass
|
||||
finally:
|
||||
gc.collect()
|
||||
|
||||
self.assertEqual(messages, [])
|
||||
|
||||
def test_unhandled_exceptions(self) -> None:
|
||||
port = socket_helper.find_unused_port()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue