mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 23:53:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Improve tests with more modern assert* methods and subTests.

Browse source
This commit is contained in:
Steven D'Aprano 2016-04-15 10:04:24 +10:00
parent a873f68248
commit 08fbef040a
1 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Lib/test/test_secrets.py
View file

@ -44,8 +44,8 @@ class Compare_Digest_Tests(unittest.TestCase):
def test_bool(self): def test_bool(self):
# Test that compare_digest returns a bool. # Test that compare_digest returns a bool.
self.assertTrue(isinstance(secrets.compare_digest("abc", "abc"), bool)) self.assertIsInstance(secrets.compare_digest("abc", "abc"), bool)
self.assertTrue(isinstance(secrets.compare_digest("abc", "xyz"), bool)) self.assertIsInstance(secrets.compare_digest("abc", "xyz"), bool)
class Random_Tests(unittest.TestCase): class Random_Tests(unittest.TestCase):
@ -67,10 +67,8 @@ class Random_Tests(unittest.TestCase):
def test_randbelow(self): def test_randbelow(self):
# Test randbelow. # Test randbelow.
errmsg = "randbelow(%d) returned %d"
for i in range(2, 10): for i in range(2, 10):
n = secrets.randbelow(i) self.assertIn(secrets.randbelow(i), range(i))
self.assertTrue(n in range(i), errmsg % (i, n))
self.assertRaises(ValueError, secrets.randbelow, 0) self.assertRaises(ValueError, secrets.randbelow, 0)
@ -81,39 +79,44 @@ class Token_Tests(unittest.TestCase):
# Test that token_* functions handle default size correctly. # Test that token_* functions handle default size correctly.
for func in (secrets.token_bytes, secrets.token_hex, for func in (secrets.token_bytes, secrets.token_hex,
secrets.token_urlsafe): secrets.token_urlsafe):
name = func.__name__ with self.subTest(func=func):
try: name = func.__name__
func() try:
except TypeError: func()
self.fail("%s cannot be called with no argument" % name) except TypeError:
try: self.fail("%s cannot be called with no argument" % name)
func(None) try:
except TypeError: func(None)
self.fail("%s cannot be called with None" % name) except TypeError:
self.fail("%s cannot be called with None" % name)
size = secrets.DEFAULT_ENTROPY size = secrets.DEFAULT_ENTROPY
self.assertEqual(len(secrets.token_bytes(None)), size) self.assertEqual(len(secrets.token_bytes(None)), size)
self.assertEqual(len(secrets.token_hex(None)), 2*size) self.assertEqual(len(secrets.token_hex(None)), 2*size)
def test_token_bytes(self): def test_token_bytes(self):
# Test token_bytes. # Test token_bytes.
self.assertTrue(isinstance(secrets.token_bytes(11), bytes))
for n in (1, 8, 17, 100): for n in (1, 8, 17, 100):
self.assertEqual(len(secrets.token_bytes(n)), n) with self.subTest(n=n):
self.assertIsInstance(secrets.token_bytes(n), bytes)
self.assertEqual(len(secrets.token_bytes(n)), n)
def test_token_hex(self): def test_token_hex(self):
# Test token_hex. # Test token_hex.
self.assertTrue(isinstance(secrets.token_hex(7), str))
for n in (1, 12, 25, 90): for n in (1, 12, 25, 90):
s = secrets.token_hex(n) with self.subTest(n=n):
self.assertEqual(len(s), 2*n) s = secrets.token_hex(n)
self.assertTrue(all(c in string.hexdigits for c in s)) self.assertIsInstance(s, str))
self.assertEqual(len(s), 2*n)
self.assertTrue(all(c in string.hexdigits for c in s))
def test_token_urlsafe(self): def test_token_urlsafe(self):
# Test token_urlsafe. # Test token_urlsafe.
self.assertTrue(isinstance(secrets.token_urlsafe(9), str))
legal = string.ascii_letters + string.digits + '-_' legal = string.ascii_letters + string.digits + '-_'
for n in (1, 11, 28, 76): for n in (1, 11, 28, 76):
self.assertTrue(all(c in legal for c in secrets.token_urlsafe(n))) with self.subTest(n=n):
s = secrets.token_urlsafe(n)
self.assertIsInstance(s, str))
self.assertTrue(all(c in legal for c in s))
if __name__ == '__main__': if __name__ == '__main__':