Skip to content

bpo-43916: Rewrite new hashlib tests, fix typo (GH-25791) #25791

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.

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

Merged
merged 2 commits into from
May 1, 2021
Merged
Changes from all commits
Commits
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
42 changes: 12 additions & 30 deletions Lib/test/test_hashlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -901,36 +901,18 @@ def test_get_fips_mode(self):
if fips_mode is not None:
self.assertIsInstance(fips_mode, int)

def test_disallow_instanciation(self):
constructors = []
try:
import _md5
constructors.append(_md5.md5)
except ImportError:
pass
try:
import _sha1
constructors.append(_sha1.sha1)
except ImportError:
pass
try:
import _sha256
constructors.append(_sha256.sha224)
constructors.append(_sha256.sha256)
except ImportError:
pass
try:
import _sha512
constructors.append(_sha512.sha384)
constructors.append(_sha512.sha512)
except ImportError:
pass

for constructor in constructors:
h = constructor()
with self.subTest(constructor=constructor):
hash_type = type(h)
self.assertRaises(TypeError, hash_type)
@support.cpython_only
def test_disallow_instantiation(self):
for algorithm, constructors in self.constructors_to_test.items():
if algorithm.startswith(("sha3_", "shake", "blake")):
# _sha3 and _blake types can be instantiated
continue
# all other types have DISALLOW_INSTANTIATION
for constructor in constructors:
h = constructor()
with self.subTest(constructor=constructor):
hash_type = type(h)
self.assertRaises(TypeError, hash_type)

@unittest.skipUnless(HASH is not None, 'need _hashlib')
def test_hash_disallow_instanciation(self):
Expand Down