diff --git a/tests/everest/test_data/shell_commands/CREATE_FILE b/tests/everest/test_data/shell_commands/CREATE_FILE deleted file mode 100755 index 37d792474bf..00000000000 --- a/tests/everest/test_data/shell_commands/CREATE_FILE +++ /dev/null @@ -1 +0,0 @@ -EXECUTABLE create_file.py diff --git a/tests/everest/test_data/shell_commands/config_shell_commands.yml b/tests/everest/test_data/shell_commands/config_shell_commands.yml deleted file mode 100644 index a2d1451b9cb..00000000000 --- a/tests/everest/test_data/shell_commands/config_shell_commands.yml +++ /dev/null @@ -1,36 +0,0 @@ -controls: - - - name: not_really_important_for_this_test - type: generic_control - min: -1.0 - max: 1.0 - initial_guess: 0 - variables: - - name: x - -objective_functions: - - - name: not_really_important_for_this_test - -optimization: - algorithm: optpp_q_newton - -install_jobs: - - - name: create_file - source: CREATE_FILE - -model: - realizations: [0] - -forward_model: - - create_file -n new_test_file.txt - - make_directory created_test_folder - - copy_directory created_test_folder test_folder_copy - - copy_file new_test_file.txt created_test_folder/new_test_file_copy.txt - - move_file new_test_file.txt created_test_folder/new_test_file.txt - - symlink created_test_folder/new_test_file.txt sym_link - -environment: - simulation_folder: sim_output - log_level: debug diff --git a/tests/everest/test_data/shell_commands/create_file.py b/tests/everest/test_data/shell_commands/create_file.py deleted file mode 100755 index 57b0b7335f1..00000000000 --- a/tests/everest/test_data/shell_commands/create_file.py +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env python - -import argparse - - -def main(): - arg_parser = argparse.ArgumentParser() - arg_parser.add_argument("--name", "-n", type=str, required=True) - options = arg_parser.parse_args() - - with open(options.name, "w", encoding="utf-8") as f: - f.write("Let there be a file!") - - -if __name__ == "__main__": - main() diff --git a/tests/everest/test_res_initialization.py b/tests/everest/test_res_initialization.py index 46903c6c111..334eb4bded3 100644 --- a/tests/everest/test_res_initialization.py +++ b/tests/everest/test_res_initialization.py @@ -136,6 +136,11 @@ def test_everest_to_ert_controls(): "wdset", "wdcompl", "wddatefilter", + "make_directory", + "copy_directory", + "copy_file", + "move_file", + "symlink", ], ) def test_default_installed_jobs(tmp_path, monkeypatch, name): diff --git a/tests/everest/test_shell_scripts.py b/tests/everest/test_shell_scripts.py deleted file mode 100644 index e6b2ead21f0..00000000000 --- a/tests/everest/test_shell_scripts.py +++ /dev/null @@ -1,18 +0,0 @@ -from ert.resources import all_shell_script_fm_steps -from everest.config.everest_config import EverestConfig, get_system_installed_jobs -from tests.everest.utils import relpath - - -def test_everest_shell_commands_list(): - # Check list of defined shell commands are part of the list of ert - # installed system jobs - system_installed_jobs = get_system_installed_jobs() - for command_name in all_shell_script_fm_steps: - assert command_name in system_installed_jobs - - -def test_default_shell_scripts(): - config_path = relpath("test_data", "shell_commands", "config_shell_commands.yml") - # Check that a config file containing default shell jobs as part of the - # forward-model section is valid - EverestConfig.load_file(config_path)