Remove config_stddev.yml

equinor · Dec 16, 2024 · d03a3b7 · d03a3b7
1 parent 0657686
commit d03a3b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 60 deletions.
diff --git a/test-data/everest/math_func/config_stddev.yml b/test-data/everest/math_func/config_stddev.yml
diff --git a/tests/everest/test_api_snapshots.py b/tests/everest/test_api_snapshots.py
@@ -53,12 +53,7 @@ def make_api_snapshot(api) -> dict[str, Any]:
 
 @pytest.mark.parametrize(
     "config_file",
-    [
-        "config_advanced.yml",
-        "config_minimal.yml",
-        "config_multiobj.yml",
-        "config_stddev.yml",
-    ],
+    ["config_advanced.yml", "config_minimal.yml", "config_multiobj.yml"],
 )
 def test_api_snapshots(config_file, snapshot, cached_example):
     config_path, config_file, optimal_result_json = cached_example(

diff --git a/tests/everest/test_objective_type.py b/tests/everest/test_objective_type.py
@@ -1,15 +1,20 @@
 import pytest
 
 from ert.run_models.everest_run_model import EverestRunModel
-from everest.config import EverestConfig
+from everest.config import EverestConfig, ObjectiveFunctionConfig
 
-CONFIG_FILE_STDDEV = "config_stddev.yml"
 
-
-def test_mathfunc_stddev(
+@pytest.mark.integration_test
+def test_objective_type(
     copy_math_func_test_data_to_tmp, evaluator_server_config_generator
 ):
-    config = EverestConfig.load_file(CONFIG_FILE_STDDEV)
+    config = EverestConfig.load_file("config_minimal.yml")
+    config.objective_functions = [
+        ObjectiveFunctionConfig(name="distance", weight=1.0),
+        ObjectiveFunctionConfig(
+            name="stddev", weight=1.0, type="stddev", alias="distance"
+        ),
+    ]
 
     run_model = EverestRunModel.create(config)
     evaluator_server_config = evaluator_server_config_generator(run_model)