pretty

Author: rolodato

tests/test_settings.py

@@ -1,4 +1,4 @@
-import typing
+from typing import Any, Optional
 
 import pytest
 from pytest_mock import MockerFixture
@@ -7,32 +7,25 @@
 from edge_proxy.settings import get_settings, AppSettings
 
 
-def test_client_side_key_validation() -> None:
-    """
-    Test that client_side_key is properly validated.
-    """
-    # Valid
-    AppSettings(
-        environment_key_pairs=[
-            {"server_side_key": "ser.abc123", "client_side_key": "def456"}
-        ]
-    )
-
-    # Missing client_side_key
-    with pytest.raises(ValidationError):
-        AppSettings(
-            environment_key_pairs=[
-                {"server_side_key": "ser.abc123", "client_side_key": ""}
-            ]
-        )
-
-    # Invalid server_side_key
-    with pytest.raises(ValidationError):
+@pytest.mark.parametrize(
+    "client_side_key,server_side_key,expected_exception",
+    [
+        ("abc123", "ser.456", None),
+        ("", "ser.456", ValidationError),
+        ("abc123", "456", ValidationError),
+    ],
+)
+def test_client_side_key_validation(
+    client_side_key: str, server_side_key: str, expected_exception: Optional[Exception]
+) -> None:
+    try:
         AppSettings(
             environment_key_pairs=[
-                {"server_side_key": "abc123", "client_side_key": "abc123"}
+                {"server_side_key": server_side_key, "client_side_key": client_side_key}
             ]
         )
+    except expected_exception:
+        pass
 
 
 @pytest.mark.parametrize(
@@ -64,8 +57,8 @@ def test_client_side_key_validation() -> None:
 )
 def test_settings_are_loaded_correctly(
     mocker: MockerFixture,
-    config_file_json: dict[str, typing.Any],
-    expected_config: dict[str, typing.Any],
+    config_file_json: dict[str, Any],
+    expected_config: dict[str, Any],
 ) -> None:
     """
     Parametrized test which accepts a raw json config file, and a dictionary representing the