Merge branch 'SBU-BMI:main' into fix/GeoJSON_ID

SBU-BMI · Aug 8, 2023 · 69e8392 · 69e8392
2 parents 44c6d9b + b0438af
commit 69e8392
Showing 1 changed file with 37 additions and 3 deletions.
diff --git a/tests/test_all.py b/tests/test_all.py
@@ -21,6 +21,8 @@
 from wsinfer.modellib.models import get_pretrained_torch_module
 from wsinfer.modellib.models import get_registered_model
 from wsinfer.modellib.run_inference import jit_compile
+from wsinfer.wsi import HAS_OPENSLIDE
+from wsinfer.wsi import HAS_TIFFSLIDE
 
 
 @pytest.fixture
@@ -58,7 +60,23 @@ def tiff_image(tmp_path: Path) -> Path:
     ],
 )
 @pytest.mark.parametrize("speedup", [False, True])
-@pytest.mark.parametrize("backend", ["openslide", "tiffslide"])
+@pytest.mark.parametrize(
+    "backend",
+    [
+        pytest.param(
+            "openslide",
+            marks=pytest.mark.skipif(
+                not HAS_OPENSLIDE, reason="OpenSlide not available"
+            ),
+        ),
+        pytest.param(
+            "tiffslide",
+            marks=pytest.mark.skipif(
+                not HAS_TIFFSLIDE, reason="TiffSlide not available"
+            ),
+        ),
+    ],
+)
 def test_cli_run_with_registered_models(
     model: str,
     speedup: bool,
@@ -198,7 +216,7 @@ def test_cli_run_with_local_model(tmp_path: Path, tiff_image: Path):
         cli,
         [
             "--backend",
-            "openslide",
+            "tiffslide",
             "run",
             "--wsi-dir",
             str(tiff_image.parent),
@@ -290,7 +308,23 @@ def test_convert_to_sbu():
     ["patch_size", "patch_spacing"],
     [(256, 0.25), (256, 0.50), (350, 0.25), (100, 0.3), (100, 0.5)],
 )
-@pytest.mark.parametrize("backend", ["openslide", "tiffslide"])
+@pytest.mark.parametrize(
+    "backend",
+    [
+        pytest.param(
+            "openslide",
+            marks=pytest.mark.skipif(
+                not HAS_OPENSLIDE, reason="OpenSlide not available"
+            ),
+        ),
+        pytest.param(
+            "tiffslide",
+            marks=pytest.mark.skipif(
+                not HAS_TIFFSLIDE, reason="TiffSlide not available"
+            ),
+        ),
+    ],
+)
 def test_patch_cli(
     patch_size: int,
     patch_spacing: float,