Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion nipype/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,15 @@ def get_nipype_gitversion():
# https://github.com/nipy/nipype/pull/2961#issuecomment-512035484
REQUIRES += ["neurdflib"]

TESTS_REQUIRES = ["codecov", "coverage<5", "mock", "pytest", "pytest-cov", "pytest-env"]
TESTS_REQUIRES = [
"codecov",
"coverage<5",
"mock",
"pytest",
"pytest-cov",
"pytest-env",
"pytest-timeout",
]

EXTRA_REQUIRES = {
"data": ["datalad"],
Expand Down
38 changes: 32 additions & 6 deletions nipype/pipeline/engine/nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1366,13 +1366,39 @@ def _run_interface(self, execute=True, updatehash=False):
nodenames = [nnametpl.format(i) for i in range(nitems)]

# Run mapnode
result = self._collate_results(
_node_runner(
self._make_nodes(cwd),
updatehash=updatehash,
stop_first=str2bool(self.config["execution"]["stop_on_first_crash"]),
)
outdir = self.output_dir()
result = InterfaceResult(
interface=self._interface.__class__,
runtime=Bunch(
cwd=outdir,
returncode=1,
environ=dict(os.environ),
hostname=socket.gethostname(),
),
inputs=self._interface.inputs.get_traitsfree(),
)
try:
result = self._collate_results(
_node_runner(
self._make_nodes(cwd),
updatehash=updatehash,
stop_first=str2bool(
self.config["execution"]["stop_on_first_crash"]
),
)
)
except Exception as msg:
result.runtime.stderr = "%s\n\n%s".format(
getattr(result.runtime, "stderr", ""), msg
)
_save_resultfile(
result,
outdir,
self.name,
rebase=str2bool(self.config["execution"]["use_relative_paths"]),
)
raise

# And store results
_save_resultfile(result, cwd, self.name, rebase=False)
# remove any node directories no longer required
Expand Down
20 changes: 20 additions & 0 deletions nipype/pipeline/engine/tests/test_nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,3 +314,23 @@ def test_outputmultipath_collapse(tmpdir):
assert ifres.outputs.out == [4]
assert ndres.outputs.out == [4]
assert select_nd.result.outputs.out == [4]


@pytest.mark.timeout(30)
def test_mapnode_single(tmpdir):
tmpdir.chdir()

def _producer(num=1, deadly_num=7):
if num == deadly_num:
raise RuntimeError("Got the deadly num (%d)." % num)
return num + 1

pnode = pe.MapNode(
niu.Function(function=_producer), name="ProducerNode", iterfield=["num"]
)
pnode.inputs.num = [7]
wf = pe.Workflow(name="PC_Workflow")
wf.add_nodes([pnode])
wf.base_dir = os.path.abspath("./test_output")
with pytest.raises(RuntimeError):
wf.run(plugin="MultiProc")