check only for psij-slurm when --psij=slurm

Author: adi611

.github/workflows/testpsijslurm.yml

@@ -46,7 +46,7 @@ jobs:
         docker exec slurm bash -c "pip install --upgrade pip && pip install -e /pydra[test,psij] && python -c 'import pydra; print(pydra.__version__)'"
     - name: Run pytest
       run: |
-        docker exec slurm bash -c "pytest --color=yes -vs --psij=slurm --cov pydra --cov-config /pydra/.coveragerc --cov-report xml:/pydra/cov.xml --doctest-modules /pydra/pydra/ -k 'not test_audit_prov and not test_audit_prov_messdir_1 and not test_audit_prov_messdir_2 and not test_audit_prov_wf and not test_audit_all'"
+        docker exec slurm bash -c "pytest --color=yes -vs -n auto --psij=slurm --cov pydra --cov-config /pydra/.coveragerc --cov-report xml:/pydra/cov.xml --doctest-modules /pydra/pydra/ -k 'not test_audit_prov and not test_audit_prov_messdir_1 and not test_audit_prov_messdir_2 and not test_audit_prov_wf and not test_audit_all'"
     - name: Upload to codecov
       run: |
         docker exec slurm bash -c "pip install urllib3==1.26.6"

pydra/conftest.py

@@ -30,6 +30,8 @@ def pytest_generate_tests(metafunc):
         try:
             if metafunc.config.getoption("psij"):
                 Plugins.append("psij-" + metafunc.config.getoption("psij"))
+                if bool(shutil.which("sbatch")) and metafunc.config.getoption("psij") == "slurm":
+                    Plugins.remove("slurm")
         except ValueError:
             pass
         metafunc.parametrize("plugin_dask_opt", Plugins)
@@ -49,6 +51,8 @@ def pytest_generate_tests(metafunc):
         try:
             if metafunc.config.getoption("psij"):
                 Plugins.append("psij-" + metafunc.config.getoption("psij"))
+                if bool(shutil.which("sbatch")) and metafunc.config.getoption("psij") == "slurm":
+                    Plugins.remove("slurm")
         except ValueError:
             pass
         metafunc.parametrize("plugin", Plugins)