@@ -369,20 +369,19 @@ def check(self, name, data, hexdigest, shake=False, **kwargs):
369369 # 2 is for hashlib.name(...) and hashlib.new(name, ...)
370370 self .assertGreaterEqual (len (constructors ), 2 )
371371 for hash_object_constructor in constructors :
372- with self .subTest (implementation = hash_object_constructor ):
373- m = hash_object_constructor (data , ** kwargs )
374- computed = m .hexdigest () if not shake else m .hexdigest (length )
375- self .assertEqual (
376- computed , hexdigest ,
377- "Hash algorithm %s constructed using %s returned hexdigest"
378- " %r for %d byte input data that should have hashed to %r."
379- % (name , hash_object_constructor ,
380- computed , len (data ), hexdigest ))
381- computed = m .digest () if not shake else m .digest (length )
382- digest = bytes .fromhex (hexdigest )
383- self .assertEqual (computed , digest )
384- if not shake :
385- self .assertEqual (len (digest ), m .digest_size )
372+ m = hash_object_constructor (data , ** kwargs )
373+ computed = m .hexdigest () if not shake else m .hexdigest (length )
374+ self .assertEqual (
375+ computed , hexdigest ,
376+ "Hash algorithm %s constructed using %s returned hexdigest"
377+ " %r for %d byte input data that should have hashed to %r."
378+ % (name , hash_object_constructor ,
379+ computed , len (data ), hexdigest ))
380+ computed = m .digest () if not shake else m .digest (length )
381+ digest = bytes .fromhex (hexdigest )
382+ self .assertEqual (computed , digest )
383+ if not shake :
384+ self .assertEqual (len (digest ), m .digest_size )
386385
387386 if not shake and kwargs .get ("key" ) is None :
388387 # skip shake and blake2 extended parameter tests
@@ -403,15 +402,14 @@ def check_file_digest(self, name, data, hexdigest):
403402
404403 try :
405404 for digest in digests :
406- with self .subTest (msg = "check_file_digest" , implementation = digest ):
407- buf = io .BytesIO (data )
408- buf .seek (0 )
409- self .assertEqual (
410- hashlib .file_digest (buf , digest ).hexdigest (), hexdigest
411- )
412- with open (os_helper .TESTFN , "rb" ) as f :
413- digestobj = hashlib .file_digest (f , digest )
414- self .assertEqual (digestobj .hexdigest (), hexdigest )
405+ buf = io .BytesIO (data )
406+ buf .seek (0 )
407+ self .assertEqual (
408+ hashlib .file_digest (buf , digest ).hexdigest (), hexdigest
409+ )
410+ with open (os_helper .TESTFN , "rb" ) as f :
411+ digestobj = hashlib .file_digest (f , digest )
412+ self .assertEqual (digestobj .hexdigest (), hexdigest )
415413 finally :
416414 os .unlink (os_helper .TESTFN )
417415
0 commit comments