mirror of
https://github.com/python/cpython.git
synced 2025-08-09 19:38:42 +00:00
[3.12] gh-109538: Catch closed loop runtime error and issue warning (GH-111983) (#112142)
* [3.12] gh-109538: Avoid RuntimeError when StreamWriter is deleted with closed loop (GH-111983) Issue a ResourceWarning instead. (cherry picked from commite0f5127975
) 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> (cherry picked from commite0f5127975
) * Fix missing warnings import
This commit is contained in:
parent
3f2cdbe666
commit
2ef3676a5b
3 changed files with 66 additions and 2 deletions
|
@ -5,6 +5,7 @@ __all__ = (
|
|||
import collections
|
||||
import socket
|
||||
import sys
|
||||
import warnings
|
||||
import weakref
|
||||
|
||||
if hasattr(socket, 'AF_UNIX'):
|
||||
|
@ -405,8 +406,11 @@ class StreamWriter:
|
|||
|
||||
def __del__(self):
|
||||
if not self._transport.is_closing():
|
||||
if self._loop.is_closed():
|
||||
warnings.warn("loop is closed", ResourceWarning)
|
||||
else:
|
||||
self.close()
|
||||
|
||||
warnings.warn(f"unclosed {self!r}", ResourceWarning)
|
||||
|
||||
class StreamReader:
|
||||
|
||||
|
|
|
@ -1073,6 +1073,65 @@ os.close(fd)
|
|||
|
||||
self.assertEqual(messages, [])
|
||||
|
||||
def test_unclosed_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'))
|
||||
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))
|
||||
|
||||
with test_utils.run_test_server() as httpd:
|
||||
self.loop.run_until_complete(inner(httpd))
|
||||
|
||||
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()
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Issue warning message instead of having :class:`RuntimeError` be displayed when event loop has already been closed at :meth:`StreamWriter.__del__`.
|
Loading…
Add table
Add a link
Reference in a new issue