mirror of
https://github.com/python/cpython.git
synced 2025-09-27 02:39:58 +00:00
bpo-39010: Improve test shutdown (GH-22066) (#22082)
Simply closing the event loop isn't enough to avoid warnings. If we
don't also shut down the event loop's default executor, it sometimes
logs a "dangling thread" warning.
Follow-up to GH-22017
(cherry picked from commit be435ae2b0
)
Co-authored-by: Ben Darnell <ben@bendarnell.com>
Co-authored-by: Ben Darnell <ben@bendarnell.com>
This commit is contained in:
parent
a2680058ee
commit
8d68e59f11
1 changed files with 11 additions and 3 deletions
|
@ -225,10 +225,18 @@ class ProactorTests(test_utils.TestCase):
|
||||||
self.loop.run_forever()
|
self.loop.run_forever()
|
||||||
self.loop.stop()
|
self.loop.stop()
|
||||||
self.loop.run_forever()
|
self.loop.run_forever()
|
||||||
# If we don't wait for f to complete here, we may get another
|
|
||||||
# warning logged about a thread that didn't shut down cleanly.
|
# Shut everything down cleanly. This is an important part of the
|
||||||
|
# test - in issue 39010, the error occurred during loop.close(),
|
||||||
|
# so we want to close the loop during the test instead of leaving
|
||||||
|
# it for tearDown.
|
||||||
|
#
|
||||||
|
# First wait for f to complete to avoid a "future's result was never
|
||||||
|
# retrieved" error.
|
||||||
self.loop.run_until_complete(f)
|
self.loop.run_until_complete(f)
|
||||||
self.loop.close()
|
# Now shut down the loop itself (self.close_loop also shuts down the
|
||||||
|
# loop's default executor).
|
||||||
|
self.close_loop(self.loop)
|
||||||
self.assertFalse(self.loop.call_exception_handler.called)
|
self.assertFalse(self.loop.call_exception_handler.called)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue