Skip to content

gh-145028: Fix blake2 tests in test_hashlib when it is missing due to configure --without-builtin-hashlib-hashes #145029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tucif wants to merge 4 commits into
base: main
Choose a base branch
from
+26 −4
Open

gh-145028: Fix blake2 tests in test_hashlib when it is missing due to configure --without-builtin-hashlib-hashes #145029

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c1de38
reuse blake2 conditionals in missing places and skip subtest for test…
tucif Feb 20, 2026
dc7c6c6
only skip on value error specific for blake2 if not in builtins in te…
tucif Feb 20, 2026
1fdc8c7
Address reviewer comments
tucif Feb 20, 2026
17eb629
add skip_if_blake2_not_builtin helper and use it also from test_threa…
tucif Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions Lib/test/test_hashlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,11 @@ def __init__(self, *args, **kwargs):
algorithms.add(algorithm.lower())

_blake2 = self._conditional_import_module('_blake2')
blake2_hashes = {'blake2b', 'blake2s'}
if _blake2:
algorithms.update({'blake2b', 'blake2s'})
algorithms.update(blake2_hashes)
else:
algorithms.difference_update(blake2_hashes)

self.constructors_to_test = {}
for algorithm in algorithms:
Expand Down Expand Up @@ -232,7 +235,13 @@ def test_algorithms_available(self):
# all available algorithms must be loadable, bpo-47101
self.assertNotIn("undefined", hashlib.algorithms_available)
for name in hashlib.algorithms_available:
digest = hashlib.new(name, usedforsecurity=False)
with self.subTest(name):
try:
digest = hashlib.new(name, usedforsecurity=False)
assert digest is not None
Copy link
Member

@picnixz picnixz Feb 20, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The digeset is None assertion is not useful I think (I'm not sure hashlib.new() can return or can it?) if this is just for testing the existence, it's fine to just have _ = hashlib.new(...)

except ValueError as verr:
self.skip_if_blake2_not_builtin(name, verr)
raise
Comment on lines +242 to +244
Copy link
Member

@picnixz picnixz Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
except ValueError as verr:
self.skip_if_blake2_not_builtin(name, verr)
raise
except ValueError as exc:
self.skip_if_blake2_not_builtin(name, exc)
raise


def test_usedforsecurity_true(self):
hashlib.new("sha256", usedforsecurity=True)
Expand Down Expand Up @@ -504,6 +513,7 @@ def test_sha3_256_update_over_4gb(self):
self.assertEqual(h.hexdigest(), "e2d4535e3b613135c14f2fe4e026d7ad8d569db44901740beffa30d430acb038")

@requires_resource('cpu')
@requires_blake2
def test_blake2_update_over_4gb(self):
# blake2s or blake2b doesn't matter based on how our C code is structured, this tests the
# common loop macro logic.
Expand Down Expand Up @@ -798,6 +808,12 @@ def test_case_sha512_3(self):
"e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973eb"+
"de0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b")

def skip_if_blake2_not_builtin(self, name, skip_reason):
# blake2 builtins may be absent if python built with
# a subset of --with-builtin-hashlib-hashes or none.
if "blake2" in name and "blake2" not in builtin_hashes:
self.skipTest(skip_reason)

def check_blake2(self, constructor, salt_size, person_size, key_size,
digest_size, max_offset):
self.assertEqual(constructor.SALT_SIZE, salt_size)
Expand Down Expand Up @@ -1080,10 +1096,16 @@ def test_sha256_gil(self):
def test_threaded_hashing_fast(self):
# Same as test_threaded_hashing_slow() but only tests some functions
# since otherwise test_hashlib.py becomes too slow during development.
for name in ['md5', 'sha1', 'sha256', 'sha3_256', 'blake2s']:
algos = ['md5', 'sha1', 'sha256', 'sha3_256', 'blake2s']
for name in algos:
if constructor := getattr(hashlib, name, None):
with self.subTest(name):
self.do_test_threaded_hashing(constructor, is_shake=False)
try:
self.do_test_threaded_hashing(constructor, is_shake=False)
except ValueError as verr:
self.skip_if_blake2_not_builtin(name, verr)
raise

if shake_128 := getattr(hashlib, 'shake_128', None):
self.do_test_threaded_hashing(shake_128, is_shake=True)

Expand Down
Loading