From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 5 Jul 2025 18:24:19 +0000 (+0200)
Subject: [3.14] gh-136315: Fix skipped multithreading test in test_zstd (GH-136320) (#136322)
X-Git-Tag: v3.14.0b4~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b2cf81a6c84d24b9d669716d0fdccb923801941;p=thirdparty%2FPython%2Fcpython.git

[3.14] gh-136315: Fix skipped multithreading test in test_zstd (GH-136320) (#136322)

gh-136315: Fix skipped multithreading test in test_zstd (GH-136320)

Fix skipped test in test_zstd
(cherry picked from commit 5dac137b9f75c5c1d5096101bcd33d565d0526e4)

Co-authored-by: Emma Smith <emma@emmatyping.dev>
---

diff --git a/Lib/test/test_zstd.py b/Lib/test/test_zstd.py
index 7bd0ffd93915..e83caaf4c07b 100644
--- a/Lib/test/test_zstd.py
+++ b/Lib/test/test_zstd.py
@@ -63,15 +63,18 @@ SAMPLES = None
 
 TRAINED_DICT = None
 
-SUPPORT_MULTITHREADING = False
+# Cannot be deferred to setup as it is used to check whether or not to skip
+# tests
+try:
+    SUPPORT_MULTITHREADING = CompressionParameter.nb_workers.bounds() != (0, 0)
+except Exception:
+    SUPPORT_MULTITHREADING = False
 
 C_INT_MIN = -(2**31)
 C_INT_MAX = (2**31) - 1
 
 
 def setUpModule():
-    global SUPPORT_MULTITHREADING
-    SUPPORT_MULTITHREADING = CompressionParameter.nb_workers.bounds() != (0, 0)
     # uncompressed size 130KB, more than a zstd block.
     # with a frame epilogue, 4 bytes checksum.
     global DAT_130K_D