diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2017-09-01 12:46:06 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-01 12:46:06 (GMT) |
commit | 16432beadb8eba079c9786cc0c0eaacfd9fd2f7b (patch) | |
tree | f3c14222ddf24a83d355f6dbf1786ab65ed15600 /Lib/asyncio/test_utils.py | |
parent | 6c2feabc5dac2f3049b15134669e9ad5af573193 (diff) | |
download | cpython-16432beadb8eba079c9786cc0c0eaacfd9fd2f7b.zip cpython-16432beadb8eba079c9786cc0c0eaacfd9fd2f7b.tar.gz cpython-16432beadb8eba079c9786cc0c0eaacfd9fd2f7b.tar.bz2 |
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().
Diffstat (limited to 'Lib/asyncio/test_utils.py')
-rw-r--r-- | Lib/asyncio/test_utils.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Lib/asyncio/test_utils.py b/Lib/asyncio/test_utils.py index 1505950..ecb3fca 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) |