Use baserunmodel in test_egg_simulation

yngve-sk · Oct 25, 2024 · 4ae6530 · 4ae6530
1 parent 2cb3ea0
commit 4ae6530
Showing 1 changed file with 13 additions and 10 deletions.
diff --git 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