From 4ae65300cb5d7538cdea6d1b409cd7ed23e7bdf8 Mon Sep 17 00:00:00 2001 From: "Yngve S. Kristiansen" Date: Fri, 25 Oct 2024 12:57:02 +0200 Subject: [PATCH] Use baserunmodel in test_egg_simulation --- tests/everest/test_egg_simulation.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tests/everest/test_egg_simulation.py b/tests/everest/test_egg_simulation.py index a30263b2167..a49d684de79 100644 --- a/tests/everest/test_egg_simulation.py +++ b/tests/everest/test_egg_simulation.py @@ -6,6 +6,8 @@ import everest from ert.config import ErtConfig, QueueSystem from ert.config.parsing import ConfigKeys as ErtConfigKeys +from ert.ensemble_evaluator import EvaluatorServerConfig +from ert.run_models.everest_run_model import EverestRunModel from everest.config import EverestConfig from everest.config.export_config import ExportConfig from everest.config_keys import ConfigKeys @@ -693,12 +695,13 @@ def sweetcallbackofmine(self, *args, **kwargs): self.called = True cbtracker = CBTracker() - workflow = everest.suite._EverestWorkflow( - config=config, simulation_callback=cbtracker.sweetcallbackofmine - ) - assert workflow is not None + with PluginSiteConfigEnv(): - workflow.start_optimization() + run_model = EverestRunModel.create( + config, simulation_callback=cbtracker.sweetcallbackofmine + ) + evaluator_server_config = EvaluatorServerConfig() + run_model.run_experiment(evaluator_server_config) assert cbtracker.called # TODO: The comparison is currently disabled because we know it would @@ -819,12 +822,12 @@ def sweetcallbackofmine(self, *args, **kwargs): self.called = True cbtracker = CBTracker() - workflow = everest.suite._EverestWorkflow( - config=config, simulation_callback=cbtracker.sweetcallbackofmine - ) - assert workflow is not None with PluginSiteConfigEnv(): - workflow.start_optimization() + run_model = EverestRunModel.create( + config, simulation_callback=cbtracker.sweetcallbackofmine + ) + evaluator_server_config = EvaluatorServerConfig() + run_model.run_experiment(evaluator_server_config) assert cbtracker.called