test: no skipping if cwltool or dirac-cwl-run not available

Author: ryuwd

diracx-api/tests/test_job_wrapper_integration.py

@@ -15,25 +15,11 @@
 from pathlib import Path
 from unittest.mock import AsyncMock, MagicMock, patch
 
-import pytest
-
-# ---------------------------------------------------------------------------
-# Skip guards
-# ---------------------------------------------------------------------------
-
-pytest.importorskip("cwltool", reason="cwltool not installed")
-
-dirac_cwl_run = shutil.which("dirac-cwl-run")
-pytestmark = pytest.mark.skipif(
-    dirac_cwl_run is None,
-    reason="dirac-cwl-run not on PATH",
-)
-
 # ---------------------------------------------------------------------------
 # Direct imports — all dependencies are available in the test environment
 # ---------------------------------------------------------------------------
-
 import cwl_utils.parser.cwl_v1_2 as _cwl_v1_2  # noqa: E402
+import pytest
 
 import diracx.api.job_wrapper as _jw_mod  # noqa: E402
 from diracx.api.job_wrapper import JobWrapper  # noqa: E402

diracx-cli/tests/test_executor_integration.py

@@ -12,15 +12,11 @@
 from __future__ import annotations
 
 import json
-import shutil
 import subprocess
 from pathlib import Path
 
 import pytest
 
-# Skip the whole module if cwltool is not available
-cwltool = pytest.importorskip("cwltool", reason="cwltool not installed")
-
 # ---------------------------------------------------------------------------
 # Helpers
 # ---------------------------------------------------------------------------
@@ -48,11 +44,6 @@
 """
 
 
-def _skip_if_no_dirac_cwl_run():
-    if not shutil.which("dirac-cwl-run"):
-        pytest.skip("dirac-cwl-run not found on PATH")
-
-
 def _run(args: list[str], cwd: Path, timeout: int = 120) -> subprocess.CompletedProcess:
     return subprocess.run(
         args,
@@ -74,8 +65,6 @@ def test_basic_execution_with_replica_map(tmp_path):
     Proves: mypyc patch → executor init → replica map loading → LFN
     resolution → CWL execution → output file produced.
     """
-    _skip_if_no_dirac_cwl_run()
-
     # 1. Create a local input file with known content
     input_content = "hello from integration test\n"
     local_input = tmp_path / "local_input.txt"
@@ -148,8 +137,6 @@ def test_execution_without_replica_map(tmp_path):
     Proves that baseline CWL execution works through the dirac-cwl-run entry
     point even when no replica map is provided.
     """
-    _skip_if_no_dirac_cwl_run()
-
     # 1. Create a local input file
     input_content = "baseline cwl execution test\n"
     local_input = tmp_path / "local_input.txt"
@@ -204,8 +191,6 @@ def test_sb_reference_in_replica_map(tmp_path):
     The SB: key in the replica map is mapped to a local file. Proves that
     sandbox references are handled correctly through the replica map.
     """
-    _skip_if_no_dirac_cwl_run()
-
     # 1. Create the real local file the SB: entry will point to
     input_content = "sandbox file content for integration test\n"
     local_file = tmp_path / "extracted_helper.txt"