mirror of
https://github.com/python/cpython.git
synced 2025-09-29 11:45:57 +00:00
* bpo-30280: asyncio now cleans up threads
asyncio base TestCase now uses threading_setup() and
threading_cleanup() of test.support to cleanup threads.
* asyncio: Fix TestBaseSelectorEventLoop cleanup
bpo-30280: TestBaseSelectorEventLoop of
test.test_asyncio.test_selector_events now correctly closes the event
loop: cleanup its executor to not leak threads.
Don't override the close() method of the event loop, only override
the_close_self_pipe() method.
(cherry picked from commit b903067462
)
This commit is contained in:
parent
22d4e8fb99
commit
23caf8cfc6
2 changed files with 9 additions and 5 deletions
|
@ -33,6 +33,7 @@ from . import selectors
|
||||||
from . import tasks
|
from . import tasks
|
||||||
from .coroutines import coroutine
|
from .coroutines import coroutine
|
||||||
from .log import logger
|
from .log import logger
|
||||||
|
from test import support
|
||||||
|
|
||||||
|
|
||||||
if sys.platform == 'win32': # pragma: no cover
|
if sys.platform == 'win32': # pragma: no cover
|
||||||
|
@ -455,6 +456,7 @@ class TestCase(unittest.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
self._get_running_loop = events._get_running_loop
|
self._get_running_loop = events._get_running_loop
|
||||||
events._get_running_loop = lambda: None
|
events._get_running_loop = lambda: None
|
||||||
|
self._thread_cleanup = support.threading_setup()
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
self.unpatch_get_running_loop()
|
self.unpatch_get_running_loop()
|
||||||
|
@ -465,6 +467,10 @@ class TestCase(unittest.TestCase):
|
||||||
# in an except block of a generator
|
# in an except block of a generator
|
||||||
self.assertEqual(sys.exc_info(), (None, None, None))
|
self.assertEqual(sys.exc_info(), (None, None, None))
|
||||||
|
|
||||||
|
self.doCleanups()
|
||||||
|
support.threading_cleanup(*self._thread_cleanup)
|
||||||
|
support.reap_children()
|
||||||
|
|
||||||
if not compat.PY34:
|
if not compat.PY34:
|
||||||
# Python 3.3 compatibility
|
# Python 3.3 compatibility
|
||||||
def subTest(self, *args, **kwargs):
|
def subTest(self, *args, **kwargs):
|
||||||
|
|
|
@ -24,16 +24,14 @@ MOCK_ANY = mock.ANY
|
||||||
|
|
||||||
class TestBaseSelectorEventLoop(BaseSelectorEventLoop):
|
class TestBaseSelectorEventLoop(BaseSelectorEventLoop):
|
||||||
|
|
||||||
def close(self):
|
|
||||||
# Don't call the close() method of the parent class, because the
|
|
||||||
# selector is mocked
|
|
||||||
self._closed = True
|
|
||||||
|
|
||||||
def _make_self_pipe(self):
|
def _make_self_pipe(self):
|
||||||
self._ssock = mock.Mock()
|
self._ssock = mock.Mock()
|
||||||
self._csock = mock.Mock()
|
self._csock = mock.Mock()
|
||||||
self._internal_fds += 1
|
self._internal_fds += 1
|
||||||
|
|
||||||
|
def _close_self_pipe(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def list_to_buffer(l=()):
|
def list_to_buffer(l=()):
|
||||||
return bytearray().join(l)
|
return bytearray().join(l)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue