fixup

equinor · Sep 13, 2024 · 33d0c2d · 33d0c2d
1 parent 5df708f
commit 33d0c2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/ert/config/ert_config.py b/src/ert/config/ert_config.py
@@ -385,13 +385,8 @@ def read_user_config_and_apply_site_config(
             if keyword == "QUEUE_OPTION":
                 filtered_queue_options = []
                 for queue_option in value:
-                    if (
-                        "MAX_RUNNING" in queue_option
-                        and "MAX_RUNNING" in user_config_dict
-                    ) or (
-                        "SUBMIT_SLEEP" in queue_option
-                        and "SUBMIT_SLEEP" in user_config_dict
-                    ):
+                    option_name = queue_option[1]
+                    if option_name in user_config_dict:
                         continue
                     filtered_queue_options.append(queue_option)
                 user_config_dict["QUEUE_OPTION"] = (

diff --git a/tests/unit_tests/config/test_ert_config.py b/tests/unit_tests/config/test_ert_config.py
@@ -1668,7 +1668,7 @@ def test_that_empty_params_file_gives_reasonable_error(tmpdir, param_config):
         ),
     ],
 )
-def test_queue_config_general_max_running_takes_precedence_over_queue_option(
+def test_queue_config_max_running_queue_option_has_priority_over_general_option(
     max_running_queue_config_entry,
 ):
     test_config_file = Path("test.ert")
@@ -1689,7 +1689,7 @@ def test_queue_config_general_max_running_takes_precedence_over_queue_option(
     assert config.queue_config.max_running == 6
 
 
-def test_general_option_in_local_config_takes_precedence_over_site_config(
+def test_general_option_in_local_config_has_priority_over_site_config(
     tmp_path, monkeypatch
 ):
     test_site_config = tmp_path / "test_site_config.ert"