From 8e0a3a0de2779992f0768ad19d8d83d342428af7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 15 Jun 2022 13:00:44 +0200 Subject: [PATCH] test_thread uses support.sleeping_retry() test_thread.test_count() now fails if it takes longer than LONG_TIMEOUT seconds. --- Lib/test/test_thread.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index ed527e7164fd0a..2ae5e9ccb44088 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -13,7 +13,6 @@ NUMTASKS = 10 NUMTRIPS = 3 -POLL_SLEEP = 0.010 # seconds = 10 ms _print_mutex = thread.allocate_lock() @@ -121,19 +120,24 @@ def task(): with threading_helper.wait_threads_exit(): thread.start_new_thread(task, ()) - while not started: - time.sleep(POLL_SLEEP) + for _ in support.sleeping_retry(support.LONG_TIMEOUT): + if started: + break self.assertEqual(thread._count(), orig + 1) + # Allow the task to finish. mut.release() + # The only reliable way to be sure that the thread ended from the - # interpreter's point of view is to wait for the function object to be - # destroyed. + # interpreter's point of view is to wait for the function object to + # be destroyed. done = [] wr = weakref.ref(task, lambda _: done.append(None)) del task - while not done: - time.sleep(POLL_SLEEP) + + for _ in support.sleeping_retry(support.LONG_TIMEOUT): + if done: + break support.gc_collect() # For PyPy or other GCs. self.assertEqual(thread._count(), orig)