diff --git a/src/ert/config/queue_config.py b/src/ert/config/queue_config.py index abdb542b7f7..f627c98da5d 100644 --- a/src/ert/config/queue_config.py +++ b/src/ert/config/queue_config.py @@ -195,12 +195,12 @@ def generate_dict(option_list: List[Tuple[str, str]]) -> Dict[str, List[str]]: def _validate_queue_driver_settings( - queue_system_options: List[Tuple[ContextString, ContextString]], queue_type: str + queue_system_options: List[Tuple[str, str]], queue_type: str ) -> None: for option_strings in queue_system_options: option_name = option_strings[0] - # this might come as a number already - option_value = str(option_strings[1]) + option_value = option_strings[1] + if option_value == "": # This is equivalent to the option not being set continue if ( diff --git a/tests/unit_tests/config/config_dict_generator.py b/tests/unit_tests/config/config_dict_generator.py index 40d07890fc3..babda988fd7 100644 --- a/tests/unit_tests/config/config_dict_generator.py +++ b/tests/unit_tests/config/config_dict_generator.py @@ -106,13 +106,13 @@ def valid_queue_values(option_name, queue_system): if option_name in queue_string_options[queue_system]: return words elif option_name in queue_positive_number_options[queue_system]: - return small_floats + return small_floats.map(str) elif option_name in queue_positive_int_options[queue_system]: - return positives + return positives.map(str) elif option_name in queue_bool_options[queue_system]: - return booleans + return booleans.map(str) elif option_name in queue_memory_options[queue_system]: - return st.builds(str, memory_with_unit()) + return memory_with_unit() else: raise ValueError( "config_dict_generator does not know how to " diff --git a/tests/unit_tests/config/test_parser_error_collection.py b/tests/unit_tests/config/test_parser_error_collection.py index dc8e76c3189..57067e29b21 100644 --- a/tests/unit_tests/config/test_parser_error_collection.py +++ b/tests/unit_tests/config/test_parser_error_collection.py @@ -675,7 +675,7 @@ def test_queue_option_max_running_negative(): line=4, column=32, end_column=34, - match="is not a valid positive integer", + match="'-1' for MAX_RUNNING is not a valid positive integer.", ), )