Skip to content

Commit 3dbfe36

Browse files
committed
fix: fsl tests
1 parent 945cdae commit 3dbfe36

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

nipype/interfaces/fsl/tests/test_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def test_fslversion():
1515
if ver:
1616
# If ver is None, fsl is not installed
1717
ver = ver.split('.')
18-
yield assert_equal, ver[0], '4'
18+
yield assert_true, ver[0] in ['4', '5']
1919

2020
@skipif(no_fsl)#skip if fsl not installed)
2121
def test_fsloutputtype():

nipype/interfaces/fsl/tests/test_model.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -299,29 +299,30 @@ def test_cluster():
299299
yield assert_equal, getattr(instance.inputs.traits()[key], metakey), value
300300

301301
@skipif(no_fsl)
302-
def test_randomise1():
302+
def test_randomise():
303303
input_map = dict(args = dict(argstr='%s',),
304-
base_name = dict(argstr='-o %s',),
304+
base_name = dict(argstr='-o "%s"',usedefault=True,),
305305
c_thresh = dict(argstr='-c %.2f',),
306306
cm_thresh = dict(argstr='-C %.2f',),
307307
demean = dict(argstr='-D',),
308-
design_mat = dict(argstr='-d %s',mandatory=True,),
309-
environ = dict(),
308+
design_mat = dict(argstr='-d %s',),
309+
environ = dict(usedefault=True,),
310310
f_c_thresh = dict(argstr='-F %.2f',),
311311
f_cm_thresh = dict(argstr='-S %.2f',),
312312
f_only = dict(argstr='--f_only',),
313313
fcon = dict(argstr='-f %s',),
314+
ignore_exception = dict(usedefault=True,),
314315
in_file = dict(argstr='-i %s',mandatory=True,),
315316
mask = dict(argstr='-m %s',),
316317
num_perm = dict(argstr='-n %d',),
317-
one_sample_group_mean = dict(argstr='-l',),
318+
one_sample_group_mean = dict(argstr='-1',),
318319
output_type = dict(),
319320
p_vec_n_dist_files = dict(argstr='-P',),
320321
raw_stats_imgs = dict(argstr='-R',),
321322
seed = dict(argstr='--seed %d',),
322323
show_info_parallel_mode = dict(argstr='-Q',),
323324
show_total_perms = dict(argstr='-q',),
324-
tcon = dict(argstr='-t %s',mandatory=True,),
325+
tcon = dict(argstr='-t %s',),
325326
tfce = dict(argstr='-T',),
326327
tfce2D = dict(argstr='--T2',),
327328
tfce_C = dict(argstr='--tfce_C %.2f',),

0 commit comments

Comments
 (0)