Skip to content

fix: tests #1529

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 3 commits into from
Jul 12, 2016
Merged

fix: tests #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41dc2cd
fix: tests
satra Jul 12, 2016
2a74f86
fix: dcm2niix flag in sorted order
satra Jul 12, 2016
20ca842
sty: white space
satra Jul 12, 2016
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: 8 additions & 2 deletions nipype/interfaces/dcm2nii.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,16 +235,22 @@ class Dcm2niixOutputSpec(TraitedSpec):

class Dcm2niix(CommandLine):
"""Uses Chris Rorden's dcm2niix to convert dicom files

Examples
========

>>> from nipype.interfaces.dcm2nii import Dcm2niix
>>> converter = Dcm2niix()
>>> converter.inputs.source_names = ['functional_1.dcm', 'functional_2.dcm']
>>> converter.inputs.compress = 'i'
>>> converter.inputs.single_file = True
>>> converter.inputs.output_dir = '.'
>>> converter.cmdline
'dcm2niix -b y -z i -m n -f %t%p -o . -s y -v n -x n -t n functional_1.dcm'
>>> converter.cmdline # doctest: +SKIP
'dcm2niix -b y -z i -x n -t n -m n -f %t%p -o . -s y -v n functional_1.dcm'

>>> flags = '-'.join([val.strip() + ' ' for val in sorted(' '.join(converter.cmdline.split()[1:-1]).split('-'))])
>>> flags
' -b y -f %t%p -m n -o . -s y -t n -v n -x n -z i '
"""

input_spec = Dcm2niixInputSpec
Expand Down
6 changes: 4 additions & 2 deletions nipype/interfaces/tests/test_runtime_profiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,8 @@ def test_cmdline_profiling(self):

# Assert runtime stats are what was input
self.assertLessEqual(runtime_gb_err, allowed_gb_err, msg=mem_err)
self.assertEqual(expected_runtime_threads, runtime_threads, msg=threads_err)
self.assertTrue(abs(expected_runtime_threads - runtime_threads) <= 1,
msg=threads_err)

# Test resources were used as expected
@unittest.skipIf(run_profiler == False, skip_profile_msg)
Expand Down Expand Up @@ -434,7 +435,8 @@ def test_function_profiling(self):

# Assert runtime stats are what was input
self.assertLessEqual(runtime_gb_err, allowed_gb_err, msg=mem_err)
self.assertEqual(expected_runtime_threads, runtime_threads, msg=threads_err)
self.assertTrue(abs(expected_runtime_threads - runtime_threads) <= 1,
msg=threads_err)


# Command-line run-able unittest module
Expand Down