Skip to content

Commit

Permalink
[3.9] gh-112769: test_zlib: test_zlib: Fix comparison of ZLIB_RUNTIME…
Browse files Browse the repository at this point in the history
…_VERSION with non-int suffix (GH-112771) (GH-119566)

zlib-ng defines the version as "1.3.0.zlib-ng".

(cherry picked from commit d384813)

Co-authored-by: Miro Hrončok [email protected]
  • Loading branch information
ned-deily authored May 30, 2024
1 parent 5130731 commit 54b5e9e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
27 changes: 15 additions & 12 deletions Lib/test/test_zlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@
hasattr(zlib.decompressobj(), "copy"),
'requires Decompress.copy()')

def _zlib_runtime_version_tuple(zlib_version=zlib.ZLIB_RUNTIME_VERSION):
# Register "1.2.3" as "1.2.3.0"
# or "1.2.0-linux","1.2.0.f","1.2.0.f-linux"
v = zlib_version.split('-', 1)[0].split('.')
if len(v) < 4:
v.append('0')
elif not v[-1].isnumeric():
v[-1] = '0'
return tuple(map(int, v))


ZLIB_RUNTIME_VERSION_TUPLE = _zlib_runtime_version_tuple()


class VersionTestCase(unittest.TestCase):

Expand Down Expand Up @@ -437,9 +450,8 @@ def test_flushes(self):
sync_opt = ['Z_NO_FLUSH', 'Z_SYNC_FLUSH', 'Z_FULL_FLUSH',
'Z_PARTIAL_FLUSH']

ver = tuple(int(v) for v in zlib.ZLIB_RUNTIME_VERSION.split('.'))
# Z_BLOCK has a known failure prior to 1.2.5.3
if ver >= (1, 2, 5, 3):
if ZLIB_RUNTIME_VERSION_TUPLE >= (1, 2, 5, 3):
sync_opt.append('Z_BLOCK')

sync_opt = [getattr(zlib, opt) for opt in sync_opt
Expand Down Expand Up @@ -768,16 +780,7 @@ def test_large_unconsumed_tail(self, size):

def test_wbits(self):
# wbits=0 only supported since zlib v1.2.3.5
# Register "1.2.3" as "1.2.3.0"
# or "1.2.0-linux","1.2.0.f","1.2.0.f-linux"
v = zlib.ZLIB_RUNTIME_VERSION.split('-', 1)[0].split('.')
if len(v) < 4:
v.append('0')
elif not v[-1].isnumeric():
v[-1] = '0'

v = tuple(map(int, v))
supports_wbits_0 = v >= (1, 2, 3, 5)
supports_wbits_0 = ZLIB_RUNTIME_VERSION_TUPLE >= (1, 2, 3, 5)

co = zlib.compressobj(level=1, wbits=15)
zlib15 = co.compress(HAMLET_SCENE) + co.flush()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The tests now correctly compare zlib version when
:const:`zlib.ZLIB_RUNTIME_VERSION` contains non-integer suffixes. For
example zlib-ng defines the version as ``1.3.0.zlib-ng``.

0 comments on commit 54b5e9e

Please sign in to comment.