Skip to content

Commit ed8f347

Browse files
committed
manual xfail for specific test matrix
1 parent 2b084af commit ed8f347

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

pydra/compose/shell/tests/test_shell_run.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2250,10 +2250,6 @@ class Outputs(shell.Outputs):
22502250
assert outputs.out1.fspath.exists()
22512251

22522252

2253-
@pytest.mark.xfail(
2254-
sys.platform == "linux" and os.environ.get("TOX_ENV_NAME") == "py311-pre",
2255-
reason="I'm not sure why this is failing only on this part of the test matrix, hoping it will just go away :)",
2256-
)
22572253
@pytest.mark.parametrize("results_function", [run_no_submitter, run_submitter])
22582254
def test_shell_cmd_outputspec_7(tmp_path, worker, results_function):
22592255
"""
@@ -2294,7 +2290,19 @@ class Outputs(shell.Outputs):
22942290
files_id=new_files_id,
22952291
)
22962292

2297-
outputs = results_function(shelly, worker=worker, cache_root=tmp_path)
2293+
try:
2294+
outputs = results_function(shelly, worker=worker, cache_root=tmp_path)
2295+
except Exception:
2296+
if (
2297+
worker == "cf"
2298+
and sys.platform == "linux"
2299+
and os.environ.get("TOX_ENV_NAME") == "py311-pre"
2300+
): # or whatever the ConcurrentFutures worker value is
2301+
pytest.xfail(
2302+
"Known issue this specific element in the test matrix, not sure what it is though"
2303+
)
2304+
else:
2305+
raise
22982306
assert outputs.stdout == ""
22992307
for file in outputs.new_files:
23002308
assert file.fspath.exists()

0 commit comments

Comments
 (0)