diff --git a/src/ert/config/forward_model.py b/src/ert/config/forward_model.py index 3b8d4118a1f..e27dacad4cf 100644 --- a/src/ert/config/forward_model.py +++ b/src/ert/config/forward_model.py @@ -9,9 +9,9 @@ from .parse_arg_types_list import parse_arg_types_list from .parsing import ( ConfigValidationError, - ExtJobKeys, + ForwardModelKeys, SchemaItemType, - init_ext_job_schema, + init_forward_model_schema, lark_parse, ) @@ -54,13 +54,13 @@ def from_config_file( if name is None: name = os.path.basename(config_file) - schema = init_ext_job_schema() + schema = init_forward_model_schema() try: content_dict = lark_parse(file=config_file, schema=schema, pre_defines=[]) specified_arg_types: List[Tuple[int, str]] = content_dict.get( - ExtJobKeys.ARG_TYPE, [] + ForwardModelKeys.ARG_TYPE, [] ) specified_max_args: int = content_dict.get("MAX_ARG", 0) diff --git a/src/ert/config/parsing/__init__.py b/src/ert/config/parsing/__init__.py index 4ce519e55f3..0a016d9de2c 100644 --- a/src/ert/config/parsing/__init__.py +++ b/src/ert/config/parsing/__init__.py @@ -4,8 +4,8 @@ from .config_schema import init_site_config_schema, init_user_config_schema from .context_values import ContextList, ContextString, ContextValue from .error_info import ErrorInfo, WarningInfo -from .ext_job_keywords import ExtJobKeys -from .ext_job_schema import init_ext_job_schema +from .forward_model_keywords import ForwardModelKeys +from .forward_model_schema import init_forward_model_schema from .lark_parser import parse as lark_parse from .schema_item_type import SchemaItemType from .types import MaybeWithContext @@ -25,10 +25,10 @@ "init_site_config_schema", "init_user_config_schema", "ConfigDict", - "ExtJobKeys", + "ForwardModelKeys", "ErrorInfo", "WarningInfo", - "init_ext_job_schema", + "init_forward_model_schema", "ContextString", "MaybeWithContext", "ContextList", diff --git a/src/ert/config/parsing/ext_job_keywords.py b/src/ert/config/parsing/forward_model_keywords.py similarity index 95% rename from src/ert/config/parsing/ext_job_keywords.py rename to src/ert/config/parsing/forward_model_keywords.py index d6108cd6abd..d5de8e7bda9 100644 --- a/src/ert/config/parsing/ext_job_keywords.py +++ b/src/ert/config/parsing/forward_model_keywords.py @@ -10,7 +10,7 @@ class StrEnum(str, Enum): from enum import StrEnum -class ExtJobKeys(StrEnum): +class ForwardModelKeys(StrEnum): NAME = "NAME" EXECUTABLE = "EXECUTABLE" diff --git a/src/ert/config/parsing/ext_job_schema.py b/src/ert/config/parsing/forward_model_schema.py similarity index 76% rename from src/ert/config/parsing/ext_job_schema.py rename to src/ert/config/parsing/forward_model_schema.py index 3b55aad30d9..192deff360d 100644 --- a/src/ert/config/parsing/ext_job_schema.py +++ b/src/ert/config/parsing/forward_model_schema.py @@ -3,14 +3,14 @@ from .config_dict import ConfigDict from .config_schema_item import SchemaItem from .deprecation_info import DeprecationInfo -from .ext_job_keywords import ExtJobKeys +from .forward_model_keywords import ForwardModelKeys from .schema_dict import SchemaItemDict from .schema_item_type import SchemaItemType def executable_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.EXECUTABLE, + kw=ForwardModelKeys.EXECUTABLE, required_set=True, type_map=[SchemaItemType.EXECUTABLE], ) @@ -18,7 +18,7 @@ def executable_keyword() -> SchemaItem: def stdin_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.STDIN, + kw=ForwardModelKeys.STDIN, type_map=[SchemaItemType.STRING], required_set=False, ) @@ -26,7 +26,7 @@ def stdin_keyword() -> SchemaItem: def stdout_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.STDOUT, + kw=ForwardModelKeys.STDOUT, type_map=[SchemaItemType.STRING], required_set=False, ) @@ -34,7 +34,7 @@ def stdout_keyword() -> SchemaItem: def stderr_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.STDERR, + kw=ForwardModelKeys.STDERR, type_map=[SchemaItemType.STRING], required_set=False, ) @@ -42,34 +42,36 @@ def stderr_keyword() -> SchemaItem: def start_file_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.START_FILE, + kw=ForwardModelKeys.START_FILE, type_map=[SchemaItemType.STRING], ) def target_file_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.TARGET_FILE, + kw=ForwardModelKeys.TARGET_FILE, type_map=[SchemaItemType.STRING], ) def error_file_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.ERROR_FILE, + kw=ForwardModelKeys.ERROR_FILE, type_map=[SchemaItemType.STRING], ) def max_running_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.MAX_RUNNING, type_map=[SchemaItemType.INT], required_set=False + kw=ForwardModelKeys.MAX_RUNNING, + type_map=[SchemaItemType.INT], + required_set=False, ) def max_running_minutes_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.MAX_RUNNING_MINUTES, + kw=ForwardModelKeys.MAX_RUNNING_MINUTES, type_map=[SchemaItemType.INT], required_set=False, ) @@ -77,7 +79,7 @@ def max_running_minutes_keyword() -> SchemaItem: def min_arg_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.MIN_ARG, + kw=ForwardModelKeys.MIN_ARG, type_map=[SchemaItemType.INT], required_set=False, ) @@ -85,7 +87,7 @@ def min_arg_keyword() -> SchemaItem: def max_arg_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.MAX_ARG, + kw=ForwardModelKeys.MAX_ARG, type_map=[SchemaItemType.INT], required_set=False, ) @@ -93,14 +95,14 @@ def max_arg_keyword() -> SchemaItem: def arglist_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.ARGLIST, + kw=ForwardModelKeys.ARGLIST, argc_max=None, ) def arg_type_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.ARG_TYPE, + kw=ForwardModelKeys.ARG_TYPE, argc_min=2, argc_max=2, type_map=[SchemaItemType.INT, SchemaItemType.STRING], @@ -110,7 +112,7 @@ def arg_type_keyword() -> SchemaItem: def env_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.ENV, + kw=ForwardModelKeys.ENV, argc_min=2, argc_max=2, multi_occurrence=True, @@ -120,7 +122,7 @@ def env_keyword() -> SchemaItem: def exec_env_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.EXEC_ENV, + kw=ForwardModelKeys.EXEC_ENV, argc_min=2, argc_max=2, multi_occurrence=True, @@ -130,7 +132,7 @@ def exec_env_keyword() -> SchemaItem: def default_keyword() -> SchemaItem: return SchemaItem( - kw=ExtJobKeys.DEFAULT, + kw=ForwardModelKeys.DEFAULT, argc_min=2, argc_max=2, multi_occurrence=True, @@ -138,7 +140,7 @@ def default_keyword() -> SchemaItem: ) -ext_job_schema_items: List[SchemaItem] = [ +forward_model_schema_items: List[SchemaItem] = [ executable_keyword(), stdin_keyword(), stdout_keyword(), @@ -157,7 +159,7 @@ def default_keyword() -> SchemaItem: exec_env_keyword(), ] -ext_job_deprecations: List[DeprecationInfo] = [ +forward_model_deprecations: List[DeprecationInfo] = [ DeprecationInfo( keyword="PORTABLE_EXE", message='"PORTABLE_EXE" key is deprecated, please replace with "EXECUTABLE"', @@ -165,7 +167,7 @@ def default_keyword() -> SchemaItem: ] -class ExtJobSchemaItemDict(SchemaItemDict): +class ForwardModelSchemaItemDict(SchemaItemDict): def check_required( self, config_dict: ConfigDict, @@ -180,11 +182,11 @@ def check_required( ) -def init_ext_job_schema() -> ExtJobSchemaItemDict: - schema = ExtJobSchemaItemDict() +def init_forward_model_schema() -> ForwardModelSchemaItemDict: + schema = ForwardModelSchemaItemDict() - for item in ext_job_schema_items: + for item in forward_model_schema_items: schema[item.kw] = item - schema.add_deprecations(ext_job_deprecations) + schema.add_deprecations(forward_model_deprecations) return schema diff --git a/tests/unit_tests/config/config_dict_generator.py b/tests/unit_tests/config/config_dict_generator.py index 44a937874b3..853e0ffafab 100644 --- a/tests/unit_tests/config/config_dict_generator.py +++ b/tests/unit_tests/config/config_dict_generator.py @@ -167,7 +167,7 @@ def queue_options(draw, systems): return [queue_system, name] -def default_ext_job_names(): +def default_forward_model_names(): return ( st.sampled_from( [ @@ -207,7 +207,7 @@ def default_ext_job_names(): @st.composite -def random_ext_job_names(draw, some_words, some_file_names): +def random_forward_model_names(draw, some_words, some_file_names): return draw( st.tuples( some_words, @@ -387,7 +387,7 @@ def composite_keys(smspec: Smspec) -> st.SearchStrategy[str]: def ert_config_values(draw, use_eclbase=booleans): use_eclbase = draw(use_eclbase) queue_system = draw(queue_systems) - install_jobs = draw(small_list(random_ext_job_names(words, file_names))) + install_jobs = draw(small_list(random_forward_model_names(words, file_names))) forward_model = draw(small_list(job(install_jobs))) if install_jobs else [] simulation_job = draw(small_list(sim_job(install_jobs))) if install_jobs else [] gen_data = draw( diff --git a/tests/unit_tests/config/test_forward_model_data_to_json.py b/tests/unit_tests/config/test_forward_model_data_to_json.py index 7ff795e5654..8e55a8f3b6b 100644 --- a/tests/unit_tests/config/test_forward_model_data_to_json.py +++ b/tests/unit_tests/config/test_forward_model_data_to_json.py @@ -81,7 +81,7 @@ def joblist(): return result -ext_job_keywords = [ +forward_model_keywords = [ "MAX_RUNNING", "STDIN", "STDOUT", @@ -149,7 +149,7 @@ def _generate_job( ] with open(config_file, "w", encoding="utf-8") as conf: - for key, val in zip(ext_job_keywords, values): + for key, val in zip(forward_model_keywords, values): if key == "ENV" and val: for k, v in val.items(): conf.write(f"{key} {k} {v}\n") @@ -186,48 +186,60 @@ def create_std_file(config, std="stdout", job_index=None): return f'{config["name"]}.{std}.{job_index}' -def validate_ext_job(ext_job, ext_job_config): - assert ext_job.name == default_name_if_none(ext_job_config["name"]) - assert ext_job.executable == ext_job_config["executable"] - assert ext_job.target_file == ext_job_config["target_file"] - assert ext_job.error_file == ext_job_config["error_file"] - assert ext_job.start_file == ext_job_config["start_file"] - assert ext_job.stdout_file == create_std_file(ext_job_config, std="stdout") - assert ext_job.stderr_file == create_std_file(ext_job_config, std="stderr") - assert ext_job.stdin_file == ext_job_config["stdin"] - assert ext_job.max_running_minutes == ext_job_config["max_running_minutes"] - assert ext_job.max_running == ext_job_config["max_running"] - assert ext_job.arglist == empty_list_if_none(ext_job_config["argList"]) - if ext_job_config["environment"] is None: - assert ext_job.environment == ForwardModel.default_env +def validate_forward_model(forward_model, forward_model_config): + assert forward_model.name == default_name_if_none(forward_model_config["name"]) + assert forward_model.executable == forward_model_config["executable"] + assert forward_model.target_file == forward_model_config["target_file"] + assert forward_model.error_file == forward_model_config["error_file"] + assert forward_model.start_file == forward_model_config["start_file"] + assert forward_model.stdout_file == create_std_file( + forward_model_config, std="stdout" + ) + assert forward_model.stderr_file == create_std_file( + forward_model_config, std="stderr" + ) + assert forward_model.stdin_file == forward_model_config["stdin"] + assert ( + forward_model.max_running_minutes == forward_model_config["max_running_minutes"] + ) + assert forward_model.max_running == forward_model_config["max_running"] + assert forward_model.arglist == empty_list_if_none(forward_model_config["argList"]) + if forward_model_config["environment"] is None: + assert forward_model.environment == ForwardModel.default_env else: - assert ext_job.environment.keys() == ext_job_config["environment"].keys() - for key in ext_job_config["environment"]: - assert ext_job.environment[key] == ext_job_config["environment"][key] + assert ( + forward_model.environment.keys() + == forward_model_config["environment"].keys() + ) + for key in forward_model_config["environment"]: + assert ( + forward_model.environment[key] + == forward_model_config["environment"][key] + ) -def generate_job_from_dict(ext_job_config): - ext_job_config = copy.deepcopy(ext_job_config) - ext_job_config["executable"] = os.path.join( - os.getcwd(), ext_job_config["executable"] +def generate_job_from_dict(forward_model_config): + forward_model_config = copy.deepcopy(forward_model_config) + forward_model_config["executable"] = os.path.join( + os.getcwd(), forward_model_config["executable"] ) - ext_job = _generate_job( - ext_job_config["name"], - ext_job_config["executable"], - ext_job_config["target_file"], - ext_job_config["error_file"], - ext_job_config["start_file"], - ext_job_config["stdout"], - ext_job_config["stderr"], - ext_job_config["stdin"], - ext_job_config["environment"], - ext_job_config["argList"], - ext_job_config["max_running_minutes"], - ext_job_config["max_running"], + forward_model = _generate_job( + forward_model_config["name"], + forward_model_config["executable"], + forward_model_config["target_file"], + forward_model_config["error_file"], + forward_model_config["start_file"], + forward_model_config["stdout"], + forward_model_config["stderr"], + forward_model_config["stdin"], + forward_model_config["environment"], + forward_model_config["argList"], + forward_model_config["max_running_minutes"], + forward_model_config["max_running"], ) - validate_ext_job(ext_job, ext_job_config) - return ext_job + validate_forward_model(forward_model, forward_model_config) + return forward_model def set_up_forward_model(joblist) -> List[ForwardModel]: @@ -249,11 +261,11 @@ def verify_json_dump(joblist, config, selected_jobs, run_id): job = joblist[selected_job] loaded_job = config["jobList"][job_index] - # Since no argList is loaded as an empty list by ext_job + # Since no argList is loaded as an empty list by forward_model arg_list_back_up = job["argList"] job["argList"] = empty_list_if_none(job["argList"]) - # Since name is set to default if none provided by ext_job + # Since name is set to default if none provided by forward_model name_back_up = job["name"] job["name"] = default_name_if_none(job["name"]) diff --git a/tests/unit_tests/ensemble_evaluator/conftest.py b/tests/unit_tests/ensemble_evaluator/conftest.py index af02f69b4e9..2fef2abab3e 100644 --- a/tests/unit_tests/ensemble_evaluator/conftest.py +++ b/tests/unit_tests/ensemble_evaluator/conftest.py @@ -75,14 +75,14 @@ def _make_ensemble_builder(monkeypatch, tmpdir, num_reals, num_jobs, job_sleep=0 builder = ert.ensemble_evaluator.EnsembleBuilder() with tmpdir.as_cwd(): - ext_job_list = [] + forward_model_list = [] for job_index in range(0, num_jobs): - ext_job_config = Path(tmpdir) / f"EXT_JOB_{job_index}" - with open(ext_job_config, "w", encoding="utf-8") as f: + forward_model_config = Path(tmpdir) / f"EXT_JOB_{job_index}" + with open(forward_model_config, "w", encoding="utf-8") as f: f.write(f"EXECUTABLE ext_{job_index}.py\n") - ext_job_exec = Path(tmpdir) / f"ext_{job_index}.py" - with open(ext_job_exec, "w", encoding="utf-8") as f: + forward_model_exec = Path(tmpdir) / f"ext_{job_index}.py" + with open(forward_model_exec, "w", encoding="utf-8") as f: f.write( "#!/usr/bin/env python\n" "import time\n" @@ -92,13 +92,13 @@ def _make_ensemble_builder(monkeypatch, tmpdir, num_reals, num_jobs, job_sleep=0 f" time.sleep({job_sleep})\n" f" with open('status.txt', 'a', encoding='utf-8'): pass\n" ) - mode = os.stat(ext_job_exec).st_mode + mode = os.stat(forward_model_exec).st_mode mode |= stat.S_IXUSR | stat.S_IXGRP - os.chmod(ext_job_exec, stat.S_IMODE(mode)) + os.chmod(forward_model_exec, stat.S_IMODE(mode)) - ext_job_list.append( + forward_model_list.append( ForwardModel.from_config_file( - str(ext_job_config), name=f"ext_job_{job_index}" + str(forward_model_config), name=f"forward_model_{job_index}" ) ) @@ -110,8 +110,10 @@ def _make_ensemble_builder(monkeypatch, tmpdir, num_reals, num_jobs, job_sleep=0 json.dump( { "jobList": [ - _dump_ext_job(ext_job, index) - for index, ext_job in enumerate(ext_job_list) + _dump_forward_model(forward_model, index) + for index, forward_model in enumerate( + forward_model_list + ) ], }, f, @@ -121,7 +123,7 @@ def _make_ensemble_builder(monkeypatch, tmpdir, num_reals, num_jobs, job_sleep=0 ert.ensemble_evaluator.RealizationBuilder() .active(True) .set_iens(iens) - .set_forward_models(ext_job_list) + .set_forward_models(forward_model_list) .set_job_script("job_dispatch.py") .set_max_runtime(10) .set_num_cpu(1) @@ -154,24 +156,24 @@ def _make_ensemble_builder(monkeypatch, tmpdir, num_reals, num_jobs, job_sleep=0 return _make_ensemble_builder -def _dump_ext_job(ext_job, index): +def _dump_forward_model(forward_model, index): return { - "name": ext_job.name, - "executable": ext_job.executable, - "target_file": ext_job.target_file, - "error_file": ext_job.error_file, - "start_file": ext_job.start_file, + "name": forward_model.name, + "executable": forward_model.executable, + "target_file": forward_model.target_file, + "error_file": forward_model.error_file, + "start_file": forward_model.start_file, "stdout": f"{index}.stdout", "stderr": f"{index}.stderr", - "stdin": ext_job.stdin_file, + "stdin": forward_model.stdin_file, "environment": None, "exec_env": {}, - "max_running": ext_job.max_running, - "max_running_minutes": ext_job.max_running_minutes, - "min_arg": ext_job.min_arg, - "max_arg": ext_job.max_arg, - "arg_types": ext_job.arg_types, - "argList": ext_job.arglist, + "max_running": forward_model.max_running, + "max_running_minutes": forward_model.max_running_minutes, + "min_arg": forward_model.min_arg, + "max_arg": forward_model.max_arg, + "arg_types": forward_model.arg_types, + "argList": forward_model.arglist, } diff --git a/tests/unit_tests/job_queue/test_ext_job.py b/tests/unit_tests/job_queue/test_forward_model.py similarity index 81% rename from tests/unit_tests/job_queue/test_ext_job.py rename to tests/unit_tests/job_queue/test_forward_model.py index 5286570d6c9..fd55c682f26 100644 --- a/tests/unit_tests/job_queue/test_ext_job.py +++ b/tests/unit_tests/job_queue/test_forward_model.py @@ -128,7 +128,7 @@ def test_load_forward_model_foreign_raises(): _ = ForwardModel.from_config_file("CONFIG") -def test_ext_job_optionals( +def test_forward_model_optionals( tmp_path, ): executable = tmp_path / "exec" @@ -137,12 +137,12 @@ def test_ext_job_optionals( os.chmod(executable, st.st_mode | stat.S_IEXEC) config_file = tmp_path / "config_file" config_file.write_text("EXECUTABLE exec\n") - ext_job = ForwardModel.from_config_file(str(config_file)) - assert ext_job.name == "config_file" + forward_model = ForwardModel.from_config_file(str(config_file)) + assert forward_model.name == "config_file" @pytest.mark.usefixtures("use_tmpdir") -def test_ext_job_env_and_exec_env_is_set(): +def test_forward_model_env_and_exec_env_is_set(): with open("exec", "w", encoding="utf-8") as f: pass @@ -160,17 +160,17 @@ def test_ext_job_env_and_exec_env_is_set(): """ ) ) - ext_job = ForwardModel.from_config_file("CONFIG") + forward_model = ForwardModel.from_config_file("CONFIG") - assert ext_job.environment["a"] == "b" - assert ext_job.environment["c"] == "d" + assert forward_model.environment["a"] == "b" + assert forward_model.environment["c"] == "d" - assert ext_job.exec_env["a1"] == "b1" - assert ext_job.exec_env["c1"] == "d1" + assert forward_model.exec_env["a1"] == "b1" + assert forward_model.exec_env["c1"] == "d1" @pytest.mark.usefixtures("use_tmpdir") -def test_ext_job_stdout_stderr_defaults_to_filename(): +def test_forward_model_stdout_stderr_defaults_to_filename(): with open("exec", "w", encoding="utf-8") as f: pass @@ -185,15 +185,15 @@ def test_ext_job_stdout_stderr_defaults_to_filename(): ) ) - ext_job = ForwardModel.from_config_file("CONFIG") + forward_model = ForwardModel.from_config_file("CONFIG") - assert ext_job.name == "CONFIG" - assert ext_job.stdout_file == "CONFIG.stdout" - assert ext_job.stderr_file == "CONFIG.stderr" + assert forward_model.name == "CONFIG" + assert forward_model.stdout_file == "CONFIG.stdout" + assert forward_model.stderr_file == "CONFIG.stderr" @pytest.mark.usefixtures("use_tmpdir") -def test_ext_job_stdout_stderr_null_results_in_none(): +def test_forward_model_stdout_stderr_null_results_in_none(): with open("exec", "w", encoding="utf-8") as f: pass @@ -211,12 +211,12 @@ def test_ext_job_stdout_stderr_null_results_in_none(): ) ) - ext_job = ForwardModel.from_config_file("CONFIG") + forward_model = ForwardModel.from_config_file("CONFIG") - assert ext_job.name == "CONFIG" - assert ext_job.stdin_file is None - assert ext_job.stdout_file is None - assert ext_job.stderr_file is None + assert forward_model.name == "CONFIG" + assert forward_model.stdin_file is None + assert forward_model.stdout_file is None + assert forward_model.stderr_file is None @pytest.mark.usefixtures("use_tmpdir") @@ -236,9 +236,9 @@ def test_that_arglist_is_parsed_correctly(): ) ) - ext_job = ForwardModel.from_config_file("CONFIG") + forward_model = ForwardModel.from_config_file("CONFIG") - assert ext_job.arglist == ["", "B", "", "", ""] + assert forward_model.arglist == ["", "B", "", "", ""] @pytest.mark.usefixtures("use_tmpdir") @@ -257,12 +257,12 @@ def test_that_default_env_is_set(): ) ) - ext_job = ForwardModel.from_config_file("CONFIG") - assert ext_job.environment == ext_job.default_env + forward_model = ForwardModel.from_config_file("CONFIG") + assert forward_model.environment == forward_model.default_env @pytest.mark.usefixtures("use_tmpdir") -def test_ext_job_arglist_with_weird_characters(): +def test_forward_model_arglist_with_weird_characters(): with open("exec", "w", encoding="utf-8") as f: pass @@ -285,6 +285,10 @@ def test_ext_job_arglist_with_weird_characters(): ) ) - ext_job = ForwardModel.from_config_file("CONFIG") - assert ext_job.environment == ext_job.default_env - assert ext_job.arglist == ["-i", "s/^RUNSPEC.*/|RUNSPEC\nNOSIM/", ".DATA"] + forward_model = ForwardModel.from_config_file("CONFIG") + assert forward_model.environment == forward_model.default_env + assert forward_model.arglist == [ + "-i", + "s/^RUNSPEC.*/|RUNSPEC\nNOSIM/", + ".DATA", + ] diff --git a/tests/unit_tests/job_runner/test_jobmanager.py b/tests/unit_tests/job_runner/test_jobmanager.py index e32d55891b2..d1f762497a7 100644 --- a/tests/unit_tests/job_runner/test_jobmanager.py +++ b/tests/unit_tests/job_runner/test_jobmanager.py @@ -168,11 +168,11 @@ def test_exec_env(): f.write("EXECUTABLE exec_env.py\n") f.write("EXEC_ENV TEST_ENV 123\n") - ext_job = ForwardModel.from_config_file(name=None, config_file="EXEC_ENV") + forward_model = ForwardModel.from_config_file(name=None, config_file="EXEC_ENV") with open("jobs.json", mode="w", encoding="utf-8") as fptr: json.dump( - ErtConfig(forward_model_list=[ext_job]).forward_model_data_to_json( + ErtConfig(forward_model_list=[forward_model]).forward_model_data_to_json( "run_id" ), fptr,