Skip to content

Commit 96fde95

Browse files
committed
removing some remnants of nose in test functions or docstrings
1 parent 48f1722 commit 96fde95

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

nipype/interfaces/spm/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ def version(matlab_cmd=None, paths=None, use_mcr=None):
200200

201201
def no_spm():
202202
""" Checks if SPM is NOT installed
203-
used with nosetests skipif to skip tests
203+
used with pytest.mark.skipif decorator to skip tests
204204
that will fail if spm is not installed"""
205205

206206
if 'NIPYPE_NO_MATLAB' in os.environ or Info.version() is None:

nipype/pipeline/plugins/tests/test_base.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import mock
1111

12-
from nipype.testing import assert_regexp_matches
1312
import nipype.pipeline.plugins.base as pb
1413

1514

@@ -34,8 +33,8 @@ def test_report_crash():
3433
actual_crashfile = pb.report_crash(mock_node)
3534

3635
expected_crashfile = re.compile('.*/crash-.*-an_id-[0-9a-f\-]*.pklz')
37-
38-
assert_regexp_matches, actual_crashfile, expected_crashfile
36+
37+
assert expected_crashfile.match(actual_crashfile).group() == actual_crashfile
3938
assert mock_pickle_dump.call_count == 1
4039

4140
'''

nipype/testing/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def __init__(self, size_in_mbytes=8, delay=0.5):
4343
with TempFATFS() as fatdir:
4444
target = os.path.join(fatdir, 'target')
4545
copyfile(file1, target, copy=False)
46-
assert_false(os.path.islink(target))
46+
assert not os.path.islink(target)
4747
4848
Arguments
4949
---------

0 commit comments

Comments
 (0)