diff options
| -rw-r--r-- | tests/data/hashsums/hashsum_test.data (renamed from tests/old/hashsum_test.data) | 0 | ||||
| -rw-r--r-- | tests/data/hashsums/hashsum_test_with_zero.data (renamed from tests/old/hashsum_test_with_zero.data) | bin | 7 -> 7 bytes | |||
| -rw-r--r-- | tests/test_hashsums.py (renamed from tests/old/test_hashsums.py) | 51 |
3 files changed, 27 insertions, 24 deletions
diff --git a/tests/old/hashsum_test.data b/tests/data/hashsums/hashsum_test.data index 19102815..19102815 100644 --- a/tests/old/hashsum_test.data +++ b/tests/data/hashsums/hashsum_test.data diff --git a/tests/old/hashsum_test_with_zero.data b/tests/data/hashsums/hashsum_test_with_zero.data Binary files differindex 2ec9a6df..2ec9a6df 100644 --- a/tests/old/hashsum_test_with_zero.data +++ b/tests/data/hashsums/hashsum_test_with_zero.data diff --git a/tests/old/test_hashsums.py b/tests/test_hashsums.py index 0cf6beb7..1819e343 100644 --- a/tests/old/test_hashsums.py +++ b/tests/test_hashsums.py @@ -7,61 +7,64 @@ import apt_pkg class testHashes(unittest.TestCase): " test the hashsum functions against strings and files " + DATA_PATH = "data/hashsums/hashsum_test.data" + DATA_WITH_ZERO_PATH = "data/hashsums/hashsum_test_with_zero.data" + def testMD5(self): # simple - s = "foo" + s = b"foo" s_md5 = "acbd18db4cc2f85cedef654fccc4a4d8" res = apt_pkg.md5sum(s) - self.assert_(res == s_md5) + self.assertEqual(res, s_md5) # file - res = apt_pkg.md5sum(open("hashsum_test.data")) - self.assert_(res == s_md5) + with open(self.DATA_PATH) as fobj: + self.assertEqual(apt_pkg.md5sum(fobj), s_md5) # with zero (\0) in the string - s = "foo\0bar" + s = b"foo\0bar" s_md5 = "f6f5f8cd0cb63668898ba29025ae824e" res = apt_pkg.md5sum(s) - self.assert_(res == s_md5) + self.assertEqual(res, s_md5) # file - res = apt_pkg.md5sum(open("hashsum_test_with_zero.data")) - self.assert_(res == s_md5) + with open(self.DATA_WITH_ZERO_PATH) as fobj: + self.assertEqual(apt_pkg.md5sum(fobj), s_md5) def testSHA1(self): # simple - s = "foo" + s = b"foo" s_hash = "0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33" res = apt_pkg.sha1sum(s) - self.assert_(res == s_hash) + self.assertEqual(res, s_hash) # file - res = apt_pkg.sha1sum(open("hashsum_test.data")) - self.assert_(res == s_hash) + with open(self.DATA_PATH) as fobj: + self.assertEqual(apt_pkg.sha1sum(fobj), s_hash) # with zero (\0) in the string - s = "foo\0bar" + s = b"foo\0bar" s_hash = "e2c300a39311a2dfcaff799528415cb74c19317f" res = apt_pkg.sha1sum(s) - self.assert_(res == s_hash) + self.assertEqual(res, s_hash) # file - res = apt_pkg.sha1sum(open("hashsum_test_with_zero.data")) - self.assert_(res == s_hash) + with open(self.DATA_WITH_ZERO_PATH) as fobj: + self.assertEqual(apt_pkg.sha1sum(fobj), s_hash) def testSHA256(self): # simple - s = "foo" + s = b"foo" s_hash = \ "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae" res = apt_pkg.sha256sum(s) - self.assert_(res == s_hash) + self.assertEqual(res, s_hash) # file - res = apt_pkg.sha256sum(open("hashsum_test.data")) - self.assert_(res == s_hash) + with open(self.DATA_PATH) as fobj: + self.assertEqual(apt_pkg.sha256sum(fobj), s_hash) # with zero (\0) in the string - s = "foo\0bar" + s = b"foo\0bar" s_hash = \ "d6b681bfce7155d44721afb79c296ef4f0fa80a9dd6b43c5cf74dd0f64c85512" res = apt_pkg.sha256sum(s) - self.assert_(res == s_hash) + self.assertEqual(res, s_hash) # file - res = apt_pkg.sha256sum(open("hashsum_test_with_zero.data")) - self.assert_(res == s_hash) + with open(self.DATA_WITH_ZERO_PATH) as fobj: + self.assertEqual(apt_pkg.sha256sum(fobj), s_hash) if __name__ == "__main__": unittest.main() |