Typing in test_helpers; switch to pytest style (#994)

Author: ods

Makefile

@@ -11,7 +11,8 @@ FORMATTED_AREAS=\
 	aiokafka/helpers.py \
 	aiokafka/structs.py \
 	aiokafka/util.py \
-	tests/test_codec.py
+	tests/test_codec.py \
+	tests/test_helpers.py
 
 .PHONY: setup
 setup:

tests/conftest.py

@@ -310,9 +310,8 @@ def collect_garbage():
 
 
 @pytest.fixture(scope="class")
-def setup_test_class_serverless(request, loop, ssl_folder):
+def setup_test_class_serverless(request, loop):
     request.cls.loop = loop
-    request.cls.ssl_folder = ssl_folder
 
 
 @pytest.fixture(scope="class")

tests/test_helpers.py

@@ -1,52 +1,49 @@
 import ssl
-import unittest
-
-import pytest
+from pathlib import Path
+from typing import Tuple
 
 from aiokafka.helpers import create_ssl_context
 
 
-@pytest.mark.usefixtures("setup_test_class_serverless")
-class TestHelpers(unittest.TestCase):
-    def _check_ssl_dir(self):
-        ssl_cert = self.ssl_folder
-        cafile = ssl_cert / "ca-cert"
-        certfile = ssl_cert / "cl_client.pem"
-        keyfile = ssl_cert / "cl_client.key"
-        self.assertTrue(ssl_cert.exists(), str(ssl_cert))
-        self.assertTrue(cafile.exists(), str(cafile))
-        self.assertTrue(certfile.exists(), str(certfile))
-        self.assertTrue(keyfile.exists(), str(keyfile))
-        return cafile, certfile, keyfile
-
-    def test_create_ssl_context(self):
-        cafile, certfile, keyfile = self._check_ssl_dir()
-
-        context = create_ssl_context()
-        self.assertEqual(context.verify_mode, ssl.CERT_REQUIRED)
-        self.assertEqual(context.check_hostname, True)
-
-        context = create_ssl_context(cafile=str(cafile))
-        self.assertEqual(context.verify_mode, ssl.CERT_REQUIRED)
-        self.assertEqual(context.check_hostname, True)
-        der_ca = context.get_ca_certs(binary_form=True)
-        self.assertTrue(der_ca)
-
-        # Same with `cadata` argument
-        with cafile.open("rb") as f:
-            data = f.read()
-        context = create_ssl_context(cadata=data.decode("ascii"))
-        self.assertEqual(context.get_ca_certs(binary_form=True), der_ca)
-        # And with DER encoded binary form
-        context = create_ssl_context(cadata=der_ca[0])
-        self.assertEqual(context.get_ca_certs(binary_form=True), der_ca)
-
-        context = create_ssl_context(
-            cafile=str(cafile),
-            certfile=str(certfile),
-            keyfile=str(keyfile),
-            password="abcdefgh",
-        )
-        self.assertEqual(context.verify_mode, ssl.CERT_REQUIRED)
-        self.assertEqual(context.check_hostname, True)
-        self.assertTrue(context.get_ca_certs())
+def _check_ssl_dir(ssl_folder: Path) -> Tuple[Path, Path, Path]:
+    cafile = ssl_folder / "ca-cert"
+    certfile = ssl_folder / "cl_client.pem"
+    keyfile = ssl_folder / "cl_client.key"
+    assert ssl_folder.exists(), str(ssl_folder)
+    cafile.exists(), str(cafile)
+    certfile.exists(), str(certfile)
+    keyfile.exists(), str(keyfile)
+    return cafile, certfile, keyfile
+
+
+def test_create_ssl_context(ssl_folder: Path) -> None:
+    cafile, certfile, keyfile = _check_ssl_dir(ssl_folder)
+
+    context = create_ssl_context()
+    assert context.verify_mode == ssl.CERT_REQUIRED
+    assert context.check_hostname is True
+
+    context = create_ssl_context(cafile=str(cafile))
+    assert context.verify_mode == ssl.CERT_REQUIRED
+    assert context.check_hostname is True
+    der_ca = context.get_ca_certs(binary_form=True)
+    assert der_ca
+
+    # Same with `cadata` argument
+    with cafile.open("rb") as f:
+        data = f.read()
+    context = create_ssl_context(cadata=data.decode("ascii"))
+    assert context.get_ca_certs(binary_form=True) == der_ca
+    # And with DER encoded binary form
+    context = create_ssl_context(cadata=der_ca[0])
+    assert context.get_ca_certs(binary_form=True) == der_ca
+
+    context = create_ssl_context(
+        cafile=str(cafile),
+        certfile=str(certfile),
+        keyfile=str(keyfile),
+        password="abcdefgh",
+    )
+    assert context.verify_mode == ssl.CERT_REQUIRED
+    assert context.check_hostname is True
+    assert context.get_ca_certs()