type hints

Author: thorinaboenke

pyproject.toml

@@ -57,13 +57,8 @@ extend-ignore = ["E203", "W503"]
 attackmate = { path = "../attackmate", editable = true }
 
 [[tool.mypy.overrides]]
-modules = [
-    "test.*",
-    "test_commands"
-]
-# Allows to use @pytest.fixture without mypy complaining
+# Use a wildcard to cover the entire test directory
+module = "test.*"
 disallow_untyped_decorators = false
-# Allows to skip "-> None" on test functions
 disallow_untyped_defs = false
-# Allows to skip type hints for arguments in fixtures
 check_untyped_defs = false

test/units/test_main.py

@@ -1,3 +1,4 @@
+# mypy: ignore-errors
 import pytest
 from httpx import AsyncClient, ASGITransport
 from unittest.mock import patch
@@ -6,14 +7,18 @@
 
 @pytest.fixture
 def patch_dependencies():
-    with patch('attackmate_api_server.main.get_user_hash') as mock_get_user_hash, \
-        patch('attackmate_api_server.main.verify_password') as mock_verify_password, \
-        patch('attackmate_api_server.main.create_access_token', return_value='mock_access_token') \
-            as mock_create_access_token, \
-        patch('attackmate_api_server.routers.commands.get_persistent_instance') \
-            as mock_get_persistent_instance, \
-        patch('attackmate_api_server.routers.commands.varstore_to_state_model',
-              return_value={'state': 'data'}) as mock_varstore_to_state:
+    with patch(
+        'attackmate_api_server.main.get_user_hash'
+    ) as mock_get_user_hash, patch(
+        'attackmate_api_server.main.verify_password'
+    ) as mock_verify_password, patch(
+        'attackmate_api_server.main.create_access_token', return_value='mock_access_token'
+    ) as mock_create_access_token, patch(
+        'attackmate_api_server.routers.commands.get_persistent_instance'
+    ) as mock_get_persistent_instance, patch(
+        'attackmate_api_server.routers.commands.varstore_to_state_model',
+        return_value={'state': 'data'}
+    ) as mock_varstore_to_state:
         yield {
             'get_user_hash': mock_get_user_hash,
             'verify_password': mock_verify_password,
@@ -24,14 +29,14 @@ def patch_dependencies():
 
 
 @pytest.mark.asyncio
-async def test_root_endpoint():
+async def test_root_endpoint() -> None:
     async with AsyncClient(transport=ASGITransport(app=app), base_url='http://test') as client:
         response = await client.get('/')
         assert response.status_code == 200
 
 
 @pytest.mark.asyncio
-async def test_login_success(patch_dependencies):
+async def test_login_success(patch_dependencies) -> None:
     patch_dependencies['get_user_hash'].return_value = 'hashed_password'
     patch_dependencies['verify_password'].return_value = True
 
@@ -46,7 +51,7 @@ async def test_login_success(patch_dependencies):
 
 
 @pytest.mark.asyncio
-async def test_login_failure_user_not_found(patch_dependencies):
+async def test_login_failure_user_not_found(patch_dependencies) -> None:
     patch_dependencies['get_user_hash'].return_value = None
 
     async with AsyncClient(transport=ASGITransport(app=app), base_url='http://test') as client:
@@ -62,7 +67,7 @@ async def test_login_failure_user_not_found(patch_dependencies):
 
 
 @pytest.mark.asyncio
-async def test_login_failure_invalid_password(patch_dependencies):
+async def test_login_failure_invalid_password(patch_dependencies) -> None:
     patch_dependencies['get_user_hash'].return_value = 'hashed_password'
     patch_dependencies['verify_password'].return_value = False