From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 30 Nov 2024 09:19:13 +0000 (+0100)
Subject: [3.13] gh-109746: Fix race condition in test_start_new_thread_failed (GH-127299)... 
X-Git-Tag: v3.13.1~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82d199d307e0f5ab65a3035040af26a370d6e2d4;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-109746: Fix race condition in test_start_new_thread_failed (GH-127299) (GH-127323)

(cherry picked from commit 83926d3b4c7847394b5e2531e9566d7fc9fbea0f)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 7ee0b2964bdb..c13d1bd0f81e 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -1196,11 +1196,11 @@ class ThreadTests(BaseTestCase):
             except RuntimeError:
                 print('ok')
             else:
-                print('skip')
+                print('!skip!')
         """
         _, out, err = assert_python_ok("-u", "-c", code)
         out = out.strip()
-        if out == b'skip':
+        if b'!skip!' in out:
             self.skipTest('RLIMIT_NPROC had no effect; probably superuser')
         self.assertEqual(out, b'ok')
         self.assertEqual(err, b'')