From fe2cd085cffe05fbdec02164a93de7812acb44dd Mon Sep 17 00:00:00 2001
From: michael-hart <michael.hart1994@gmail.com>
Date: Fri, 26 Sep 2014 01:01:50 +0100
Subject: Corrected tests

---
 tests/hazmat/backends/test_multibackend.py    |  2 +-
 tests/hazmat/primitives/test_serialization.py | 27 +++++++++------------------
 2 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'tests/hazmat')

diff --git a/tests/hazmat/backends/test_multibackend.py b/tests/hazmat/backends/test_multibackend.py
index e4a05aae..45c12b34 100644
--- a/tests/hazmat/backends/test_multibackend.py
+++ b/tests/hazmat/backends/test_multibackend.py
@@ -218,7 +218,7 @@ class DummyPEMSerializationBackend(object):
         pass
 
     def load_pem_public_key(self, data):
-    pass
+        pass
 
 
 class TestMultiBackend(object):
diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py
index 2ee096be..7cbd3f71 100644
--- a/tests/hazmat/primitives/test_serialization.py
+++ b/tests/hazmat/primitives/test_serialization.py
@@ -88,7 +88,6 @@ class TestPEMSerialization(object):
             os.path.join("asymmetric", "PKCS8", "unenc-rsa-pkcs8.pub.pem"),
             os.path.join(
                 "asymmetric", "PEM_Serialization", "rsa_public_key.pem"),
-            ),
         ]
     )
     def test_load_pem_rsa_public_key(self, key_file, backend):
@@ -105,17 +104,17 @@ class TestPEMSerialization(object):
             assert numbers.e == 65537
 
     @pytest.mark.parametrize(
-    ("key_file"),
-    [
-        os.path.join("asymmetric", "PKCS8", "unenc-dsa-pkcs8.pub.pem"),
-        os.path.join(
+        ("key_file"),
+        [
+            os.path.join("asymmetric", "PKCS8", "unenc-dsa-pkcs8.pub.pem"),
+            os.path.join(
                 "asymmetric", "PEM_Serialization",
-                "dsa_public_key.pem"
-),      ),
-    ]
-    def test_load_pem_dsa_public_key(self, keyfile, backend):
+                "dsa_public_key.pem"),
+        ]
+    )
+    def test_load_pem_dsa_public_key(self, key_file, backend):
         key = load_vectors_from_file(
-            keyfile,
+            key_file,
             lambda pemfile: load_pem_public_key(
                 pemfile.read().encode(), backend
             )
@@ -123,14 +122,6 @@ class TestPEMSerialization(object):
         assert key
         assert isinstance(key, interfaces.DSAPublicKey)
 
-    def test_load_pem_ec_public_key(self, backend):
-        key = load_vectors_from_file(
-            os.path.join("asymmetric", "PEM_Serialization",
-                "ec_public_key.pem"),
-            lambda pemfile: load_pem_public_key(
-                pemfile.read().encode(), backend
-            )
-        )
 
 @pytest.mark.traditional_openssl_serialization
 class TestTraditionalOpenSSLSerialization(object):
-- 
cgit v1.2.3