File tree Expand file tree Collapse file tree 1 file changed +13
-5
lines changed
pydra/compose/shell/tests Expand file tree Collapse file tree 1 file changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -2250,10 +2250,6 @@ class Outputs(shell.Outputs):
2250
2250
assert outputs .out1 .fspath .exists ()
2251
2251
2252
2252
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
- )
2257
2253
@pytest .mark .parametrize ("results_function" , [run_no_submitter , run_submitter ])
2258
2254
def test_shell_cmd_outputspec_7 (tmp_path , worker , results_function ):
2259
2255
"""
@@ -2294,7 +2290,19 @@ class Outputs(shell.Outputs):
2294
2290
files_id = new_files_id ,
2295
2291
)
2296
2292
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
2298
2306
assert outputs .stdout == ""
2299
2307
for file in outputs .new_files :
2300
2308
assert file .fspath .exists ()
You can’t perform that action at this time.
0 commit comments