dkimpy

Merge ~blueyed/dkimpy:tests into dkimpy:master

  1. Git
  2. lp:~blueyed/dkimpy
  3. tests
  4. Merge into master
Proposed by Daniel Hahler
Status: Merged
Approved by: Scott Kitterman
Approved revision: a01b2510a97c4b80c6330e8b926d8ff6c1bc4873
Merge reported by: Scott Kitterman
Merged at revision: a01b2510a97c4b80c6330e8b926d8ff6c1bc4873
Proposed branch: ~blueyed/dkimpy:tests
Merge into: dkimpy:master
Diff against target: 138 lines (+26/-17)
7 files modified
README (+5/-0)
dkim/__init__.py (+8/-8)
dkim/tests/test_arc.py (+2/-2)
dkim/tests/test_dkim.py (+2/-2)
dkim/tests/test_dkim_ed25519.py (+2/-2)
dkim/tests/test_util.py (+2/-2)
setup.py (+5/-1)
Reviewer Review Type Date Requested Status
Scott Kitterman Approve
Review via email: mp+347896@code.launchpad.net

Description of the change

Fix/improve tests

To post a comment you must log in.
Revision history for this message
Scott Kitterman (kitterman) wrote :

Looks good, although it'd be nice to have ChangeLog entries to go with the changes.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README b/README
2index bebaffd..2c21495 100644
3--- a/README
4+++ b/README
5@@ -59,6 +59,11 @@ Alternatively, if you have testrepository installed:
6 testr init
7 testr run
8
9+You should install all optional dependencies, e.g. by creating a virtualenv
10+and using:
11+
12+ pip install -e '.[testing]'
13+
14 The included ARC tests are very limited. The primary testing method for ARC
15 is using the ARC test suite: https://github.com/ValiMail/arc_test_suite
16
17diff --git a/dkim/__init__.py b/dkim/__init__.py
18index a526a6c..12a052c 100644
19--- a/dkim/__init__.py
20+++ b/dkim/__init__.py
21@@ -40,15 +40,15 @@ import time
22
23 # only needed for arc
24 try:
25- from authres import AuthenticationResultsHeader
26-except:
27- pass
28+ from authres import AuthenticationResultsHeader
29+except ImportError:
30+ pass
31
32 # only needed for ed25519 signing/verification
33 try:
34 import nacl.signing
35 import nacl.encoding
36-except:
37+except ImportError:
38 pass
39
40 from dkim.canonicalization import (
41@@ -67,10 +67,10 @@ from dkim.crypto import (
42 UnparsableKeyError,
43 )
44 try:
45- from dkim.dnsplug import get_txt
46-except:
47- def get_txt(s):
48- raise RuntimeError("DKIM.verify requires DNS or dnspython module")
49+ from dkim.dnsplug import get_txt
50+except ImportError:
51+ def get_txt(s):
52+ raise RuntimeError("DKIM.verify requires DNS or dnspython module")
53 from dkim.util import (
54 get_default_logger,
55 InvalidTagValueList,
56diff --git a/dkim/tests/test_arc.py b/dkim/tests/test_arc.py
57index e2f5e4e..f67b706 100644
58--- a/dkim/tests/test_arc.py
59+++ b/dkim/tests/test_arc.py
60@@ -75,10 +75,10 @@ Y+vtSBczUiKERHv1yRbcaQtZFh5wtiRrN04BLUTD21MycBX5jYchHjPY/wIDAQAB"""
61
62 expected_sig = [b'ARC-Seal: i=1; cv=none; a=rsa-sha256; d=example.com; s=test; t=12345; \r\n b=3jOfBfTKcq+3r3Xv158DybT4mWFxrGcop+cgyLUX2ETCMHqNXYwGx2h+NY46tr\r\n k0Lg6R8i+560+KC8PLcCURYYJNJUHLHPIifhddy1aMNL9l4CoI+Oz+rocd2IZeb/\r\n I9V5amOUOWnAlOvyrSt0XfzLJRTS8qJW3Is1CRkkgyLoI=\r\n', b'ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; \r\n d=example.com; s=test; t=12345; h=message-id : \r\n date : from : to : subject : date : from : \r\n subject; \r\n bh=wE7NXSkgnx9PGiavN4OZhJztvkqPDlemV3OGuEnLwNo=; \r\n b=Bj/AEKhmzMbltWXrfLA8UZNp6/5cj8/IzqbgQec4vGobDZRsa\r\n C0YIPM4tcqK2uTS62kwh40cndXTDsCppvRsBy1sIO3eRNyuLUOh\r\n 0XGrz0AdLQMv+IOdyQqZfMVkq8DuQ4Qdl7ee99uYf3D8S+L7GuD\r\n wJSk7dyH+P2BKxz2nyB0=\r\n', b'ARC-Authentication-Results: i=1; lists.example.org; arc=none;\r\n spf=pass smtp.mfrom=jqd@d1.example;\r\n dkim=pass (1024-bit key) header.i=@d1.example;\r\n dmarc=pass\r\n']
63
64- self.assertEquals(expected_sig, sig_lines)
65+ self.assertEqual(expected_sig, sig_lines)
66
67 (cv, res, reason) = dkim.arc_verify(b''.join(sig_lines) + self.message, dnsfunc=self.dnsfunc)
68- self.assertEquals(cv, dkim.CV_Pass)
69+ self.assertEqual(cv, dkim.CV_Pass)
70
71 def test_suite():
72 from unittest import TestLoader
73diff --git a/dkim/tests/test_dkim.py b/dkim/tests/test_dkim.py
74index 2d9a59d..93e2b87 100644
75--- a/dkim/tests/test_dkim.py
76+++ b/dkim/tests/test_dkim.py
77@@ -345,10 +345,10 @@ b/mPfjC0QJTocVBq6Za/PlzfV+Py92VaCak19F4WrbVTK5Gg5tW220MCAwEAAQ==
78 canonicalize=(header_algo, body_algo))
79 dv = dkim.DKIM(sig + message)
80 res = dv.verify(dnsfunc=self.dnsfunc)
81- self.assertEquals(d.include_headers,dv.include_headers)
82+ self.assertEqual(d.include_headers,dv.include_headers)
83 s = dkim.select_headers(d.headers,d.include_headers)
84 sv = dkim.select_headers(dv.headers,dv.include_headers)
85- self.assertEquals(s,sv)
86+ self.assertEqual(s,sv)
87 self.assertTrue(res)
88
89 def test_multiple_from_fails(self):
90diff --git a/dkim/tests/test_dkim_ed25519.py b/dkim/tests/test_dkim_ed25519.py
91index aeb7592..13a9371 100644
92--- a/dkim/tests/test_dkim_ed25519.py
93+++ b/dkim/tests/test_dkim_ed25519.py
94@@ -213,10 +213,10 @@ yi50DjK5O9pqbFpNHklsv9lqaS0ArSYu02qp1S0DW1Y=\
95 canonicalize=(header_algo, body_algo))
96 dv = dkim.DKIM(sig + message)
97 res = dv.verify(dnsfunc=self.dnsfunc)
98- self.assertEquals(d.include_headers,dv.include_headers)
99+ self.assertEqual(d.include_headers,dv.include_headers)
100 s = dkim.select_headers(d.headers,d.include_headers)
101 sv = dkim.select_headers(dv.headers,dv.include_headers)
102- self.assertEquals(s,sv)
103+ self.assertEqual(s,sv)
104 self.assertTrue(res)
105
106 def test_multiple_from_fails(self):
107diff --git a/dkim/tests/test_util.py b/dkim/tests/test_util.py
108index 2da48ea..e01b3b5 100644
109--- a/dkim/tests/test_util.py
110+++ b/dkim/tests/test_util.py
111@@ -71,8 +71,8 @@ class TestParseTagValue(unittest.TestCase):
112 3KzW0yB9JHwiDCw1EioVkv+OMHhAYzoIypA0bQyi2bc=;
113 '''
114 sig = parse_tag_value(hval)
115- self.assertEquals(sig[b't'],b'1308078492')
116- self.assertEquals(len(sig),11)
117+ self.assertEqual(sig[b't'],b'1308078492')
118+ self.assertEqual(len(sig),11)
119
120
121 def test_suite():
122diff --git a/setup.py b/setup.py
123index d900ad0..44a106a 100644
124--- a/setup.py
125+++ b/setup.py
126@@ -77,7 +77,11 @@ verification.""",
127 ],
128 zip_safe = False,
129 extras_require={
130- 'ed25519': ['PyNaCl'],
131+ 'testing': [
132+ 'authres',
133+ 'pynacl',
134+ ],
135+ 'ed25519': ['pynacl'],
136 'ARC': ['authres']
137 },
138 **kw

Subscribers

People subscribed via source and target branches

to all changes: