fix tests

src/ert/ensemble_evaluator/_ensemble.py

@@ -309,9 +309,9 @@ async def _evaluate_inner(  # pylint: disable=too-many-branches
     def cancellable(self) -> bool:
         return True
 
-    def cancel(self) -> None:
+    async def cancel(self) -> None:
         if self._scheduler is not None:
-            self._scheduler.kill_all_jobs()
+            await self._scheduler.kill_all_jobs()
         logger.debug("evaluator cancelled")
 
 

src/ert/ensemble_evaluator/monitor.py

@@ -47,7 +47,6 @@ async def process_message(self, msg: str) -> None:
     async def signal_cancel(self) -> None:
         await self._event_queue.put(Monitor._sentinel)
         logger.debug(f"monitor-{self._id} asking server to cancel...")
-
         cancel_event = EEUserCancel(monitor=self._id)
         await self.send(event_to_json(cancel_event))
         logger.debug(f"monitor-{self._id} asked server to cancel")

src/ert/scheduler/scheduler.py

@@ -104,8 +104,6 @@ def __init__(
         self.checksum: dict[str, dict[str, Any]] = {}
 
     async def kill_all_jobs(self) -> None:
-        # Checking that the loop is running is required because everest is closing the
-        # simulation context whenever an optimization simulation batch is done
         await self.cancel_all_jobs()
 
     async def cancel_all_jobs(self) -> None:

tests/ert/unit_tests/ensemble_evaluator/test_ensemble_legacy.py

@@ -89,6 +89,7 @@ async def test_run_and_cancel_legacy_ensemble(
             # and the ensemble is set to STOPPED
             monitor._receiver_timeout = 10.0
             cancel = True
+            await evaluator._ensemble._scheduler._running.wait()
             async for event in monitor.track(heartbeat_interval=0.1):
                 # Cancel the ensemble upon the arrival of the first event
                 if cancel: