fix: neqsim service fixture

Author: Aleksander-Karlsson

src/ecalc_neqsim_wrapper/java_service.py

@@ -50,11 +50,15 @@ def _start_server(maximum_memory: str = "4G") -> JavaGateway:
 class NeqsimService:
     def __init__(self, maximum_memory: str = "4G"):
         global _neqsim_service
-        self._gateway = _start_server(maximum_memory=maximum_memory)
-        _logger.info(
-            f"Started neqsim process with PID '{self._gateway.java_process.pid}' on port '{self._gateway.gateway_parameters.port}'"
-        )
-        _neqsim_service = self
+        if _neqsim_service is None:
+            self._gateway = _start_server(maximum_memory=maximum_memory)
+            _logger.info(
+                f"Started neqsim process with PID '{self._gateway.java_process.pid}' "
+                f"on port '{self._gateway.gateway_parameters.port}'"
+            )
+            _neqsim_service = self
+        else:
+            self._gateway = _neqsim_service._gateway
 
     def __enter__(self):
         return self

tests/conftest.py

@@ -328,8 +328,13 @@ def expression_evaluator_factory() -> ExpressionEvaluatorBuilder:
     return ExpressionEvaluatorBuilder()
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope="function", autouse=True)
 def with_neqsim_service():
     neqsim_service = NeqsimService()
     yield neqsim_service
-    neqsim_service.shutdown()
+
+
+@pytest.fixture(scope="session", autouse=True)
+def shutdown_neqsim_service():
+    yield None
+    NeqsimService().shutdown()