f

src/ert/scheduler/scheduler.py

@@ -64,7 +64,7 @@ async def ainit(self) -> None:
             self._events = asyncio.Queue()
 
     def add_realization(
-        self, real: Realization, callback_timeout: Callable[[int], None]
+        self, real: Realization, callback_timeout: Callable[[int], None] = None
     ) -> None:
         self._jobs[real.iens] = Job(self, real)
 

tests/unit_tests/scheduler/test_scheduler.py

@@ -1,9 +1,7 @@
 import asyncio
 import json
 import shutil
-from dataclasses import asdict
 from pathlib import Path
-from typing import Sequence
 
 import pytest
 
@@ -29,19 +27,19 @@ def create_jobs_json(realization: Realization) -> None:
         "config_file": "/dev/null",
         "jobList": [
             {
-                "name": step.name,
-                "executable": step.executable,
-                "argList": step.arglist,
+                "name": forward_model.name,
+                "executable": forward_model.executable,
+                "argList": forward_model.arglist,
             }
-            for step in realization.forward_models
+            for forward_model in realization.forward_models
         ],
         "run_id": "0",
         "ert_pid": "0",
         "real_id": str(realization.iens),
     }
     realization_run_path = Path(realization.run_arg.runpath)
     realization_run_path.mkdir()
-    with open(realization_run_path / "jobs.json", "w") as f:
+    with open(realization_run_path / "jobs.json", mode="w", encoding="utf-8") as f:
         json.dump(jobs, f)
 
 
@@ -51,13 +49,13 @@ def realization(storage, tmp_path):
     return create_stub_realization(ensemble, tmp_path, 0)
 
 
-def create_stub_realization(ensemble, base_path: Path, iens):
+def create_stub_realization(ensemble, base_path: Path, iens) -> Realization:
     run_arg = RunArg(
         run_id="",
         ensemble_storage=ensemble,
         iens=iens,
         itr=0,
-        runpath=str(base_path / str(iens)),
+        runpath=str(base_path / f"realization-{iens}"),
         job_name="",
     )
 
@@ -83,14 +81,14 @@ async def test_single_job(tmp_path: Path, realization):
     realization.forward_models = [step]
 
     sch = scheduler.Scheduler()
-    sch.add_realization(realization, callback_timeout=lambda _: None)
+    sch.add_realization(realization)
 
     create_jobs_json(realization)
     sch.add_dispatch_information_to_jobs_file()
 
     assert await sch.execute() == EVTYPE_ENSEMBLE_STOPPED
     assert (
-        tmp_path / str(realization.iens) / "testfile"
+        tmp_path / f"realization-{realization.iens}" / "testfile"
     ).read_text() == "Hello, world!\n"
 
 
@@ -99,7 +97,7 @@ async def test_cancel(tmp_path: Path, realization):
     realization.forward_models = [step]
 
     sch = scheduler.Scheduler()
-    sch.add_realization(realization, callback_timeout=lambda _: None)
+    sch.add_realization(realization)
 
     create_jobs_json(realization)
     sch.add_dispatch_information_to_jobs_file()
@@ -113,8 +111,8 @@ async def test_cancel(tmp_path: Path, realization):
     sch.kill_all_jobs()
     await scheduler_task
 
-    assert (tmp_path / str(realization.iens) / "a").exists()
-    assert not (tmp_path / str(realization.iens) / "b").exists()
+    assert (tmp_path / f"realization-{realization.iens}" / "a").exists()
+    assert not (tmp_path / f"realization-{realization.iens}" / "b").exists()
 
 
 def test_add_dispatch_information_to_jobs_file(storage, tmp_path: Path):
@@ -137,7 +135,7 @@ def test_add_dispatch_information_to_jobs_file(storage, tmp_path: Path):
     sch.set_ee_info(test_ee_uri, test_ens_id, test_ee_cert, test_ee_token)
 
     for realization in realizations:
-        sch.add_realization(realization, callback_timeout=lambda _: None)
+        sch.add_realization(realization)
         create_jobs_json(realization)
 
     sch.add_dispatch_information_to_jobs_file()