Add checks for required files

equinor · Feb 5, 2025 · 0feb0cd · 0feb0cd
1 parent 433ff9e
commit 0feb0cd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/everest_models/jobs/fm_well_trajectory/cli.py b/src/everest_models/jobs/fm_well_trajectory/cli.py
@@ -47,10 +47,10 @@ def main_entry_point(args=None):
             if bool(e.dynamic) and not Path(f"{eclipse_model}.UNRST").exists():
                 args_parser.error(f"Missing {eclipse_model}.UNRST file")
 
-        if (
-            Path(f"{eclipse_model}.EGRID").exists()
-            and not Path(f"{eclipse_model}.INIT").exists()
-        ):
+        if not Path(f"{eclipse_model}.EGRID").exists():
+            args_parser.error(f"Missing {eclipse_model}.EGRID file")
+
+        if not Path(f"{eclipse_model}.INIT").exists():
             args_parser.error(f"Missing {eclipse_model}.INIT file")
 
         mlt_guide_points = well_trajectory_resinsight(

diff --git a/tests/jobs/well_trajectory/test_well_trajectory_resinsight.py b/tests/jobs/well_trajectory/test_well_trajectory_resinsight.py
@@ -144,14 +144,17 @@ def test_well_trajectory_resinsight_main_entry_point_no_mlt_missing_date(
         main_entry_point("-c config_missing_date.yml -E SPE1CASE1".split())
 
 
-def test_validate_files_required_for_model(copy_testdata_tmpdir, capsys):
+@pytest.mark.parametrize("remove_file", ["SPE1CASE1.EGRID", "SPE1CASE1.INIT"])
+def test_checking_for_files_required_for_model(
+    remove_file, copy_testdata_tmpdir, capsys
+):
     copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight")
-    os.remove("SPE1CASE1.INIT")
+    os.remove(remove_file)
     with pytest.raises(SystemExit) as excinfo:
         main_entry_point("-c config.yml -E SPE1CASE1".split())
     assert excinfo.value.code == 2
     captured = capsys.readouterr()
-    assert "Missing SPE1CASE1.INIT file" in captured.err
+    assert f"Missing {remove_file} file" in captured.err
 
 
 def test_validate_files_required_for_dynamic_perforation(copy_testdata_tmpdir, capsys):