Skip to content

Commit

Permalink
[3.9] pythongh-125041: pythongh-90781: test_zlib: For s390x HW accele…
Browse files Browse the repository at this point in the history
…ration, skip checking the compressed bytes (pythonGH-125042)

This backports two commits:

- pythonGH-31096 skipped the tests unconditionally
- pythonGH-125042 skips only the possibly-failing assertion

(cherry picked from commit d522856)

Co-authored-by: Petr Viktorin <[email protected]>
  • Loading branch information
encukou committed Oct 16, 2024
1 parent be988e8 commit 21bf2ba
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
21 changes: 19 additions & 2 deletions Lib/test/test_zlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from test import support
import binascii
import copy
import os
import pickle
import random
import sys
Expand Down Expand Up @@ -30,6 +31,16 @@ def _zlib_runtime_version_tuple(zlib_version=zlib.ZLIB_RUNTIME_VERSION):
ZLIB_RUNTIME_VERSION_TUPLE = _zlib_runtime_version_tuple()


# bpo-46623: When a hardware accelerator is used (currently only on s390x),
# using different ways to compress data with zlib can produce different
# compressed data.
#
# To simplify the skip condition, make the assumption that s390x always has an
# accelerator, and nothing else has it.
# Windows doesn't have os.uname() but it doesn't support s390x.
HW_ACCELERATED = hasattr(os, 'uname') and os.uname().machine == 's390x'


class VersionTestCase(unittest.TestCase):

def test_library_version(self):
Expand Down Expand Up @@ -191,7 +202,10 @@ def test_speech128(self):
# compress more data
data = HAMLET_SCENE * 128
x = zlib.compress(data)
self.assertEqual(zlib.compress(bytearray(data)), x)
# With hardware acceleration, the compressed bytes
# might not be identical.
if not HW_ACCELERATED:
self.assertEqual(zlib.compress(bytearray(data)), x)
for ob in x, bytearray(x):
self.assertEqual(zlib.decompress(ob), data)

Expand Down Expand Up @@ -248,7 +262,10 @@ def test_pair(self):
x1 = co.compress(data)
x2 = co.flush()
self.assertRaises(zlib.error, co.flush) # second flush should not work
self.assertEqual(x1 + x2, datazip)
# With hardware acceleration, the compressed bytes might not
# be identical.
if not HW_ACCELERATED:
self.assertEqual(x1 + x2, datazip)
for v1, v2 in ((x1, x2), (bytearray(x1), bytearray(x2))):
dco = zlib.decompressobj()
y1 = dco.decompress(v1 + v2)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Re-enable skipped tests for :mod:`zlib` on the s390x architecture: only skip
checks of the compressed bytes, which can be different between zlib's
software implementation and the hardware-accelerated implementation.

0 comments on commit 21bf2ba

Please sign in to comment.