python · vstinner · Sep 12, 2017 · Sep 1, 2017 · Sep 1, 2017
diff --git a/Lib/asyncio/test_utils.py b/Lib/asyncio/test_utils.py
@@ -438,12 +438,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_events.py b/Lib/test/test_asyncio/test_events.py
@@ -258,8 +258,8 @@ def tearDown(self):
        if not self.loop.is_closed():
            test_utils.run_briefly(self.loop)

-        self.loop.close()
-        gc.collect()
+        self.doCleanups()
+        support.gc_collect()
        super().tearDown()

    def test_run_until_complete_nesting(self):

diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
@@ -413,6 +413,7 @@ def run(arg):
        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)
@@ -428,6 +429,7 @@ def run(arg):
            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
@@ -529,7 +529,6 @@ def test_loop_self_reading_fut(self):
            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()