Rename resinsight

test data folder
equinor · Oct 25, 2024 · c9ac100 · c9ac100
1 parent 3ea90cc
commit c9ac100
Show file tree

Hide file tree

Showing 53 changed files with 6 additions and 6 deletions.
diff --git a/tests/jobs/well_trajectory/test_well_trajectory_models.py b/tests/jobs/well_trajectory/test_well_trajectory_models.py
@@ -32,7 +32,7 @@ def test_parameters_config_simple(path_test_data):
 
 
 def test_parameters_config_resinsight(copy_testdata_tmpdir):
-    copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight_mlt")
+    copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight")
     config = load_yaml("config.yml")
     ConfigSchema.model_validate(config)
 

diff --git a/tests/jobs/well_trajectory/test_well_trajectory_resinsight.py b/tests/jobs/well_trajectory/test_well_trajectory_resinsight.py
@@ -12,7 +12,7 @@
 
 @pytest.fixture(scope="module")
 def well_trajectory_arguments():
-    return ("-c config.yml -E SPE1CASE1_MLT").split()
+    return ("-c config.yml -E SPE1CASE1").split()
 
 
 @pytest.mark.slow
@@ -38,7 +38,7 @@ def test_start_resinsight(caplog):
 def test_well_trajectory_resinsight_main_entry_point_lint(
     well_trajectory_arguments, copy_testdata_tmpdir
 ):
-    copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight_mlt")
+    copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight")
     with pytest.raises(SystemExit):
         main_entry_point([*well_trajectory_arguments, "--lint"])
 
@@ -51,7 +51,7 @@ def test_well_trajectory_resinsight_main_entry_point_lint(
 def test_well_trajectory_resinsight_main_entry_point_no_mlt(
     well_trajectory_arguments, copy_testdata_tmpdir
 ):
-    copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight_mlt")
+    copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight")
     for path in Path.cwd().glob("mlt_*.json"):
         path.unlink()
     main_entry_point(well_trajectory_arguments)
@@ -67,7 +67,7 @@ def test_well_trajectory_resinsight_main_entry_point_no_mlt(
 def test_well_trajectory_resinsight_main_entry_point_mlt(
     well_trajectory_arguments, copy_testdata_tmpdir
 ):
-    copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight_mlt")
+    copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight")
     main_entry_point(well_trajectory_arguments)
 
     for expected in Path("expected_mlt").glob("**/*"):
@@ -81,7 +81,7 @@ def test_well_trajectory_resinsight_main_entry_point_mlt(
 def test_well_trajectory_resinsight_main_entry_point_mixed(
     well_trajectory_arguments, copy_testdata_tmpdir
 ):
-    copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight_mlt")
+    copy_testdata_tmpdir(Path(TEST_DATA) / "resinsight")
     for path in Path.cwd().glob("mlt_*.json"):
         with path.open(encoding="utf-8") as fp:
             guide_points = json.load(fp)

diff --git a/...jectory/resinsight_mlt/SPE1CASE1_MLT.DATA → ...well_trajectory/resinsight/SPE1CASE1.DATA b/...jectory/resinsight_mlt/SPE1CASE1_MLT.DATA → ...well_trajectory/resinsight/SPE1CASE1.DATA
diff --git a/...ectory/resinsight_mlt/SPE1CASE1_MLT.EGRID → ...ell_trajectory/resinsight/SPE1CASE1.EGRID b/...ectory/resinsight_mlt/SPE1CASE1_MLT.EGRID → ...ell_trajectory/resinsight/SPE1CASE1.EGRID
diff --git a/...jectory/resinsight_mlt/SPE1CASE1_MLT.INIT → ...well_trajectory/resinsight/SPE1CASE1.INIT b/...jectory/resinsight_mlt/SPE1CASE1_MLT.INIT → ...well_trajectory/resinsight/SPE1CASE1.INIT
diff --git a/...well_trajectory/resinsight_mlt/config.yml → ...ata/well_trajectory/resinsight/config.yml b/...well_trajectory/resinsight_mlt/config.yml → ...ata/well_trajectory/resinsight/config.yml
diff --git a/...rajectory/resinsight_mlt/expected/INJ.SCH → ...ll_trajectory/resinsight/expected/INJ.SCH b/...rajectory/resinsight_mlt/expected/INJ.SCH → ...ll_trajectory/resinsight/expected/INJ.SCH
diff --git a/...ajectory/resinsight_mlt/expected/PROD.SCH → ...l_trajectory/resinsight/expected/PROD.SCH b/...ajectory/resinsight_mlt/expected/PROD.SCH → ...l_trajectory/resinsight/expected/PROD.SCH
diff --git a/...resinsight_mlt/expected/guide_points.json → ...ory/resinsight/expected/guide_points.json b/...resinsight_mlt/expected/guide_points.json → ...ory/resinsight/expected/guide_points.json
diff --git a/...resinsight_mlt/expected/wellpaths/INJ.dev → ...ory/resinsight/expected/wellpaths/INJ.dev b/...resinsight_mlt/expected/wellpaths/INJ.dev → ...ory/resinsight/expected/wellpaths/INJ.dev
diff --git a/...esinsight_mlt/expected/wellpaths/PROD.dev → ...ry/resinsight/expected/wellpaths/PROD.dev b/...esinsight_mlt/expected/wellpaths/PROD.dev → ...ry/resinsight/expected/wellpaths/PROD.dev
diff --git a/.../resinsight_mlt/expected_mixed/INJ_Y1.SCH → ...tory/resinsight/expected_mixed/INJ_Y1.SCH b/.../resinsight_mlt/expected_mixed/INJ_Y1.SCH → ...tory/resinsight/expected_mixed/INJ_Y1.SCH
diff --git a/.../resinsight_mlt/expected_mixed/INJ_Y2.SCH → ...tory/resinsight/expected_mixed/INJ_Y2.SCH b/.../resinsight_mlt/expected_mixed/INJ_Y2.SCH → ...tory/resinsight/expected_mixed/INJ_Y2.SCH
diff --git a/.../resinsight_mlt/expected_mixed/INJ_Y3.SCH → ...tory/resinsight/expected_mixed/INJ_Y3.SCH b/.../resinsight_mlt/expected_mixed/INJ_Y3.SCH → ...tory/resinsight/expected_mixed/INJ_Y3.SCH
diff --git a/...ry/resinsight_mlt/expected_mixed/PROD.SCH → ...ectory/resinsight/expected_mixed/PROD.SCH b/...ry/resinsight_mlt/expected_mixed/PROD.SCH → ...ectory/resinsight/expected_mixed/PROD.SCH
diff --git a/...ight_mlt/expected_mixed/guide_points.json → ...sinsight/expected_mixed/guide_points.json b/...ight_mlt/expected_mixed/guide_points.json → ...sinsight/expected_mixed/guide_points.json
diff --git a/...ight_mlt/expected_mixed/mlt_guide_md.json → ...sinsight/expected_mixed/mlt_guide_md.json b/...ight_mlt/expected_mixed/mlt_guide_md.json → ...sinsight/expected_mixed/mlt_guide_md.json
diff --git a/..._mlt/expected_mixed/mlt_guide_points.json → ...ight/expected_mixed/mlt_guide_points.json b/..._mlt/expected_mixed/mlt_guide_points.json → ...ight/expected_mixed/mlt_guide_points.json
diff --git a/...ight_mlt/expected_mixed/wellpaths/INJ.dev → ...sinsight/expected_mixed/wellpaths/INJ.dev b/...ight_mlt/expected_mixed/wellpaths/INJ.dev → ...sinsight/expected_mixed/wellpaths/INJ.dev
diff --git a/...t_mlt/expected_mixed/wellpaths/INJ_Y1.dev → ...sight/expected_mixed/wellpaths/INJ_Y1.dev b/...t_mlt/expected_mixed/wellpaths/INJ_Y1.dev → ...sight/expected_mixed/wellpaths/INJ_Y1.dev
diff --git a/...t_mlt/expected_mixed/wellpaths/INJ_Y2.dev → ...sight/expected_mixed/wellpaths/INJ_Y2.dev b/...t_mlt/expected_mixed/wellpaths/INJ_Y2.dev → ...sight/expected_mixed/wellpaths/INJ_Y2.dev
diff --git a/...t_mlt/expected_mixed/wellpaths/INJ_Y3.dev → ...sight/expected_mixed/wellpaths/INJ_Y3.dev b/...t_mlt/expected_mixed/wellpaths/INJ_Y3.dev → ...sight/expected_mixed/wellpaths/INJ_Y3.dev
diff --git a/...ght_mlt/expected_mixed/wellpaths/PROD.dev → ...insight/expected_mixed/wellpaths/PROD.dev b/...ght_mlt/expected_mixed/wellpaths/PROD.dev → ...insight/expected_mixed/wellpaths/PROD.dev
diff --git a/...ry/resinsight_mlt/expected_mlt/INJ_Y1.SCH → ...ectory/resinsight/expected_mlt/INJ_Y1.SCH b/...ry/resinsight_mlt/expected_mlt/INJ_Y1.SCH → ...ectory/resinsight/expected_mlt/INJ_Y1.SCH
diff --git a/...ry/resinsight_mlt/expected_mlt/INJ_Y2.SCH → ...ectory/resinsight/expected_mlt/INJ_Y2.SCH b/...ry/resinsight_mlt/expected_mlt/INJ_Y2.SCH → ...ectory/resinsight/expected_mlt/INJ_Y2.SCH
diff --git a/...ry/resinsight_mlt/expected_mlt/INJ_Y3.SCH → ...ectory/resinsight/expected_mlt/INJ_Y3.SCH b/...ry/resinsight_mlt/expected_mlt/INJ_Y3.SCH → ...ectory/resinsight/expected_mlt/INJ_Y3.SCH
diff --git a/...y/resinsight_mlt/expected_mlt/PROD_Y1.SCH → ...ctory/resinsight/expected_mlt/PROD_Y1.SCH b/...y/resinsight_mlt/expected_mlt/PROD_Y1.SCH → ...ctory/resinsight/expected_mlt/PROD_Y1.SCH
diff --git a/...y/resinsight_mlt/expected_mlt/PROD_Y2.SCH → ...ctory/resinsight/expected_mlt/PROD_Y2.SCH b/...y/resinsight_mlt/expected_mlt/PROD_Y2.SCH → ...ctory/resinsight/expected_mlt/PROD_Y2.SCH
diff --git a/...nsight_mlt/expected_mlt/guide_points.json → ...resinsight/expected_mlt/guide_points.json b/...nsight_mlt/expected_mlt/guide_points.json → ...resinsight/expected_mlt/guide_points.json
diff --git a/...nsight_mlt/expected_mlt/mlt_guide_md.json → ...resinsight/expected_mlt/mlt_guide_md.json b/...nsight_mlt/expected_mlt/mlt_guide_md.json → ...resinsight/expected_mlt/mlt_guide_md.json
diff --git a/...ht_mlt/expected_mlt/mlt_guide_points.json → ...nsight/expected_mlt/mlt_guide_points.json b/...ht_mlt/expected_mlt/mlt_guide_points.json → ...nsight/expected_mlt/mlt_guide_points.json
diff --git a/...ght_mlt/expected_mlt/wellpaths/INJ_Y1.dev → ...insight/expected_mlt/wellpaths/INJ_Y1.dev b/...ght_mlt/expected_mlt/wellpaths/INJ_Y1.dev → ...insight/expected_mlt/wellpaths/INJ_Y1.dev
diff --git a/...ght_mlt/expected_mlt/wellpaths/INJ_Y2.dev → ...insight/expected_mlt/wellpaths/INJ_Y2.dev b/...ght_mlt/expected_mlt/wellpaths/INJ_Y2.dev → ...insight/expected_mlt/wellpaths/INJ_Y2.dev
diff --git a/...ght_mlt/expected_mlt/wellpaths/INJ_Y3.dev → ...insight/expected_mlt/wellpaths/INJ_Y3.dev b/...ght_mlt/expected_mlt/wellpaths/INJ_Y3.dev → ...insight/expected_mlt/wellpaths/INJ_Y3.dev
diff --git a/...ht_mlt/expected_mlt/wellpaths/PROD_Y1.dev → ...nsight/expected_mlt/wellpaths/PROD_Y1.dev b/...ht_mlt/expected_mlt/wellpaths/PROD_Y1.dev → ...nsight/expected_mlt/wellpaths/PROD_Y1.dev
diff --git a/...ht_mlt/expected_mlt/wellpaths/PROD_Y2.dev → ...nsight/expected_mlt/wellpaths/PROD_Y2.dev b/...ht_mlt/expected_mlt/wellpaths/PROD_Y2.dev → ...nsight/expected_mlt/wellpaths/PROD_Y2.dev
diff --git a/..._trajectory/resinsight_mlt/formations.lyr → ...well_trajectory/resinsight/formations.lyr b/..._trajectory/resinsight_mlt/formations.lyr → ...well_trajectory/resinsight/formations.lyr
diff --git a/...l_trajectory/resinsight_mlt/mlt_p1_z.json → .../well_trajectory/resinsight/mlt_p1_z.json b/...l_trajectory/resinsight_mlt/mlt_p1_z.json → .../well_trajectory/resinsight/mlt_p1_z.json
diff --git a/...l_trajectory/resinsight_mlt/mlt_p2_a.json → .../well_trajectory/resinsight/mlt_p2_a.json b/...l_trajectory/resinsight_mlt/mlt_p2_a.json → .../well_trajectory/resinsight/mlt_p2_a.json
diff --git a/...l_trajectory/resinsight_mlt/mlt_p2_b.json → .../well_trajectory/resinsight/mlt_p2_b.json b/...l_trajectory/resinsight_mlt/mlt_p2_b.json → .../well_trajectory/resinsight/mlt_p2_b.json
diff --git a/...l_trajectory/resinsight_mlt/mlt_p2_c.json → .../well_trajectory/resinsight/mlt_p2_c.json b/...l_trajectory/resinsight_mlt/mlt_p2_c.json → .../well_trajectory/resinsight/mlt_p2_c.json
diff --git a/...l_trajectory/resinsight_mlt/mlt_p3_x.json → .../well_trajectory/resinsight/mlt_p3_x.json b/...l_trajectory/resinsight_mlt/mlt_p3_x.json → .../well_trajectory/resinsight/mlt_p3_x.json
diff --git a/...l_trajectory/resinsight_mlt/mlt_p3_y.json → .../well_trajectory/resinsight/mlt_p3_y.json b/...l_trajectory/resinsight_mlt/mlt_p3_y.json → .../well_trajectory/resinsight/mlt_p3_y.json
diff --git a/...l_trajectory/resinsight_mlt/mlt_p3_z.json → .../well_trajectory/resinsight/mlt_p3_z.json b/...l_trajectory/resinsight_mlt/mlt_p3_z.json → .../well_trajectory/resinsight/mlt_p3_z.json
diff --git a/.../well_trajectory/resinsight_mlt/p1_x.json → ...data/well_trajectory/resinsight/p1_x.json b/.../well_trajectory/resinsight_mlt/p1_x.json → ...data/well_trajectory/resinsight/p1_x.json
diff --git a/.../well_trajectory/resinsight_mlt/p1_y.json → ...data/well_trajectory/resinsight/p1_y.json b/.../well_trajectory/resinsight_mlt/p1_y.json → ...data/well_trajectory/resinsight/p1_y.json
diff --git a/.../well_trajectory/resinsight_mlt/p1_z.json → ...data/well_trajectory/resinsight/p1_z.json b/.../well_trajectory/resinsight_mlt/p1_z.json → ...data/well_trajectory/resinsight/p1_z.json
diff --git a/.../well_trajectory/resinsight_mlt/p2_a.json → ...data/well_trajectory/resinsight/p2_a.json b/.../well_trajectory/resinsight_mlt/p2_a.json → ...data/well_trajectory/resinsight/p2_a.json
diff --git a/.../well_trajectory/resinsight_mlt/p2_b.json → ...data/well_trajectory/resinsight/p2_b.json b/.../well_trajectory/resinsight_mlt/p2_b.json → ...data/well_trajectory/resinsight/p2_b.json
diff --git a/.../well_trajectory/resinsight_mlt/p2_c.json → ...data/well_trajectory/resinsight/p2_c.json b/.../well_trajectory/resinsight_mlt/p2_c.json → ...data/well_trajectory/resinsight/p2_c.json
diff --git a/.../well_trajectory/resinsight_mlt/p3_x.json → ...data/well_trajectory/resinsight/p3_x.json b/.../well_trajectory/resinsight_mlt/p3_x.json → ...data/well_trajectory/resinsight/p3_x.json
diff --git a/.../well_trajectory/resinsight_mlt/p3_y.json → ...data/well_trajectory/resinsight/p3_y.json b/.../well_trajectory/resinsight_mlt/p3_y.json → ...data/well_trajectory/resinsight/p3_y.json
diff --git a/.../well_trajectory/resinsight_mlt/p3_z.json → ...data/well_trajectory/resinsight/p3_z.json b/.../well_trajectory/resinsight_mlt/p3_z.json → ...data/well_trajectory/resinsight/p3_z.json