From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 10 Jul 2025 13:13:34 +0000 (+0200)
Subject: [3.14] gh-136394: Fix race condition in test_zstd (GH-136432) (GH-136506)
X-Git-Tag: v3.14.0rc1~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da8bcfd949885a9a057038ef0095f442b05ee29a;p=thirdparty%2FPython%2Fcpython.git

[3.14] gh-136394: Fix race condition in test_zstd (GH-136432) (GH-136506)

gh-136394: Fix race condition in test_zstd (GH-136432)
(cherry picked from commit f519918ec6c125715d4efc9713ba80e83346e466)

Co-authored-by: Rogdham <3994389+Rogdham@users.noreply.github.com>
---

diff --git a/Lib/test/test_zstd.py b/Lib/test/test_zstd.py
index e83caaf4c07b..cf618534add3 100644
--- a/Lib/test/test_zstd.py
+++ b/Lib/test/test_zstd.py
@@ -2674,8 +2674,12 @@ class FreeThreadingMethodTests(unittest.TestCase):
         input = b'a'* (16*_1K)
         num_threads = 8
 
+        # gh-136394: the first output of .compress() includes the frame header
+        # we run the first .compress() call outside of the threaded portion
+        # to make the test order-independent
+
         comp = ZstdCompressor()
-        parts = []
+        parts = [comp.compress(input, ZstdCompressor.FLUSH_BLOCK)]
         for _ in range(num_threads):
             res = comp.compress(input, ZstdCompressor.FLUSH_BLOCK)
             if res:
@@ -2684,7 +2688,7 @@ class FreeThreadingMethodTests(unittest.TestCase):
         expected = b''.join(parts) + rest1
 
         comp = ZstdCompressor()
-        output = []
+        output = [comp.compress(input, ZstdCompressor.FLUSH_BLOCK)]
         def run_method(method, input_data, output_data):
             res = method(input_data, ZstdCompressor.FLUSH_BLOCK)
             if res: