fix: update tests that depend on server to skip in case server is una…

…vailable
Loop3D · May 31, 2024 · 646be9e · 646be9e
1 parent b2c6638
commit 646be9e
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 28 deletions.
diff --git a/tests/project/test_plot_hamersley.py b/tests/project/test_plot_hamersley.py
@@ -1,8 +1,12 @@
-import pytest
+#internal imports
 from map2loop.project import Project
 from map2loop.m2l_enums import VerboseLevel
+
+#external imports
+import pytest
 from pyproj.exceptions import CRSError
 import os
+import requests
 
 bbox_3d = {
     "minx": 515687.31005864,
@@ -23,15 +27,19 @@ def remove_LPF():
 
 
 def test_project_execution():
-    proj = Project(
-        use_australian_state_data="WA",
-        working_projection="EPSG:28350",
-        bounding_box=bbox_3d,
-        clut_file_legacy=False,
-        verbose_level=VerboseLevel.NONE,
-        loop_project_filename=loop_project_filename,
-        overwrite_loopprojectfile=True,
-    )
+    try:
+        proj = Project(
+            use_australian_state_data="WA",
+            working_projection="EPSG:28350",
+            bounding_box=bbox_3d,
+            clut_file_legacy=False,
+            verbose_level=VerboseLevel.NONE,
+            loop_project_filename=loop_project_filename,
+            overwrite_loopprojectfile=True,
+        )
+    except requests.exceptions.ReadTimeout:
+        pytest.skip("Connection to the server timed out, skipping test")
+
     proj.run_all(take_best=True)
     assert proj is not None, "Plot Hamersley Basin failed to execute"
 

diff --git a/tests/thickness/StructurePoint/test_thickness_StructuralPoint_server.py b/tests/thickness/StructurePoint/test_thickness_StructuralPoint_server.py
@@ -1,8 +1,12 @@
+#internal imports
 from map2loop.thickness_calculator import StructuralPoint
 from map2loop.project import Project
 from map2loop.m2l_enums import VerboseLevel
-import pathlib
 
+#external imports
+import pathlib
+import pytest
+import requests
 import map2loop
 
 
@@ -19,23 +23,26 @@ def test_from_aus_state():
     loop_project_filename = "wa_output.loop3d"
     module_path = map2loop.__file__.replace("__init__.py", "")
 
-    proj = Project(
-        use_australian_state_data="WA",
-        working_projection="EPSG:28350",
-        bounding_box=bbox_3d,
-        config_filename=pathlib.Path(module_path)
-        / pathlib.Path('_datasets')
-        / pathlib.Path('config_files')
-        / pathlib.Path('WA.json'),
-        clut_filename=pathlib.Path(module_path)
-        / pathlib.Path('_datasets')
-        / pathlib.Path('clut_files')
-        / pathlib.Path('WA_clut.csv'),
-        # clut_file_legacy=False,
-        verbose_level=VerboseLevel.NONE,
-        loop_project_filename=loop_project_filename,
-        overwrite_loopprojectfile=True,
-    )
+    try:
+        proj = Project(
+            use_australian_state_data="WA",
+            working_projection="EPSG:28350",
+            bounding_box=bbox_3d,
+            config_filename=pathlib.Path(module_path)
+            / pathlib.Path('_datasets')
+            / pathlib.Path('config_files')
+            / pathlib.Path('WA.json'),
+            clut_filename=pathlib.Path(module_path)
+            / pathlib.Path('_datasets')
+            / pathlib.Path('clut_files')
+            / pathlib.Path('WA_clut.csv'),
+            # clut_file_legacy=False,
+            verbose_level=VerboseLevel.NONE,
+            loop_project_filename=loop_project_filename,
+            overwrite_loopprojectfile=True,
+        )
+    except requests.exceptions.ReadTimeout:
+        pytest.skip("Connection to the server timed out, skipping test")
 
     proj.set_thickness_calculator(StructuralPoint())
     proj.run_all()