36
36
def make_run_path (run_paths , run_args , storage ):
37
37
def func (ert_config ):
38
38
experiment_id = storage .create_experiment (
39
- parameters = ert_config .ensemble_config .parameter_configuration
39
+ parameters = ert_config .ensemble_config .parameter_configuration ,
40
+ templates = ert_config .ert_templates ,
40
41
)
41
42
prior_ensemble = storage .create_ensemble (
42
43
experiment_id , name = "prior" , ensemble_size = 1
@@ -52,7 +53,6 @@ def func(ert_config):
52
53
env_vars = ert_config .env_vars ,
53
54
env_pr_fm_step = ert_config .env_pr_fm_step ,
54
55
substitutions = ert_config .substitutions ,
55
- templates = ert_config .ert_templates ,
56
56
parameters_file = "parameters" ,
57
57
runpaths = runpaths ,
58
58
)
@@ -101,7 +101,7 @@ def test_jobs_json_is_backed_up(make_run_path):
101
101
102
102
@pytest .mark .usefixtures ("use_tmpdir" )
103
103
def test_that_run_template_replace_symlink_does_not_write_to_source (
104
- prior_ensemble , run_args , run_paths
104
+ prior_ensemble_args , run_args , run_paths
105
105
):
106
106
"""This test is meant to test that we can have a symlinked file in the
107
107
run path before we do replacement on a target file with the same name,
@@ -121,6 +121,7 @@ def test_that_run_template_replace_symlink_does_not_write_to_source(
121
121
"""
122
122
)
123
123
)
124
+ prior_ensemble = prior_ensemble_args (templates = ert_config .ert_templates )
124
125
run_arg = run_args (ert_config , prior_ensemble )
125
126
run_path = Path (run_arg [0 ].runpath )
126
127
os .makedirs (run_path )
@@ -138,7 +139,6 @@ def test_that_run_template_replace_symlink_does_not_write_to_source(
138
139
env_pr_fm_step = ert_config .env_pr_fm_step ,
139
140
forward_model_steps = ert_config .forward_model_steps ,
140
141
substitutions = ert_config .substitutions ,
141
- templates = ert_config .ert_templates ,
142
142
parameters_file = "parameters" ,
143
143
runpaths = run_paths (ert_config ),
144
144
)
@@ -468,7 +468,6 @@ def test_write_runpath_file(storage, itr, run_paths):
468
468
env_pr_fm_step = ert_config .env_pr_fm_step ,
469
469
forward_model_steps = ert_config .forward_model_steps ,
470
470
substitutions = ert_config .substitutions ,
471
- templates = ert_config .ert_templates ,
472
471
parameters_file = "parameters" ,
473
472
runpaths = run_path ,
474
473
)
@@ -735,7 +734,6 @@ def test_when_manifest_files_are_written_forward_model_ok_succeeds(storage, itr)
735
734
env_pr_fm_step = config .env_pr_fm_step ,
736
735
forward_model_steps = config .forward_model_steps ,
737
736
substitutions = config .substitutions ,
738
- templates = config .ert_templates ,
739
737
parameters_file = "parameters" ,
740
738
runpaths = run_paths ,
741
739
)
0 commit comments