dedicated apptainer decorator

Author: natthan-pigoux

tests/test_singularity.py

@@ -10,6 +10,7 @@
 from .util import (
     get_data,
     get_main_output,
+    needs_apptainer,
     needs_singularity,
     needs_singularity_2_6,
     needs_singularity_3_or_newer,
@@ -161,8 +162,8 @@ def test_singularity3_docker_image_id_in_tool(tmp_path: Path) -> None:
         assert result_code1 == 0
 
 
-@needs_singularity
-def test_singularity_local_sandbox_image(tmp_path: Path):
+@needs_apptainer
+def test_apptainer_local_sandbox_image(tmp_path: Path):
     import subprocess
 
     workdir = tmp_path / "working_dir"
@@ -191,4 +192,4 @@ def test_singularity_local_sandbox_image(tmp_path: Path):
             )
             assert result_code == 0
         else:
-            pytest.skip(f"Failed to build the Singularity image: {build.stderr}")
+            pytest.skip(f"Failed to build the Apptainer image: {build.stderr}")

tests/util.py

@@ -40,6 +40,10 @@ def get_data(filename: str) -> str:
         filepath = Path(os.path.dirname(__file__)) / ".." / filename
     return str(filepath.resolve())
 
+needs_apptainer = pytest.mark.skipif(
+    not bool(shutil.which("apptainer")),
+    reason="Requires the apptainer executable on the system path.",
+)
 
 needs_docker = pytest.mark.skipif(
     not bool(shutil.which("docker")),