diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-09-01 14:46:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 14:46:06 +0200 |
| commit | 16432beadb8eba079c9786cc0c0eaacfd9fd2f7b (patch) | |
| tree | f3c14222ddf24a83d355f6dbf1786ab65ed15600 | |
| parent | 6c2feabc5dac2f3049b15134669e9ad5af573193 (diff) | |
| download | cpython-git-16432beadb8eba079c9786cc0c0eaacfd9fd2f7b.tar.gz | |
bpo-31250, test_asyncio: fix dangling threads (#3252)
* Explicitly call shutdown(wait=True) on executors to wait until all
threads complete to prevent side effects between tests.
* Fix test_loop_self_reading_exception(): don't mock loop.close().
Previously, the original close() method was called rather than the
mock, because how set_event_loop() registered loop.close().
| -rw-r--r-- | Lib/asyncio/test_utils.py | 9 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_futures.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_proactor_events.py | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Lib/asyncio/test_utils.py b/Lib/asyncio/test_utils.py index 1505950107..ecb3fca097 100644 --- a/Lib/asyncio/test_utils.py +++ b/Lib/asyncio/test_utils.py @@ -437,12 +437,19 @@ def get_function_source(func): class TestCase(unittest.TestCase): + @staticmethod + def close_loop(loop): + executor = loop._default_executor + if executor is not None: + executor.shutdown(wait=True) + loop.close() + def set_event_loop(self, loop, *, cleanup=True): assert loop is not None # ensure that the event loop is passed explicitly in asyncio events.set_event_loop(None) if cleanup: - self.addCleanup(loop.close) + self.addCleanup(self.close_loop, loop) def new_test_loop(self, gen=None): loop = TestLoop(gen) diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py index ebedfec7fa..f8f614f1c3 100644 --- a/Lib/test/test_asyncio/test_futures.py +++ b/Lib/test/test_asyncio/test_futures.py @@ -380,6 +380,7 @@ class BaseFutureTests: self.assertTrue(asyncio.isfuture(f2)) self.assertEqual(res, 'oi') self.assertNotEqual(ident, threading.get_ident()) + ex.shutdown(wait=True) def test_wrap_future_future(self): f1 = self._new_future(loop=self.loop) @@ -395,6 +396,7 @@ class BaseFutureTests: f1 = ex.submit(run, 'oi') f2 = asyncio.wrap_future(f1) self.assertIs(self.loop, f2._loop) + ex.shutdown(wait=True) def test_wrap_future_cancel(self): f1 = concurrent.futures.Future() diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py index 4dfc61259f..d76da661ab 100644 --- a/Lib/test/test_asyncio/test_proactor_events.py +++ b/Lib/test/test_asyncio/test_proactor_events.py @@ -529,7 +529,6 @@ class BaseProactorEventLoopTests(test_utils.TestCase): self.loop._loop_self_reading) def test_loop_self_reading_exception(self): - self.loop.close = mock.Mock() self.loop.call_exception_handler = mock.Mock() self.proactor.recv.side_effect = OSError() self.loop._loop_self_reading() |