Fix some tests

tests/integration_tests/status/test_tracking_integration.py

@@ -7,6 +7,7 @@
 from argparse import ArgumentParser
 from datetime import datetime
 from pathlib import Path
+from queue import SimpleQueue
 from textwrap import dedent
 
 import pytest
@@ -40,7 +41,7 @@ def __init__(self):
     def __iter__(self):
         yield from self.events
 
-    def on_event(self, event):
+    def put(self, event):
         self.events.append(event)
         self.environment.append(os.environ.copy())
 
@@ -201,12 +202,13 @@ def test_tracking(
             responses=ert_config.ensemble_config.response_configuration,
             observations=ert_config.observations,
         )
-
+        queue = SimpleQueue()
         model = create_model(
             ert_config,
             storage,
             parsed,
             experiment_id,
+            queue,
         )
 
         evaluator_server_config = EvaluatorServerConfig(
@@ -225,11 +227,10 @@ def test_tracking(
 
         snapshots = {}
 
-        events = Events()
-        model.add_send_event_callback(events.on_event)
         thread.join()
 
-        for event in events:
+        while not queue.empty():
+            event = queue.get()
             if isinstance(event, FullSnapshotEvent):
                 snapshots[event.iteration] = event.snapshot
             if (
@@ -321,11 +322,13 @@ def test_setting_env_context_during_run(
             ert_config.ensemble_config.parameter_configuration
         )
 
+        queue = Events()
         model = create_model(
             ert_config,
             storage,
             parsed,
             experiment_id,
+            queue,
         )
 
         evaluator_server_config = EvaluatorServerConfig(
@@ -341,12 +344,10 @@ def test_setting_env_context_during_run(
             args=(evaluator_server_config,),
         )
         thread.start()
-        events = Events()
-        model.add_send_event_callback(events.on_event)
         thread.join()
 
         expected = ["_ERT_SIMULATION_MODE", "_ERT_EXPERIMENT_ID", "_ERT_ENSEMBLE_ID"]
-        for event, environment in zip(events.events, events.environment):
+        for event, environment in zip(queue.events, queue.environment):
             if isinstance(event, (FullSnapshotEvent, SnapshotUpdateEvent)):
                 for key in expected:
                     assert key in environment
@@ -405,7 +406,7 @@ def test_tracking_missing_ecl(
 
         ert_config = ErtConfig.from_file(parsed.config)
         os.chdir(ert_config.config_path)
-
+        events = Events()
         model = create_model(
             ert_config,
             storage,
@@ -414,6 +415,7 @@ def test_tracking_missing_ecl(
                 parameters=ert_config.ensemble_config.parameter_configuration,
                 responses=ert_config.ensemble_config.response_configuration,
             ),
+            events,
         )
 
         evaluator_server_config = EvaluatorServerConfig(
@@ -430,8 +432,6 @@ def test_tracking_missing_ecl(
         )
         with caplog.at_level(logging.ERROR):
             thread.start()
-            events = Events()
-            model.add_send_event_callback(events.on_event)
             thread.join()
             failures = []
 

tests/unit_tests/gui/simulation/test_run_dialog.py

@@ -1,5 +1,6 @@
 import os
 from pathlib import Path
+from queue import SimpleQueue
 from unittest.mock import MagicMock, Mock
 
 import pytest
@@ -25,21 +26,15 @@
 from tests.unit_tests.gui.simulation.test_run_path_dialog import handle_run_path_dialog
 
 
-class RunModelMock(MagicMock):
-    def add_send_event_callback(self, callback):
-        self.callback = callback
-
-
 def test_success(qtbot: QtBot):
     notifier = Mock()
-    run_model_mock = RunModelMock()
-
-    widget = RunDialog("mock.ert", run_model_mock, notifier)
+    queue = SimpleQueue()
+    widget = RunDialog("mock.ert", MagicMock(), queue, notifier)
     widget.show()
     qtbot.addWidget(widget)
 
     widget.startSimulation()
-    run_model_mock.callback(EndEvent(failed=False, failed_msg=""))
+    queue.put(EndEvent(failed=False, failed_msg=""))
 
     with qtbot.waitExposed(widget, timeout=30000):
         qtbot.waitUntil(lambda: widget._total_progress_bar.value() == 100)
@@ -49,13 +44,13 @@ def test_success(qtbot: QtBot):
 
 def test_kill_simulations(qtbot: QtBot):
     notifier = Mock()
-    run_model_mock = RunModelMock()
-    widget = RunDialog("mock.ert", run_model_mock, notifier)
+    queue = SimpleQueue()
+    widget = RunDialog("mock.ert", MagicMock(), queue, notifier)
     widget.show()
     qtbot.addWidget(widget)
 
     widget.startSimulation()
-    run_model_mock.callback(EndEvent(failed=False, failed_msg=""))
+    queue.put(EndEvent(failed=False, failed_msg=""))
 
     with qtbot.waitSignal(widget.finished, timeout=30000):
 
@@ -86,8 +81,8 @@ def handle_dialog():
 
 def test_large_snapshot(large_snapshot, qtbot: QtBot, timeout_per_iter=5000):
     notifier = Mock()
-    run_model_mock = RunModelMock()
-    widget = RunDialog("mock.ert", run_model_mock, notifier)
+    queue = SimpleQueue()
+    widget = RunDialog("mock.ert", MagicMock(), queue, notifier)
     widget.show()
     qtbot.addWidget(widget)
 
@@ -115,7 +110,7 @@ def test_large_snapshot(large_snapshot, qtbot: QtBot, timeout_per_iter=5000):
 
     widget.startSimulation()
     for event in events:
-        run_model_mock.callback(event)
+        queue.put(event)
 
     with qtbot.waitExposed(widget, timeout=timeout_per_iter * 6):
         qtbot.waitUntil(
@@ -326,14 +321,14 @@ def test_large_snapshot(large_snapshot, qtbot: QtBot, timeout_per_iter=5000):
 )
 def test_run_dialog(events, tab_widget_count, qtbot: QtBot):
     notifier = Mock()
-    run_model_mock = RunModelMock()
-    widget = RunDialog("mock.ert", run_model_mock, notifier)
+    queue = SimpleQueue()
+    widget = RunDialog("mock.ert", MagicMock(), queue, notifier)
     widget.show()
     qtbot.addWidget(widget)
 
     widget.startSimulation()
     for event in events:
-        run_model_mock.callback(event)
+        queue.put(event)
 
     with qtbot.waitExposed(widget, timeout=30000):
         qtbot.mouseClick(widget.show_details_button, Qt.LeftButton)
@@ -487,14 +482,14 @@ def handle_dialog():
 )
 def test_run_dialog_memory_usage_showing(events, tab_widget_count, qtbot: QtBot):
     notifier = Mock()
-    run_model_mock = RunModelMock()
-    widget = RunDialog("poly.ert", run_model_mock, notifier)
+    queue = SimpleQueue()
+    widget = RunDialog("poly.ert", MagicMock(), queue, notifier)
     widget.show()
     qtbot.addWidget(widget)
 
     widget.startSimulation()
     for event in events:
-        run_model_mock.callback(event)
+        queue.put(event)
 
     with qtbot.waitExposed(widget, timeout=30000):
         qtbot.mouseClick(widget.show_details_button, Qt.LeftButton)