Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename mocking queue functions with scheduler #6700

Merged
merged 1 commit into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/unit_tests/ensemble_evaluator/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/job_queue/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/job_queue/test_job_queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/job_queue/test_lsf_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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] = {
Expand Down
Loading