Skip to content

small changes in FSSourceInputSpec (fixes #2116) #2349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 18, 2018
Merged

small changes in FSSourceInputSpec (fixes #2116) #2349

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b3d98c
adding exists=True for subjects_dir in FSSourceInputSpec
djarecka Dec 29, 2017
3bb84c4
using TriatError in pytest.raises
djarecka Jan 3, 2018
ba9ae4f
after make specs
djarecka Jan 3, 2018
9a2fbfc
Revert "after make specs"
djarecka Jan 16, 2018
3d878aa
Merge branch 'master' into FSSourceInputSpec
effigies Jan 17, 2018
c730bfe
STY: Add newline
effigies Jan 17, 2018
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
2 changes: 1 addition & 1 deletion nipype/interfaces/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ def _list_outputs(self):


class FSSourceInputSpec(BaseInterfaceInputSpec):
subjects_dir = Directory(mandatory=True,
subjects_dir = Directory(exists=True, mandatory=True,
desc='Freesurfer subjects directory.')
subject_id = Str(mandatory=True,
desc='Subject name for whom to retrieve data')
Expand Down
7 changes: 7 additions & 0 deletions nipype/interfaces/tests/test_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,13 @@ def test_freesurfersource():
assert fss.inputs.subjects_dir == Undefined


def test_freesurfersource_incorrectdir():
fss = nio.FreeSurferSource()
with pytest.raises(Exception) as err:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't it work using with pytest.raises(TraitError) ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, after importing TraitError it works...

fss.inputs.subjects_dir = 'path/to/no/existing/directory'
assert "TraitError" == err.typename


def test_jsonsink_input():

ds = nio.JSONFileSink()
Expand Down