From a01621aeb4a9b4e9307aba1ff7a772af1de931f8 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 13 Mar 2024 01:29:03 +0100 Subject: [PATCH] [3.11] gh-116682: stdout may be empty in test_cancel_futures_wait_false (GH-116683) (#116693) If the `shutdown()` call happens before the worker thread starts executing the task, then nothing will be printed to stdout. (cherry picked from commit 7d1abe9502641a3602e9773aebc29ee56d8f40ae) Co-authored-by: Sam Gross --- Lib/test/test_concurrent_futures/test_shutdown.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_concurrent_futures/test_shutdown.py b/Lib/test/test_concurrent_futures/test_shutdown.py index 45dab7a75fdd..7a4065afd46f 100644 --- a/Lib/test/test_concurrent_futures/test_shutdown.py +++ b/Lib/test/test_concurrent_futures/test_shutdown.py @@ -247,7 +247,9 @@ class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase # Errors in atexit hooks don't change the process exit code, check # stderr manually. self.assertFalse(err) - self.assertEqual(out.strip(), b"apple") + # gh-116682: stdout may be empty if shutdown happens before task + # starts executing. + self.assertIn(out.strip(), [b"apple", b""]) class ProcessPoolShutdownTest(ExecutorShutdownTest): -- 2.47.3