added '--only-slurm' option to conftest to avoid duplicating tests in slurm-only ci jobs

Author: tclose

.github/workflows/ci-cd.yml

@@ -174,7 +174,7 @@ jobs:
         docker exec slurm bash -c "pip install --upgrade pip && pip install -e /pydra[test,psij] && python -c 'import pydra.engine; print(pydra.engine.__version__)'"
     - name: Run pytest
       run: |
-        docker exec slurm bash -c "pytest /pydra/pydra/engine/tests/test_submitter.py --with-psij --color=yes -vs --cov pydra --cov-config /pydra/.coveragerc --cov-report xml:/pydra/cov.xml --doctest-modules /pydra/pydra/"
+        docker exec slurm bash -c "pytest /pydra/pydra/engine/tests/test_submitter.py --with-psij --only-slurm --color=yes -vs --cov pydra --cov-config /pydra/.coveragerc --cov-report xml:/pydra/cov.xml"
     - name: Upload to codecov
       run: |
         docker exec slurm bash -c "pip install urllib3==1.26.6"

pydra/conftest.py

@@ -12,14 +12,19 @@ def pytest_addoption(parser):
         action="store_true",
         help="run with psij workers in test matrix",
     )
+    parser.addoption(
+        "--only-slurm",
+        action="store_true",
+        help="only run tests with slurm workers",
+    )
 
 
 def pytest_generate_tests(metafunc):
     if "worker" in metafunc.fixturenames:
         metafunc.parametrize("worker", ["debug", "cf"])
 
     if "any_worker" in metafunc.fixturenames:
-        available_workers = ["debug", "cf"]
+
         try:
             use_dask = metafunc.config.getoption("dask")
         except ValueError:
@@ -28,13 +33,18 @@ def pytest_generate_tests(metafunc):
             use_psij = metafunc.config.getoption("with-psij")
         except ValueError:
             use_psij = False
+        try:
+            only_slurm = metafunc.config.getoption("only-slurm")
+        except ValueError:
+            only_slurm = False
+        available_workers = ["debug", "cf"] if not only_slurm else []
         if use_dask:
             available_workers.append("dask")
         if bool(shutil.which("sbatch")):
             available_workers.append("slurm")
             if use_psij:
                 available_workers.append("psij-slurm")
-        if use_psij:
+        if use_psij and not only_slurm:
             available_workers.append("psij-local")
         metafunc.parametrize("any_worker", available_workers)