https://github.com/python/cpython/commit/da8bcfd949885a9a057038ef0095f442b05ee29a
commit: da8bcfd949885a9a057038ef0095f442b05ee29a
branch: 3.14
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: ZeroIntensity <zintensity...@gmail.com>
date: 2025-07-10T09:13:34-04:00
summary:
[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+rogd...@users.noreply.github.com>
files:
M Lib/test/test_zstd.py
diff --git a/Lib/test/test_zstd.py b/Lib/test/test_zstd.py
index e83caaf4c07b13..cf618534add387 100644
--- a/Lib/test/test_zstd.py
+++ b/Lib/test/test_zstd.py
@@ -2674,8 +2674,12 @@ def test_compress_locking(self):
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 @@ def test_compress_locking(self):
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:
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: arch...@mail-archive.com
