https://github.com/python/cpython/commit/6d2c5a9f4a664d12509da9055d865980d2264bf9
commit: 6d2c5a9f4a664d12509da9055d865980d2264bf9
branch: 3.14
author: Rafael Santos <[email protected]>
committer: gpshead <[email protected]>
date: 2026-02-24T02:52:57Z
summary:
[3.14] gh-145028: Fix blake2 tests in test_hashlib when it is missing due to
configure --without-builtin-hashlib-hashes (GH-145029) (#145164)
[3.14] gh-145028: Fix blake2 tests in test_hashlib when it is missing due to
build config (GH-145029)
specifically configure --without-builtin-hashlib-hashes means the otherwise
guaranteed available blake2 family will not exist. this allows the test suite
to still pass.
(cherry picked from commit 273d5062ca17ac47354486f3fc6e672a04cf22e0)
files:
M Lib/test/test_hashlib.py
diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py
index 14a79a1c698ffb..c7d7b801ac732a 100644
--- a/Lib/test/test_hashlib.py
+++ b/Lib/test/test_hashlib.py
@@ -127,8 +127,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:
@@ -220,7 +223,12 @@ 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:
+ _ = hashlib.new(name, usedforsecurity=False)
+ except ValueError as exc:
+ self.skip_if_blake2_not_builtin(name, exc)
+ raise
def test_usedforsecurity_true(self):
hashlib.new("sha256", usedforsecurity=True)
@@ -443,6 +451,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.
@@ -733,6 +742,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)
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
