aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Lib/test/test_asyncio/utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/test/test_asyncio/utils.py')
-rw-r--r--Lib/test/test_asyncio/utils.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/Lib/test/test_asyncio/utils.py b/Lib/test/test_asyncio/utils.py
index 18869b3290a..44943e1fa7b 100644
--- a/Lib/test/test_asyncio/utils.py
+++ b/Lib/test/test_asyncio/utils.py
@@ -546,6 +546,7 @@ class TestCase(unittest.TestCase):
else:
loop._default_executor.shutdown(wait=True)
loop.close()
+
policy = support.maybe_get_event_loop_policy()
if policy is not None:
try:
@@ -557,9 +558,13 @@ class TestCase(unittest.TestCase):
pass
else:
if isinstance(watcher, asyncio.ThreadedChildWatcher):
- threads = list(watcher._threads.values())
- for thread in threads:
- thread.join()
+ # Wait for subprocess to finish, but not forever
+ for thread in list(watcher._threads.values()):
+ thread.join(timeout=support.SHORT_TIMEOUT)
+ if thread.is_alive():
+ raise RuntimeError(f"thread {thread} still alive: "
+ "subprocess still running")
+
def set_event_loop(self, loop, *, cleanup=True):
if loop is None: