more name cleanup, parametrize fallback test

3 files changed, 21 insertions, 42 deletions

diff --git a/tests/test_itsdangerous/test_jws.py b/tests/test_itsdangerous/test_jws.py
index 89de244..27ba139 100644
--- a/tests/test_itsdangerous/test_jws.py
+++ b/tests/test_itsdangerous/test_jws.py
@@ -21,6 +21,7 @@ class TestJWSSerializer(TestSerializer):
 
     test_signer_cls = None
     test_signer_kwargs = None
+    test_fallback_signers = None
 
     @pytest.mark.parametrize("algorithm_name", ("HS256", "HS384", "HS512", "none"))
     def test_algorithm(self, serializer_factory, algorithm_name):
diff --git a/tests/test_itsdangerous/test_serializer.py b/tests/test_itsdangerous/test_serializer.py
index 485dcca..6d7b20a 100644
--- a/tests/test_itsdangerous/test_serializer.py
+++ b/tests/test_itsdangerous/test_serializer.py
@@ -133,35 +133,26 @@ class TestSerializer(object):
 
         assert serializer.loads(serializer.dumps({(): 1})) == {}
 
-    def test_fallback_signers(self):
-        serializer = Serializer(
-            secret_key="foo", signer_kwargs={"digest_method": hashlib.sha512}
-        )
-        value = serializer.dumps([1, 2, 3])
-        fallback_serializer = Serializer(
-            secret_key="foo",
+    def test_fallback_signers(self, serializer_factory, value):
+        serializer = serializer_factory(signer_kwargs={"digest_method": hashlib.sha512})
+        signed = serializer.dumps(value)
+
+        fallback_serializer = serializer_factory(
             signer_kwargs={"digest_method": hashlib.sha1},
             fallback_signers=[{"digest_method": hashlib.sha512}],
         )
-        assert fallback_serializer.loads(value) == [1, 2, 3]
-
-    def test_digests(self):
-        default_value = Serializer(
-            secret_key="dev key", salt="dev salt", signer_kwargs={}
-        ).dumps([42])
-        sha1_value = Serializer(
-            secret_key="dev key",
-            salt="dev salt",
-            signer_kwargs={"digest_method": hashlib.sha1},
-        ).dumps([42])
-        sha512_value = Serializer(
-            secret_key="dev key",
-            salt="dev salt",
-            signer_kwargs={"digest_method": hashlib.sha512},
-        ).dumps([42])
-        assert default_value == sha1_value
-        assert sha1_value == "[42].-9cNi0CxsSB3hZPNCe9a2eEs1ZM"
-        assert sha512_value == (
-            "[42].MKCz_0nXQqv7wKpfHZcRtJRmpT2T5uvs9YQsJEhJimqxc"
-            "9bCLxG31QzS5uC8OVBI1i6jyOLAFNoKaF5ckO9L5Q"
-        )
+
+        assert fallback_serializer.loads(signed) == value
+
+
+def test_digests():
+    factory = partial(Serializer, secret_key="dev key", salt="dev salt")
+    default_value = factory(signer_kwargs={}).dumps([42])
+    sha1_value = factory(signer_kwargs={"digest_method": hashlib.sha1}).dumps([42])
+    sha512_value = factory(signer_kwargs={"digest_method": hashlib.sha512}).dumps([42])
+    assert default_value == sha1_value
+    assert sha1_value == "[42].-9cNi0CxsSB3hZPNCe9a2eEs1ZM"
+    assert sha512_value == (
+        "[42].MKCz_0nXQqv7wKpfHZcRtJRmpT2T5uvs9YQsJEhJimqxc"
+        "9bCLxG31QzS5uC8OVBI1i6jyOLAFNoKaF5ckO9L5Q"
+    )
diff --git a/tests/test_itsdangerous/test_timed.py b/tests/test_itsdangerous/test_timed.py
index 69eb6f8..71ac8d9 100644
--- a/tests/test_itsdangerous/test_timed.py
+++ b/tests/test_itsdangerous/test_timed.py
@@ -1,4 +1,3 @@
-import hashlib
 from datetime import datetime
 from datetime import timedelta
 from functools import partial
@@ -85,15 +84,3 @@ class TestTimedSerializer(FreezeMixin, TestSerializer):
     def test_return_payload(self, serializer, value, ts):
         signed = serializer.dumps(value)
         assert serializer.loads(signed, return_timestamp=True) == (value, ts)
-
-    def test_fallback_signers(self):
-        serializer = TimedSerializer(
-            secret_key="foo", signer_kwargs={"digest_method": hashlib.sha512}
-        )
-        value = serializer.dumps([1, 2, 3])
-        fallback_serializer = TimedSerializer(
-            secret_key="foo",
-            signer_kwargs={"digest_method": hashlib.sha1},
-            fallback_signers=[{"digest_method": hashlib.sha512}],
-        )
-        assert fallback_serializer.loads(value) == [1, 2, 3]