From 7cc25198a404f32baf543cd56ef2b0da5ba08218 Mon Sep 17 00:00:00 2001 From: xjules Date: Wed, 5 Feb 2025 09:27:17 +0100 Subject: [PATCH] Replace _wait_until with wait_until --- .../forward_model_runner/test_event_reporter.py | 8 -------- .../forward_model_runner/test_fm_dispatch.py | 17 +++++------------ 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/tests/ert/unit_tests/forward_model_runner/test_event_reporter.py b/tests/ert/unit_tests/forward_model_runner/test_event_reporter.py index 394c8d93493..9d34304c4e5 100644 --- a/tests/ert/unit_tests/forward_model_runner/test_event_reporter.py +++ b/tests/ert/unit_tests/forward_model_runner/test_event_reporter.py @@ -1,5 +1,4 @@ import os -import time import pytest @@ -24,13 +23,6 @@ from tests.ert.utils import MockZMQServer -def _wait_until(condition, timeout, fail_msg): - start = time.time() - while not condition(): - assert start + timeout > time.time(), fail_msg - time.sleep(0.1) - - def test_report_with_successful_start_message_argument(unused_tcp_port): host = "localhost" url = f"tcp://{host}:{unused_tcp_port}" diff --git a/tests/ert/unit_tests/forward_model_runner/test_fm_dispatch.py b/tests/ert/unit_tests/forward_model_runner/test_fm_dispatch.py index 64c583175d2..ad08900e91b 100644 --- a/tests/ert/unit_tests/forward_model_runner/test_fm_dispatch.py +++ b/tests/ert/unit_tests/forward_model_runner/test_fm_dispatch.py @@ -25,16 +25,10 @@ ) from _ert.forward_model_runner.forward_model_step import killed_by_oom from _ert.forward_model_runner.reporting import Event, Interactive, Reporter -from _ert.forward_model_runner.reporting.message import ( - Finish, - Init, - Message, -) +from _ert.forward_model_runner.reporting.message import Finish, Init, Message from _ert.threading import ErtThread from tests.ert.utils import MockZMQServer, wait_until -from .test_event_reporter import _wait_until - @pytest.mark.integration_test @pytest.mark.usefixtures("use_tmpdir") @@ -313,11 +307,10 @@ def test_retry_of_jobs_json_file_read(unused_tcp_port, tmp_path, monkeypatch, ca ) def create_jobs_file_after_lock(): - _wait_until( - lambda: f"Could not find file {FORWARD_MODEL_DESCRIPTION_FILE}, retrying" - in caplog.text, - 2, - f"Did not get expected log message from missing {FORWARD_MODEL_DESCRIPTION_FILE}", + wait_until( + lambda: f"Could not find file {FORWARD_MODEL_DESCRIPTION_FILE}, retrying", + interval=0.1, + timeout=2, ) (tmp_path / FORWARD_MODEL_DESCRIPTION_FILE).write_text(jobs_json) lock.release()