Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.10] gh-112769: test_zlib: test_zlib: Fix comparison of ZLIB_RUNTIME_VERSION with non-int suffix (GH-112771) (#119565)

Browse source 
[3.10] gh-112769: test_zlib: test_zlib: Fix comparison of ZLIB_RUNTIME_VERSION with non-int suffix

zlib-ng defines the version as "1.3.0.zlib-ng".
(cherry picked from commit d384813)

Co-authored-by: Miro Hrončok miro@hroncok.cz
This commit is contained in:
Ned Deily 2024-05-28 11:57:05 -04:00 • committed by GitHub
parent c8f868dc52
commit 48f9d3e3fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Lib/test/test_zlib.py
View file

@ -18,6 +18,19 @@
hasattr(zlib.decompressobj(), "copy"), hasattr(zlib.decompressobj(), "copy"),
'requires Decompress.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): class VersionTestCase(unittest.TestCase):
@ -445,9 +458,8 @@ def test_flushes(self):
sync_opt = ['Z_NO_FLUSH', 'Z_SYNC_FLUSH', 'Z_FULL_FLUSH', sync_opt = ['Z_NO_FLUSH', 'Z_SYNC_FLUSH', 'Z_FULL_FLUSH',
'Z_PARTIAL_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 # 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.append('Z_BLOCK')
sync_opt = [getattr(zlib, opt) for opt in sync_opt sync_opt = [getattr(zlib, opt) for opt in sync_opt
@ -776,16 +788,7 @@ def test_large_unconsumed_tail(self, size):
def test_wbits(self): def test_wbits(self):
# wbits=0 only supported since zlib v1.2.3.5 # wbits=0 only supported since zlib v1.2.3.5
# Register "1.2.3" as "1.2.3.0" supports_wbits_0 = ZLIB_RUNTIME_VERSION_TUPLE >= (1, 2, 3, 5)
# 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)
co = zlib.compressobj(level=1, wbits=15) co = zlib.compressobj(level=1, wbits=15)
zlib15 = co.compress(HAMLET_SCENE) + co.flush() zlib15 = co.compress(HAMLET_SCENE) + co.flush()

3
Misc/NEWS.d/next/Tests/2024-05-25-17-06-01.gh-issue-112769.kdLJmS.rst Normal file
View file

@ -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``.