From e733f93a99f3aea3c2ec993e3275f0b7f46502a2 Mon Sep 17 00:00:00 2001 From: xjules Date: Tue, 28 Nov 2023 15:41:18 +0100 Subject: [PATCH] Rename mocking queue functions with scheduler --- tests/unit_tests/ensemble_evaluator/conftest.py | 2 +- tests/unit_tests/job_queue/conftest.py | 2 +- tests/unit_tests/job_queue/test_job_queue.py | 2 +- tests/unit_tests/job_queue/test_lsf_driver.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit_tests/ensemble_evaluator/conftest.py b/tests/unit_tests/ensemble_evaluator/conftest.py index f6d041b984c..65db3857578 100644 --- a/tests/unit_tests/ensemble_evaluator/conftest.py +++ b/tests/unit_tests/ensemble_evaluator/conftest.py @@ -65,7 +65,7 @@ def queue_config_fixture(): def make_ensemble_builder(queue_config): def _make_ensemble_builder(monkeypatch, tmpdir, num_reals, num_jobs, job_sleep=0): monkeypatch.setattr( - "ert.scheduler.queue.forward_model_ok", + "ert.scheduler.scheduler.forward_model_ok", AsyncMock(return_value=(LoadStatus.LOAD_SUCCESSFUL, "")), ) builder = ert.ensemble_evaluator.EnsembleBuilder() diff --git a/tests/unit_tests/job_queue/conftest.py b/tests/unit_tests/job_queue/conftest.py index 30c114ed524..ed34cdeac3e 100644 --- a/tests/unit_tests/job_queue/conftest.py +++ b/tests/unit_tests/job_queue/conftest.py @@ -11,7 +11,7 @@ @pytest.fixture def mock_fm_ok(monkeypatch): fm_ok = AsyncMock(return_value=(LoadStatus.LOAD_SUCCESSFUL, "")) - monkeypatch.setattr(ert.scheduler.queue, "forward_model_ok", fm_ok) + monkeypatch.setattr(ert.scheduler.scheduler, "forward_model_ok", fm_ok) yield fm_ok diff --git a/tests/unit_tests/job_queue/test_job_queue.py b/tests/unit_tests/job_queue/test_job_queue.py index f7174127c44..87c62e41192 100644 --- a/tests/unit_tests/job_queue/test_job_queue.py +++ b/tests/unit_tests/job_queue/test_job_queue.py @@ -188,7 +188,7 @@ async def test_run_done_callback( ): monkeypatch.chdir(tmpdir) monkeypatch.setattr( - "ert.scheduler.queue.forward_model_ok", + "ert.scheduler.scheduler.forward_model_ok", AsyncMock(return_value=(loadstatus, "foo")), ) scheduler = create_local_queue(simple_script) diff --git a/tests/unit_tests/job_queue/test_lsf_driver.py b/tests/unit_tests/job_queue/test_lsf_driver.py index d8074568d4a..3e92570d5e1 100644 --- a/tests/unit_tests/job_queue/test_lsf_driver.py +++ b/tests/unit_tests/job_queue/test_lsf_driver.py @@ -13,8 +13,8 @@ from ert.cli import ENSEMBLE_EXPERIMENT_MODE from ert.cli.main import run_cli from ert.config import QueueSystem -from ert.job_queue import Driver, QueueableRealization from ert.run_arg import RunArg +from ert.scheduler import Driver, QueueableRealization from ert.storage import EnsembleAccessor DUMMY_CONFIG: Dict[str, Any] = {