secrets: refactor for py3 (from 3c9c04d4)

This commit is contained in:
Zach Moody
2016-06-22 22:07:39 -05:00
parent ed794392c6
commit b21833f79c
2 changed files with 12 additions and 4 deletions

View File

@@ -100,7 +100,7 @@ class SecretTestCase(TestCase):
# Ensure proper hashing algorithm is used
hasher, iterations, salt, sha256 = s.hash.split('$')
self.assertEqual(hasher, 'pbkdf2_sha256', "Hashing algorithm has been modified to: {}".format(hasher))
self.assertGreaterEqual(iterations, 24000, "Insufficient iteration count ({}) for hash".format(iterations))
self.assertGreaterEqual(int(iterations), 24000, "Insufficient iteration count ({}) for hash".format(iterations))
self.assertGreaterEqual(len(salt), 12, "Hash salt is too short ({} chars)".format(len(salt)))
# Test hash validation