diff --git a/src/everest/queue_driver/queue_driver.py b/src/everest/queue_driver/queue_driver.py index 5fda29cc543..500e777718b 100644 --- a/src/everest/queue_driver/queue_driver.py +++ b/src/everest/queue_driver/queue_driver.py @@ -34,7 +34,6 @@ (ConfigKeys.TORQUE_QDEL_CMD, "QDEL_CMD"), (ConfigKeys.TORQUE_QUEUE_NAME, "QUEUE"), (ConfigKeys.TORQUE_CLUSTER_LABEL, "CLUSTER_LABEL"), - (ConfigKeys.CORES_PER_NODE, "NUM_CPU"), (ConfigKeys.TORQUE_KEEP_QSUB_OUTPUT, "KEEP_QSUB_OUTPUT"), (ConfigKeys.TORQUE_SUBMIT_SLEEP, "SUBMIT_SLEEP"), (ConfigKeys.TORQUE_PROJECT_CODE, "PROJECT_CODE"), diff --git a/tests/ert/unit_tests/config/test_queue_config.py b/tests/ert/unit_tests/config/test_queue_config.py index 255b02aa6b3..124a6c38144 100644 --- a/tests/ert/unit_tests/config/test_queue_config.py +++ b/tests/ert/unit_tests/config/test_queue_config.py @@ -229,7 +229,6 @@ def test_initializing_empty_config_queue_options_resets_to_default_value( "queue_system, queue_option, queue_value, err_msg", [ ("SLURM", "SQUEUE_TIMEOUT", "5a", "should be a valid number"), - ("TORQUE", "NUM_CPU", "3.5", "should be a valid integer"), ], ) def test_wrong_config_option_types(queue_system, queue_option, queue_value, err_msg): @@ -240,11 +239,7 @@ def test_wrong_config_option_types(queue_system, queue_option, queue_value, err_ ) with pytest.raises(ConfigValidationError, match=err_msg): - if queue_system == "TORQUE": - with pytest.warns(ConfigWarning, match="deprecated"): - ErtConfig.from_file_contents(file_contents) - else: - ErtConfig.from_file_contents(file_contents) + ErtConfig.from_file_contents(file_contents) def test_that_configuring_another_queue_system_gives_warning(): diff --git a/tests/everest/test_res_initialization.py b/tests/everest/test_res_initialization.py index 5be3264ecf9..2f7a3bf713e 100644 --- a/tests/everest/test_res_initialization.py +++ b/tests/everest/test_res_initialization.py @@ -43,8 +43,6 @@ "qsub_cmd": "qsub", "qstat_cmd": "qstat", "qdel_cmd": "qdel", - "num_cpus_per_node": 3, - "num_nodes": 1, "keep_qsub_output": True, "queue_name": "permanent_8", },