Merge ~blueyed/dkimpy:tests into dkimpy:master

[Daniel Hahler]

Fix/improve tests

[Scott Kitterman (kitterman)]

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

review: Approve

diff --git a/README b/README
index bebaffd..2c21495 100644
--- a/README
+++ b/README
@@ -59,6 +59,11 @@ Alternatively, if you have testrepository installed:
     testr init
     testr run
 
+You should install all optional dependencies, e.g. by creating a virtualenv
+and using:
+
+    pip install -e '.[testing]'
+
 The included ARC tests are very limited.  The primary testing method for ARC
 is using the ARC test suite: https://github.com/ValiMail/arc_test_suite
 
diff --git a/dkim/__init__.py b/dkim/__init__.py
index a526a6c..12a052c 100644
--- a/dkim/__init__.py
+++ b/dkim/__init__.py
@@ -40,15 +40,15 @@ import time
 
 # only needed for arc
 try:
-  from authres import AuthenticationResultsHeader
-except:
-  pass
+    from authres import AuthenticationResultsHeader
+except ImportError:
+    pass
 
 # only needed for ed25519 signing/verification
 try:
     import nacl.signing
     import nacl.encoding
-except:
+except ImportError:
     pass
 
 from dkim.canonicalization import (
@@ -67,10 +67,10 @@ from dkim.crypto import (
     UnparsableKeyError,
     )
 try:
-  from dkim.dnsplug import get_txt
-except:
-  def get_txt(s):
-    raise RuntimeError("DKIM.verify requires DNS or dnspython module")
+    from dkim.dnsplug import get_txt
+except ImportError:
+    def get_txt(s):
+        raise RuntimeError("DKIM.verify requires DNS or dnspython module")
 from dkim.util import (
     get_default_logger,
     InvalidTagValueList,
diff --git a/dkim/tests/test_arc.py b/dkim/tests/test_arc.py
index e2f5e4e..f67b706 100644
--- a/dkim/tests/test_arc.py
+++ b/dkim/tests/test_arc.py
@@ -75,10 +75,10 @@ Y+vtSBczUiKERHv1yRbcaQtZFh5wtiRrN04BLUTD21MycBX5jYchHjPY/wIDAQAB"""
 
         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=[e-mail];\r\n  dkim=pass (1024-bit key) header.i=@d1.example;\r\n  dmarc=pass\r\n']
 
-        self.assertEquals(expected_sig, sig_lines)
+        self.assertEqual(expected_sig, sig_lines)
 
         (cv, res, reason) = dkim.arc_verify(b''.join(sig_lines) + self.message, dnsfunc=self.dnsfunc)
-        self.assertEquals(cv, dkim.CV_Pass)
+        self.assertEqual(cv, dkim.CV_Pass)
 
 def test_suite():
     from unittest import TestLoader
diff --git a/dkim/tests/test_dkim.py b/dkim/tests/test_dkim.py
index 2d9a59d..93e2b87 100644
--- a/dkim/tests/test_dkim.py
+++ b/dkim/tests/test_dkim.py
@@ -345,10 +345,10 @@ b/mPfjC0QJTocVBq6Za/PlzfV+Py92VaCak19F4WrbVTK5Gg5tW220MCAwEAAQ==
                     canonicalize=(header_algo, body_algo))
                 dv = dkim.DKIM(sig + message)
                 res = dv.verify(dnsfunc=self.dnsfunc)
-                self.assertEquals(d.include_headers,dv.include_headers)
+                self.assertEqual(d.include_headers,dv.include_headers)
                 s = dkim.select_headers(d.headers,d.include_headers)
                 sv = dkim.select_headers(dv.headers,dv.include_headers)
-                self.assertEquals(s,sv)
+                self.assertEqual(s,sv)
                 self.assertTrue(res)
 
     def test_multiple_from_fails(self):
diff --git a/dkim/tests/test_dkim_ed25519.py b/dkim/tests/test_dkim_ed25519.py
index aeb7592..13a9371 100644
--- a/dkim/tests/test_dkim_ed25519.py
+++ b/dkim/tests/test_dkim_ed25519.py
@@ -213,10 +213,10 @@ yi50DjK5O9pqbFpNHklsv9lqaS0ArSYu02qp1S0DW1Y=\
                     canonicalize=(header_algo, body_algo))
                 dv = dkim.DKIM(sig + message)
                 res = dv.verify(dnsfunc=self.dnsfunc)
-                self.assertEquals(d.include_headers,dv.include_headers)
+                self.assertEqual(d.include_headers,dv.include_headers)
                 s = dkim.select_headers(d.headers,d.include_headers)
                 sv = dkim.select_headers(dv.headers,dv.include_headers)
-                self.assertEquals(s,sv)
+                self.assertEqual(s,sv)
                 self.assertTrue(res)
 
     def test_multiple_from_fails(self):
diff --git a/dkim/tests/test_util.py b/dkim/tests/test_util.py
index 2da48ea..e01b3b5 100644
--- a/dkim/tests/test_util.py
+++ b/dkim/tests/test_util.py
@@ -71,8 +71,8 @@ class TestParseTagValue(unittest.TestCase):
           3KzW0yB9JHwiDCw1EioVkv+OMHhAYzoIypA0bQyi2bc=;
   '''
       sig = parse_tag_value(hval)
-      self.assertEquals(sig[b't'],b'1308078492')
-      self.assertEquals(len(sig),11)
+      self.assertEqual(sig[b't'],b'1308078492')
+      self.assertEqual(len(sig),11)
 
 
 def test_suite():
diff --git a/setup.py b/setup.py
index d900ad0..44a106a 100644
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,11 @@ verification.""",
       ],
     zip_safe = False,
     extras_require={
-        'ed25519':  ['PyNaCl'],
+        'testing': [
+            'authres',
+            'pynacl',
+        ],
+        'ed25519':  ['pynacl'],
         'ARC': ['authres']
     },
     **kw