Quick fix to make end-to-end tests verify all canonicalization cases. Tests for bug #587783.

2011-06-04 13:46:57 +10:00
parent eb31f6d685
commit 19b554212e
1 changed files with 14 additions and 6 deletions
@@ -62,14 +62,22 @@ class TestSignAndVerify(unittest.TestCase):

    def test_verifies(self):
        # A message verifies after being signed.
-        sig = dkim.sign(self.message, b"test", b"example.com", self.key)
+        for header_algo in (b"simple", b"relaxed"):
+            for body_algo in (b"simple", b"relaxed"):
+                sig = dkim.sign(
+                    self.message, b"test", b"example.com", self.key,
+                    canonicalize=(header_algo, body_algo))
                res = dkim.verify(sig + self.message, dnsfunc=self.dnsfunc)
                self.assertTrue(res)

    def test_altered_body_fails(self):
        # An altered body fails verification.
-        sig = dkim.sign(self.message, b"test", b"example.com", self.key)
-        res = dkim.verify(sig + self.message + b"foo", dnsfunc=self.dnsfunc)
+        for header_algo in (b"simple", b"relaxed"):
+            for body_algo in (b"simple", b"relaxed"):
+                sig = dkim.sign(
+                    self.message, b"test", b"example.com", self.key)
+                res = dkim.verify(
+                    sig + self.message + b"foo", dnsfunc=self.dnsfunc)
                self.assertFalse(res)

    def test_badly_encoded_domain_fails(self):