Bytesify test_dkim.

This commit is contained in:
William Grant
2011-03-19 20:08:31 +11:00
parent df47a7d88e
commit e176c8fd4b
+6 -6
View File
@@ -35,13 +35,13 @@ class TestFold(unittest.TestCase):
def test_short_line(self): def test_short_line(self):
self.assertEqual( self.assertEqual(
"foo", dkim.fold("foo")) b"foo", dkim.fold(b"foo"))
def DISABLED_test_long_line(self): def DISABLED_test_long_line(self):
# The function is terribly broken, not passing even this simple # The function is terribly broken, not passing even this simple
# test. # test.
self.assertEqual( self.assertEqual(
"foo"*24 + "\r\n foo", dkim.fold("foo" * 25)) b"foo"*24 + b"\r\n foo", dkim.fold(b"foo" * 25))
class TestSignAndVerify(unittest.TestCase): class TestSignAndVerify(unittest.TestCase):
@@ -52,19 +52,19 @@ class TestSignAndVerify(unittest.TestCase):
self.key = read_test_data("test.private") self.key = read_test_data("test.private")
def dnsfunc(self, domain): def dnsfunc(self, domain):
self.assertEqual('test._domainkey.example.com.', domain) self.assertEqual(b'test._domainkey.example.com.', domain)
return read_test_data("test.txt") return read_test_data("test.txt")
def test_verifies(self): def test_verifies(self):
# A message verifies after being signed. # A message verifies after being signed.
sig = dkim.sign(self.message, "test", "example.com", self.key) sig = dkim.sign(self.message, b"test", b"example.com", self.key)
res = dkim.verify(sig + self.message, dnsfunc=self.dnsfunc) res = dkim.verify(sig + self.message, dnsfunc=self.dnsfunc)
self.assertTrue(res) self.assertTrue(res)
def test_altered_body_fails(self): def test_altered_body_fails(self):
# An altered body fails verification. # An altered body fails verification.
sig = dkim.sign(self.message, "test", "example.com", self.key) sig = dkim.sign(self.message, b"test", b"example.com", self.key)
res = dkim.verify(sig + self.message + "foo", dnsfunc=self.dnsfunc) res = dkim.verify(sig + self.message + b"foo", dnsfunc=self.dnsfunc)
self.assertFalse(res) self.assertFalse(res)