mypy

Author: MaxNumerique

src/tests/conftest.py

@@ -10,7 +10,7 @@
 import os
 from pathlib import Path
 import xml.etree.ElementTree as ET
-from typing import Callable, Optional, Union, Dict, Any, List
+from typing import Callable, Optional, Union, Dict, Any, List, Tuple, Generator
 from opengeodeweb_viewer import config
 from opengeodeweb_microservice.database.connection import get_session, init_database
 from opengeodeweb_microservice.database.data import Data
@@ -31,7 +31,9 @@ def __init__(self, log: str) -> None:
         self._init_ws()
         self._drain_initial_messages()
 
-    def call(self, rpc: str, params: List[Dict[str, Any]] = [{}]) -> None:
+    def call(self, rpc: str, params: List[Dict[str, Any]] = None) -> None:
+        if params is None:
+            params = [{}]
         return self.ws.send(
             json.dumps(
                 {
@@ -57,9 +59,10 @@ def get_response(self) -> Union[bytes, Dict[str, Any], str]:
         if isinstance(response, bytes):
             return response
         try:
-            return json.loads(response)
+            parsed = json.loads(response)
+            return parsed
         except Exception:
-            return response
+            return str(response)
 
     @staticmethod
     def _reader_for_file(path: str) -> vtk.vtkImageReader2:
@@ -147,7 +150,7 @@ class FixtureHelper:
     def __init__(self, root_path: Path) -> None:
         self.root_path = Path(root_path)
 
-    def get_xprocess_args(self) -> tuple:
+    def get_xprocess_args(self) -> Tuple[str, type, type]:
         class Starter(ProcessStarter):
             terminate_on_interrupt = True
             pattern = "wslink: Starting factory"
@@ -166,7 +169,7 @@ class Starter(ProcessStarter):
 
 
 @pytest.fixture
-def server(xprocess) -> ServerMonitor:
+def server(xprocess: Any) -> Generator[ServerMonitor, None, None]:
     name, Starter, Monitor = HELPER.get_xprocess_args()
     os.environ["PYTHON_ENV"] = "test"
     _, log = xprocess.ensure(name, Starter)

src/tests/test_viewer_protocols.py

@@ -115,7 +115,7 @@ def test_take_screenshot(
     server.get_response()
     server.get_response()
     blob = server.get_response()
-    print(f"{blob=}", flush=True)
+    print(f"{blob!r}", flush=True)
     assert type(blob) is bytes
 
     with open(os.path.join(server.test_output_dir, "test.png"), "wb") as f:
@@ -144,7 +144,7 @@ def test_take_screenshot(
     server.get_response()
     server.get_response()
     blob = server.get_response()
-    print(f"{blob=}", flush=True)
+    print(f"{blob!r}", flush=True)
     assert type(blob) is bytes
 
     with open(os.path.join(server.test_output_dir, "test.png"), "wb") as f: